From 582a7476d4f732e23dadba94d8d961825c7c6c0b Mon Sep 17 00:00:00 2001 From: matsutsuka Date: Thu, 6 Sep 2007 01:36:10 +0000 Subject: [PATCH] *-dsc.c files have been changed to remove forward reference for struct_icon variable, bacause it is strange that this variable is used wholly inside the C source file and declared extern for the forward reference. --- apps/about/about-dsc.c | 15 +++++++-------- apps/calc/calc-dsc.c | 15 +++++++-------- apps/dhcp/dhcp-dsc.c | 15 +++++++-------- apps/directory/directory-dsc.c | 15 +++++++-------- apps/email/email-dsc.c | 15 +++++++-------- apps/ftp/ftp-dsc.c | 15 +++++++-------- apps/irc/irc-dsc.c | 15 +++++++-------- apps/netconf/netconf-dsc.c | 15 +++++++-------- apps/process-list/process-list-dsc.c | 15 +++++++-------- apps/shell/shell-dsc.c | 15 +++++++-------- apps/telnet/telnet-dsc.c | 15 +++++++-------- apps/telnetd/telnetd-dsc.c | 15 +++++++-------- apps/vnc/vnc-dsc.c | 15 +++++++-------- apps/webbrowser/www-dsc.c | 15 +++++++-------- apps/webserver/webserver-dsc.c | 15 +++++++-------- backyard/apps/editor/editor-dsc.c | 15 +++++++-------- backyard/cpu/6502/apps/memstat-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/blueround-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/cgterm-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/configedit-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/default-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/enabler-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/memstat-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/plasma-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/ravenpine-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/springlight-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/ssfire-dsc.c | 15 +++++++-------- backyard/platform/c64/apps/wget-dsc.c | 15 +++++++-------- backyard/platform/c64/net/eth64-dsc.c | 15 +++++++-------- backyard/platform/c64/net/rrnet-dsc.c | 15 +++++++-------- backyard/platform/c64/net/tfe-dsc.c | 15 +++++++-------- cpu/6502/net/slip-dsc.c | 15 +++++++-------- 32 files changed, 224 insertions(+), 256 deletions(-) diff --git a/apps/about/about-dsc.c b/apps/about/about-dsc.c index 6708a5130..efbde9287 100644 --- a/apps/about/about-dsc.c +++ b/apps/about/about-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: about-dsc.c,v 1.2 2007/08/30 14:39:19 matsutsuka Exp $ + * $Id: about-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon about_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(about_dsc, - "About Contiki", - "about.prg", - about_process, - &about_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char abouticon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon about_icon = {CTK_ICON("About Contiki", abouticon_bitmap, abouticon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(about_dsc, + "About Contiki", + "about.prg", + about_process, + &about_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/calc/calc-dsc.c b/apps/calc/calc-dsc.c index 088017ecd..0e14cab26 100644 --- a/apps/calc/calc-dsc.c +++ b/apps/calc/calc-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: calc-dsc.c,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $ + * $Id: calc-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon calc_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(calc_dsc, - "Simple calculator", - "calc.prg", - calc_process, - &calc_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char calcicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon calc_icon = {CTK_ICON("Calculator", calcicon_bitmap, calcicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(calc_dsc, + "Simple calculator", + "calc.prg", + calc_process, + &calc_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/dhcp/dhcp-dsc.c b/apps/dhcp/dhcp-dsc.c index 39b82ff6a..1fb156e85 100644 --- a/apps/dhcp/dhcp-dsc.c +++ b/apps/dhcp/dhcp-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: dhcp-dsc.c,v 1.2 2007/08/30 14:39:19 matsutsuka Exp $ + * $Id: dhcp-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon dhcp_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(dhcp_dsc, - "Obtain IP address automatically", - "dhcp.prg", - dhcp_process, - &dhcp_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char tcpipconficon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon dhcp_icon = {CTK_ICON("DHCP client", tcpipconficon_bitmap, tcpipconficon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(dhcp_dsc, + "Obtain IP address automatically", + "dhcp.prg", + dhcp_process, + &dhcp_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/directory/directory-dsc.c b/apps/directory/directory-dsc.c index 4c0f56200..35fad106e 100644 --- a/apps/directory/directory-dsc.c +++ b/apps/directory/directory-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: directory-dsc.c,v 1.2 2007/08/30 14:39:17 matsutsuka Exp $ + * $Id: directory-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon directory_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(directory_dsc, - "Directory reader", - "directory.prg", - directory_process, - &directory_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char directoryicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon directory_icon = {CTK_ICON("Directory", directoryicon_bitmap, directoryicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(directory_dsc, + "Directory reader", + "directory.prg", + directory_process, + &directory_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/email/email-dsc.c b/apps/email/email-dsc.c index 58d1307b1..80c566a7b 100644 --- a/apps/email/email-dsc.c +++ b/apps/email/email-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: email-dsc.c,v 1.2 2007/08/30 14:39:17 matsutsuka Exp $ + * $Id: email-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon email_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(email_dsc, - "Unfinished e-mail client", - "email.prg", - email_process, - &email_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char tcpipconficon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon email_icon = {CTK_ICON("E-mail", tcpipconficon_bitmap, tcpipconficon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(email_dsc, + "Unfinished e-mail client", + "email.prg", + email_process, + &email_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/ftp/ftp-dsc.c b/apps/ftp/ftp-dsc.c index 7f41bc31f..fb826a278 100644 --- a/apps/ftp/ftp-dsc.c +++ b/apps/ftp/ftp-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: ftp-dsc.c,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $ + * $Id: ftp-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon ftp_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(ftp_dsc, - "FTP client", - "ftp.prg", - ftp_process, - &ftp_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char ftpicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon ftp_icon = {CTK_ICON("FTP client", ftpicon_bitmap, ftpicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(ftp_dsc, + "FTP client", + "ftp.prg", + ftp_process, + &ftp_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/irc/irc-dsc.c b/apps/irc/irc-dsc.c index bd927d51b..0878b18c0 100644 --- a/apps/irc/irc-dsc.c +++ b/apps/irc/irc-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: irc-dsc.c,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $ + * $Id: irc-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon irc_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(irc_dsc, - "Internet Relay Chat client", - "irc.prg", - irc_process, - &irc_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char irc_icon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon irc_icon = {CTK_ICON("IRC client", irc_icon_bitmap, irc_icon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(irc_dsc, + "Internet Relay Chat client", + "irc.prg", + irc_process, + &irc_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/netconf/netconf-dsc.c b/apps/netconf/netconf-dsc.c index 264715f8e..026e8a20d 100644 --- a/apps/netconf/netconf-dsc.c +++ b/apps/netconf/netconf-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: netconf-dsc.c,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $ + * $Id: netconf-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon netconf_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(netconf_dsc, - "Network configuration", - "netconf.prg", - netconf_process, - &netconf_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char tcpipconficon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon netconf_icon = {CTK_ICON("Network setup", tcpipconficon_bitmap, tcpipconficon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(netconf_dsc, + "Network configuration", + "netconf.prg", + netconf_process, + &netconf_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/process-list/process-list-dsc.c b/apps/process-list/process-list-dsc.c index f43331340..e2826f8a7 100644 --- a/apps/process-list/process-list-dsc.c +++ b/apps/process-list/process-list-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: process-list-dsc.c,v 1.2 2007/08/30 14:39:17 matsutsuka Exp $ + * $Id: process-list-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon processes_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(processes_dsc, - "Process information", - "processes.prg", - processes_process, - &processes_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char processesicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon processes_icon = {CTK_ICON("Processes", processesicon_bitmap, processesicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(processes_dsc, + "Process information", + "processes.prg", + processes_process, + &processes_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/shell/shell-dsc.c b/apps/shell/shell-dsc.c index 01e312c3a..24426345c 100644 --- a/apps/shell/shell-dsc.c +++ b/apps/shell/shell-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: shell-dsc.c,v 1.2 2007/08/30 14:39:16 matsutsuka Exp $ + * $Id: shell-dsc.c,v 1.3 2007/09/06 01:36:10 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon shell_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(shell_dsc, - "The Contiki command shell", - "shell.prg", - shell_gui_process, - &shell_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char shellicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon shell_icon = {CTK_ICON("Command shell", shellicon_bitmap, shellicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(shell_dsc, + "The Contiki command shell", + "shell.prg", + shell_gui_process, + &shell_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/telnet/telnet-dsc.c b/apps/telnet/telnet-dsc.c index 6e1889779..93df5f7c7 100644 --- a/apps/telnet/telnet-dsc.c +++ b/apps/telnet/telnet-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: telnet-dsc.c,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $ + * $Id: telnet-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon telnet_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(telnet_dsc, - "A simple Telnet client", - "telnet.prg", - simpletelnet_process, - &telnet_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char telneticon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon telnet_icon = {CTK_ICON("Telnet", telneticon_bitmap, telneticon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(telnet_dsc, + "A simple Telnet client", + "telnet.prg", + simpletelnet_process, + &telnet_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/telnetd/telnetd-dsc.c b/apps/telnetd/telnetd-dsc.c index 25db1a28a..9ff99dec5 100644 --- a/apps/telnetd/telnetd-dsc.c +++ b/apps/telnetd/telnetd-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: telnetd-dsc.c,v 1.2 2007/08/30 14:39:19 matsutsuka Exp $ + * $Id: telnetd-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon telnetd_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(telnetd_dsc, - "Telnet shell server", - "telnetd.prg", - telnetd_process, - &telnetd_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char telnetdicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon telnetd_icon = {CTK_ICON("Telnet server", telnetdicon_bitmap, telnetdicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(telnetd_dsc, + "Telnet shell server", + "telnetd.prg", + telnetd_process, + &telnetd_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/vnc/vnc-dsc.c b/apps/vnc/vnc-dsc.c index 88c592fb9..90262f2b7 100644 --- a/apps/vnc/vnc-dsc.c +++ b/apps/vnc/vnc-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: vnc-dsc.c,v 1.2 2007/08/30 14:39:17 matsutsuka Exp $ + * $Id: vnc-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon vnc_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(vnc_dsc, - "Remote control your PC using Contiki", - "vnc.prg", - vnc_process, - &vnc_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char vncicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon vnc_icon = {CTK_ICON("VNC viewer", vncicon_bitmap, vncicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(vnc_dsc, + "Remote control your PC using Contiki", + "vnc.prg", + vnc_process, + &vnc_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/webbrowser/www-dsc.c b/apps/webbrowser/www-dsc.c index 65356a7e1..f4cf170c3 100644 --- a/apps/webbrowser/www-dsc.c +++ b/apps/webbrowser/www-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: www-dsc.c,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $ + * $Id: www-dsc.c,v 1.3 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon www_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(www_dsc, - "The Contiki web browser", - "www.prg", - www_process, - &www_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char wwwicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon www_icon = {CTK_ICON("Web browser", wwwicon_bitmap, wwwicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(www_dsc, + "The Contiki web browser", + "www.prg", + www_process, + &www_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/apps/webserver/webserver-dsc.c b/apps/webserver/webserver-dsc.c index bd33d85f8..112337650 100644 --- a/apps/webserver/webserver-dsc.c +++ b/apps/webserver/webserver-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: webserver-dsc.c,v 1.2 2007/08/30 14:39:18 matsutsuka Exp $ + * $Id: webserver-dsc.c,v 1.3 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern static struct ctk_icon webserver_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(webserver_dsc, - "The Contiki web server", - "webserver.prg", - webserver_process, - &webserver_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char webservericon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon webserver_icon = {CTK_ICON("Web server", webservericon_bitmap, webservericon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(webserver_dsc, + "The Contiki web server", + "webserver.prg", + webserver_process, + &webserver_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/apps/editor/editor-dsc.c b/backyard/apps/editor/editor-dsc.c index cca4a9bc8..e15606e97 100644 --- a/backyard/apps/editor/editor-dsc.c +++ b/backyard/apps/editor/editor-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: editor-dsc.c,v 1.1 2007/05/23 23:34:33 oliverschmidt Exp $ + * $Id: editor-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon editor_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(editor_dsc, - "A simple text editor", - "editor.prg", - editor_process, - &editor_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char editoricon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon editor_icon = {CTK_ICON("Editor", editoricon_bitmap, editoricon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(editor_dsc, + "A simple text editor", + "editor.prg", + editor_process, + &editor_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/cpu/6502/apps/memstat-dsc.c b/backyard/cpu/6502/apps/memstat-dsc.c index 825118dca..72af2d9ab 100644 --- a/backyard/cpu/6502/apps/memstat-dsc.c +++ b/backyard/cpu/6502/apps/memstat-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: memstat-dsc.c,v 1.1 2007/05/23 23:47:44 oliverschmidt Exp $ + * $Id: memstat-dsc.c,v 1.2 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon memstat_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(memstat_dsc, - "Memory stats", - "memstat.prg", - memstat_init, - &memstat_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char memstaticon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon memstat_icon = {CTK_ICON("Memory stats", memstaticon_bitmap, memstaticon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(memstat_dsc, + "Memory stats", + "memstat.prg", + memstat_init, + &memstat_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/blueround-dsc.c b/backyard/platform/c64/apps/blueround-dsc.c index 12c0c68d1..a6afa0526 100644 --- a/backyard/platform/c64/apps/blueround-dsc.c +++ b/backyard/platform/c64/apps/blueround-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: blueround-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: blueround-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon blueround_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(blueround_dsc, - "Blueround CTK theme", - "blueround.prg", - blueround_init, - &blueround_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char blueroundicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon blueround_icon = {CTK_ICON("Blueround", blueroundicon_bitmap, blueroundicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(blueround_dsc, + "Blueround CTK theme", + "blueround.prg", + blueround_init, + &blueround_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/cgterm-dsc.c b/backyard/platform/c64/apps/cgterm-dsc.c index c760a0d1b..12cb65705 100644 --- a/backyard/platform/c64/apps/cgterm-dsc.c +++ b/backyard/platform/c64/apps/cgterm-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: cgterm-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: cgterm-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon cgterm_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(cgterm_dsc, - "Program for connecting to C64 Telnet BBSes", - "cgterm.prg", - cgterm_init, - &cgterm_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char cgtermicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon cgterm_icon = {CTK_ICON("C/G terminal", cgtermicon_bitmap, cgtermicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(cgterm_dsc, + "Program for connecting to C64 Telnet BBSes", + "cgterm.prg", + cgterm_init, + &cgterm_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/configedit-dsc.c b/backyard/platform/c64/apps/configedit-dsc.c index e7d9a26b3..589e2d29b 100644 --- a/backyard/platform/c64/apps/configedit-dsc.c +++ b/backyard/platform/c64/apps/configedit-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: configedit-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: configedit-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon configedit_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(configedit_dsc, - "Edit Contiki configuration", - "configedit.prg", - configedit_init, - &configedit_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char tcpipconficon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon configedit_icon = {CTK_ICON("Configuration", tcpipconficon_bitmap, tcpipconficon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(configedit_dsc, + "Edit Contiki configuration", + "configedit.prg", + configedit_init, + &configedit_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/default-dsc.c b/backyard/platform/c64/apps/default-dsc.c index c329c3579..35e39247c 100644 --- a/backyard/platform/c64/apps/default-dsc.c +++ b/backyard/platform/c64/apps/default-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: default-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: default-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon default_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(default_dsc, - "Default CTK theme", - "default.prg", - default_init, - &default_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char defaulticon_bitmap[3*3*8] = { @@ -70,3 +63,9 @@ static struct ctk_icon default_icon = {CTK_ICON("Default", defaulticon_bitmap, defaulticon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(default_dsc, + "Default CTK theme", + "default.prg", + default_init, + &default_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/enabler-dsc.c b/backyard/platform/c64/apps/enabler-dsc.c index 2c2733329..a8ed02ce6 100644 --- a/backyard/platform/c64/apps/enabler-dsc.c +++ b/backyard/platform/c64/apps/enabler-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: enabler-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: enabler-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon enabler_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(enabler_dsc, - "Colorless grayish CTK theme", - "enabler.prg", - enabler_init, - &enabler_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char enablericon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon enabler_icon = {CTK_ICON("Enabler", enablericon_bitmap, enablericon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(enabler_dsc, + "Colorless grayish CTK theme", + "enabler.prg", + enabler_init, + &enabler_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/memstat-dsc.c b/backyard/platform/c64/apps/memstat-dsc.c index fae999537..e588dbf83 100644 --- a/backyard/platform/c64/apps/memstat-dsc.c +++ b/backyard/platform/c64/apps/memstat-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: memstat-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: memstat-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon memstat_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(memstat_dsc, - "Memory statistics", - "memstat.prg", - memstat_init, - &memstat_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char memstaticon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon memstat_icon = {CTK_ICON("Memory stats", memstaticon_bitmap, memstaticon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(memstat_dsc, + "Memory statistics", + "memstat.prg", + memstat_init, + &memstat_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/plasma-dsc.c b/backyard/platform/c64/apps/plasma-dsc.c index da96f8f54..ec27e2859 100644 --- a/backyard/platform/c64/apps/plasma-dsc.c +++ b/backyard/platform/c64/apps/plasma-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: plasma-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: plasma-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon plasma_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(plasma_dsc, - "Screensaver with a plasma", - "plasma.sav", - plasma_init, - &plasma_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char plasmaicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon plasma_icon = {CTK_ICON("Plasma", plasmaicon_bitmap, plasmaicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(plasma_dsc, + "Screensaver with a plasma", + "plasma.sav", + plasma_init, + &plasma_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/ravenpine-dsc.c b/backyard/platform/c64/apps/ravenpine-dsc.c index d7207c8c8..c6873648d 100644 --- a/backyard/platform/c64/apps/ravenpine-dsc.c +++ b/backyard/platform/c64/apps/ravenpine-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: ravenpine-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: ravenpine-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon ravenpine_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(ravenpine_dsc, - "Terminal green CTK theme", - "ravenpine.prg", - ravenpine_init, - &ravenpine_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char ravenpineicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon ravenpine_icon = {CTK_ICON("Ravenpine", ravenpineicon_bitmap, ravenpineicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(ravenpine_dsc, + "Terminal green CTK theme", + "ravenpine.prg", + ravenpine_init, + &ravenpine_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/springlight-dsc.c b/backyard/platform/c64/apps/springlight-dsc.c index 72a3d2e4e..175d3acbf 100644 --- a/backyard/platform/c64/apps/springlight-dsc.c +++ b/backyard/platform/c64/apps/springlight-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: springlight-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: springlight-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon springlight_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(springlight_dsc, - "Spring green CTK theme", - "springlight.prg", - springlight_init, - &springlight_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char springlighticon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon springlight_icon = {CTK_ICON("Springlight", springlighticon_bitmap, springlighticon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(springlight_dsc, + "Spring green CTK theme", + "springlight.prg", + springlight_init, + &springlight_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/ssfire-dsc.c b/backyard/platform/c64/apps/ssfire-dsc.c index 01397b92e..0eb5f4de3 100644 --- a/backyard/platform/c64/apps/ssfire-dsc.c +++ b/backyard/platform/c64/apps/ssfire-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: ssfire-dsc.c,v 1.1 2007/05/23 23:11:24 oliverschmidt Exp $ + * $Id: ssfire-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon ssfire_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(ssfire_dsc, - "Screensaver with two fires", - "ssfire.sav", - ssfire_init, - &ssfire_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char ssfireicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon ssfire_icon = {CTK_ICON("Fire", ssfireicon_bitmap, ssfireicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(ssfire_dsc, + "Screensaver with two fires", + "ssfire.sav", + ssfire_init, + &ssfire_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/apps/wget-dsc.c b/backyard/platform/c64/apps/wget-dsc.c index f4fca248f..31af4d0d2 100644 --- a/backyard/platform/c64/apps/wget-dsc.c +++ b/backyard/platform/c64/apps/wget-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: wget-dsc.c,v 1.1 2007/05/23 23:11:26 oliverschmidt Exp $ + * $Id: wget-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon wget_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(wget_dsc, - "Downloads files or D64 disks from the web", - "wget.prg", - wget_init, - &wget_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char wgeticon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon wget_icon = {CTK_ICON("Web downloader", wgeticon_bitmap, wgeticon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(wget_dsc, + "Downloads files or D64 disks from the web", + "wget.prg", + wget_init, + &wget_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/net/eth64-dsc.c b/backyard/platform/c64/net/eth64-dsc.c index 2f8c12115..3adc5f29f 100644 --- a/backyard/platform/c64/net/eth64-dsc.c +++ b/backyard/platform/c64/net/eth64-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: eth64-dsc.c,v 1.1 2007/05/23 23:11:29 oliverschmidt Exp $ + * $Id: eth64-dsc.c,v 1.2 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon lan91c96_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(lan91c96_dsc, - "IDE64/ETH64 driver", - "lan91c96.drv", - lan91c96_init, - &lan91c96_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char lan91c96icon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon lan91c96_icon = {CTK_ICON("ETH64 driver", lan91c96icon_bitmap, lan91c96icon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(lan91c96_dsc, + "IDE64/ETH64 driver", + "lan91c96.drv", + lan91c96_init, + &lan91c96_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/net/rrnet-dsc.c b/backyard/platform/c64/net/rrnet-dsc.c index e840d110d..84262ee79 100644 --- a/backyard/platform/c64/net/rrnet-dsc.c +++ b/backyard/platform/c64/net/rrnet-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: rrnet-dsc.c,v 1.1 2007/05/23 23:11:30 oliverschmidt Exp $ + * $Id: rrnet-dsc.c,v 1.2 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon rrnet_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(rrnet_dsc, - "RR-Net driver", - "rrnet.drv", - rrnet_init, - &rrnet_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char rrneticon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon rrnet_icon = {CTK_ICON("RR-Net driver", rrneticon_bitmap, rrneticon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(rrnet_dsc, + "RR-Net driver", + "rrnet.drv", + rrnet_init, + &rrnet_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/backyard/platform/c64/net/tfe-dsc.c b/backyard/platform/c64/net/tfe-dsc.c index 1dc92546f..c4e9b36b6 100644 --- a/backyard/platform/c64/net/tfe-dsc.c +++ b/backyard/platform/c64/net/tfe-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: tfe-dsc.c,v 1.1 2007/05/23 23:11:30 oliverschmidt Exp $ + * $Id: tfe-dsc.c,v 1.2 2007/09/06 01:36:12 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon tfe_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(tfe_dsc, - "The Final Ethernet driver", - "tfe.drv", - tfe_init, - &tfe_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char tfeicon_bitmap[3*3*8] = { @@ -72,3 +65,9 @@ static struct ctk_icon tfe_icon = {CTK_ICON("TFE driver", tfeicon_bitmap, tfeicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(tfe_dsc, + "The Final Ethernet driver", + "tfe.drv", + tfe_init, + &tfe_icon); +/*-----------------------------------------------------------------------------------*/ diff --git a/cpu/6502/net/slip-dsc.c b/cpu/6502/net/slip-dsc.c index c50349e3e..11fe26dff 100644 --- a/cpu/6502/net/slip-dsc.c +++ b/cpu/6502/net/slip-dsc.c @@ -29,19 +29,12 @@ * * This file is part of the Contiki desktop environment * - * $Id: slip-dsc.c,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $ + * $Id: slip-dsc.c,v 1.2 2007/09/06 01:36:11 matsutsuka Exp $ * */ #include "sys/dsc.h" -extern struct ctk_icon slip_icon; -/*-----------------------------------------------------------------------------------*/ -DSC(slip_dsc, - "SLIP driver", - "slip.drv", - slip_init, - &slip_icon); /*-----------------------------------------------------------------------------------*/ #if CTK_CONF_ICON_BITMAPS static unsigned char slipicon_bitmap[3*3*8] = { @@ -70,3 +63,9 @@ static struct ctk_icon slip_icon = {CTK_ICON("SLIP driver", slipicon_bitmap, slipicon_textmap)}; #endif /* CTK_CONF_ICONS */ /*-----------------------------------------------------------------------------------*/ +DSC(slip_dsc, + "SLIP driver", + "slip.drv", + slip_init, + &slip_icon); +/*-----------------------------------------------------------------------------------*/