Removed SELFSTART_PROCESS as AUTOSTART_ENABLE generally serves that purpose - and AUTOSTART_ENABLE gets already set as required :-)

This commit is contained in:
oliverschmidt 2008-02-08 22:48:28 +00:00
parent e70e729be6
commit 614fa668cd
16 changed files with 19 additions and 44 deletions

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: about.c,v 1.3 2008/02/07 16:28:11 oliverschmidt Exp $ * $Id: about.c,v 1.4 2008/02/08 22:48:28 oliverschmidt Exp $
* *
*/ */
@ -60,9 +60,7 @@ static struct ctk_button aboutclose =
PROCESS(about_process, "About Contiki"); PROCESS(about_process, "About Contiki");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&about_process); AUTOSTART_PROCESSES(&about_process);
#endif /* SELFSTART_PROCESS */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void static void

View file

@ -29,7 +29,7 @@
* *
* This an example program for the Contiki desktop OS * This an example program for the Contiki desktop OS
* *
* $Id: calc.c,v 1.4 2008/02/07 16:28:27 oliverschmidt Exp $ * $Id: calc.c,v 1.5 2008/02/08 22:48:47 oliverschmidt Exp $
* *
*/ */
@ -82,9 +82,7 @@ static struct ctk_button calcbutton =
PROCESS(calc_process, "Calculator"); PROCESS(calc_process, "Calculator");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&calc_process); AUTOSTART_PROCESSES(&calc_process);
#endif /* SELFSTART_PROCESS */
static unsigned long operand1, operand2; static unsigned long operand1, operand2;
static unsigned char op; static unsigned char op;

View file

@ -6,9 +6,7 @@
PROCESS(dhcp_process, "DHCP"); PROCESS(dhcp_process, "DHCP");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&dhcp_process); AUTOSTART_PROCESSES(&dhcp_process);
#endif /* SELFSTART_PROCESS */
static struct ctk_window window; static struct ctk_window window;
static struct ctk_button getbutton = static struct ctk_button getbutton =

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: directory.c,v 1.5 2008/02/07 16:29:08 oliverschmidt Exp $ * $Id: directory.c,v 1.6 2008/02/08 22:49:29 oliverschmidt Exp $
* *
*/ */
@ -76,9 +76,7 @@ static struct ctk_button reloadbutton =
PROCESS(directory_process, "Directory browser"); PROCESS(directory_process, "Directory browser");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&directory_process); AUTOSTART_PROCESSES(&directory_process);
#endif /* SELFSTART_PROCESS */
static unsigned char width, height; static unsigned char width, height;

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment for the C64. * This file is part of the Contiki desktop environment for the C64.
* *
* $Id: email.c,v 1.4 2008/02/07 16:29:24 oliverschmidt Exp $ * $Id: email.c,v 1.5 2008/02/08 22:49:54 oliverschmidt Exp $
* *
*/ */
@ -157,9 +157,7 @@ static struct ctk_button setupokbutton =
PROCESS(email_process, "E-mail client"); PROCESS(email_process, "E-mail client");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&email_process); AUTOSTART_PROCESSES(&email_process);
#endif /* SELFSTART_PROCESS */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void static void

View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: ftp.c,v 1.5 2008/02/07 16:30:08 oliverschmidt Exp $ * $Id: ftp.c,v 1.6 2008/02/08 22:50:23 oliverschmidt Exp $
*/ */
/* Note to self: It would be nice to have a "View" option in the download dialog. */ /* Note to self: It would be nice to have a "View" option in the download dialog. */
@ -52,9 +52,7 @@
PROCESS(ftp_process, "FTP client"); PROCESS(ftp_process, "FTP client");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&ftp_process); AUTOSTART_PROCESSES(&ftp_process);
#endif /* SELFSTART_PROCESS */
static void *connection; static void *connection;

View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: irc.c,v 1.6 2008/02/07 16:30:24 oliverschmidt Exp $ * $Id: irc.c,v 1.7 2008/02/08 22:50:43 oliverschmidt Exp $
*/ */
#include <string.h> #include <string.h>
@ -60,9 +60,7 @@
PROCESS(irc_process, "IRC client"); PROCESS(irc_process, "IRC client");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&irc_process); AUTOSTART_PROCESSES(&irc_process);
#endif /* SELFSTART_PROCESS */
static struct ctk_window window; static struct ctk_window window;
static char log[LOG_WIDTH * LOG_HEIGHT]; static char log[LOG_WIDTH * LOG_HEIGHT];

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: netconf.c,v 1.7 2008/02/07 16:30:42 oliverschmidt Exp $ * $Id: netconf.c,v 1.8 2008/02/08 22:51:01 oliverschmidt Exp $
* *
*/ */
@ -67,9 +67,7 @@ static struct ctk_button tcpipclosebutton =
PROCESS(netconf_process, "Network configurator"); PROCESS(netconf_process, "Network configurator");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&netconf_process); AUTOSTART_PROCESSES(&netconf_process);
#endif /* SELFSTART_PROCESS */
static void makestrings(void); static void makestrings(void);

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: process-list.c,v 1.7 2008/02/07 16:30:58 oliverschmidt Exp $ * $Id: process-list.c,v 1.8 2008/02/08 22:51:27 oliverschmidt Exp $
* *
*/ */
@ -65,9 +65,7 @@ static struct ctk_button processclosebutton =
PROCESS(processes_process, "Process listing"); PROCESS(processes_process, "Process listing");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&processes_process); AUTOSTART_PROCESSES(&processes_process);
#endif /* SELFSTART_PROCESS */
enum { enum {
EVENT_UPDATE EVENT_UPDATE

View file

@ -43,7 +43,7 @@
* *
* This file is part of the Contiki desktop OS * This file is part of the Contiki desktop OS
* *
* $Id: program-handler.c,v 1.8 2008/02/07 16:31:14 oliverschmidt Exp $ * $Id: program-handler.c,v 1.9 2008/02/08 22:51:57 oliverschmidt Exp $
* *
*/ */
@ -124,9 +124,7 @@ static struct ctk_button errorokbutton =
PROCESS(program_handler_process, "Program handler"); PROCESS(program_handler_process, "Program handler");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&program_handler_process); AUTOSTART_PROCESSES(&program_handler_process);
#endif /* SELFSTART_PROCESS */
static const char * const errormsgs[] = { static const char * const errormsgs[] = {
"Ok", "Ok",

View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki desktop OS. * This file is part of the Contiki desktop OS.
* *
* $Id: gui-shell.c,v 1.2 2008/02/08 12:49:54 oliverschmidt Exp $ * $Id: gui-shell.c,v 1.3 2008/02/08 22:52:18 oliverschmidt Exp $
* *
*/ */
@ -64,9 +64,7 @@ static struct ctk_textentry commandentry =
PROCESS(shell_gui_process, "Command shell"); PROCESS(shell_gui_process, "Command shell");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&shell_gui_process); AUTOSTART_PROCESSES(&shell_gui_process);
#endif /* SELFSTART_PROCESS */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
void void

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: simpletelnet.c,v 1.4 2008/02/07 16:31:34 oliverschmidt Exp $ * $Id: simpletelnet.c,v 1.5 2008/02/08 22:52:43 oliverschmidt Exp $
* *
*/ */
@ -91,9 +91,7 @@ static char sendline[31+2];
PROCESS(simpletelnet_process, "Telnet client"); PROCESS(simpletelnet_process, "Telnet client");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&simpletelnet_process); AUTOSTART_PROCESSES(&simpletelnet_process);
#endif /* SELFSTART_PROCESS */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void static void

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: www.c,v 1.8 2008/02/07 16:31:51 oliverschmidt Exp $ * $Id: www.c,v 1.9 2008/02/08 22:53:11 oliverschmidt Exp $
* *
*/ */
@ -164,9 +164,7 @@ static char receivingmsgs[4][23] = {
PROCESS(www_process, "Web browser"); PROCESS(www_process, "Web browser");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&www_process); AUTOSTART_PROCESSES(&www_process);
#endif /* SELFSTART_PROCESS */
static void formsubmit(struct formattribs *attribs); static void formsubmit(struct formattribs *attribs);

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki OS. * This file is part of the Contiki OS.
* *
* $Id: webserver-nogui.c,v 1.4 2007/04/23 21:19:55 oliverschmidt Exp $ * $Id: webserver-nogui.c,v 1.5 2008/02/08 22:53:32 oliverschmidt Exp $
* *
*/ */
@ -44,6 +44,9 @@
#include "httpd.h" #include "httpd.h"
PROCESS(webserver_nogui_process, "Web server"); PROCESS(webserver_nogui_process, "Web server");
AUTOSTART_PROCESSES(&webserver_nogui_process);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(webserver_nogui_process, ev, data) PROCESS_THREAD(webserver_nogui_process, ev, data)
{ {

View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment for the C64. * This file is part of the Contiki desktop environment for the C64.
* *
* $Id: webserver.c,v 1.4 2008/02/07 16:32:11 oliverschmidt Exp $ * $Id: webserver.c,v 1.5 2008/02/08 22:53:32 oliverschmidt Exp $
* *
*/ */
@ -51,9 +51,7 @@ static struct ctk_label message =
PROCESS(webserver_process, "Web server"); PROCESS(webserver_process, "Web server");
#if SELFSTART_PROCESS
AUTOSTART_PROCESSES(&webserver_process); AUTOSTART_PROCESSES(&webserver_process);
#endif /* SELFSTART_PROCESS */
#define LOG_WIDTH 38 #define LOG_WIDTH 38
#define LOG_HEIGHT 16 #define LOG_HEIGHT 16

View file

@ -30,7 +30,7 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $Id: Makefile.win32,v 1.12 2008/02/07 16:34:18 oliverschmidt Exp $ # $Id: Makefile.win32,v 1.13 2008/02/08 22:55:59 oliverschmidt Exp $
# #
ifndef CONTIKI ifndef CONTIKI
@ -75,7 +75,7 @@ ${foreach DSC,$(DSCS),${eval ${call dsc_template,$(DSC),${call appname,$(DSC)}}}
### (The *.d files contain the full module-compile prerequisites) ### (The *.d files contain the full module-compile prerequisites)
${sort ${foreach PRG,$(PRGS), ${addprefix $(OBJECTDIR)/, \ ${sort ${foreach PRG,$(PRGS), ${addprefix $(OBJECTDIR)/, \
$(${call appname,$(PRG)_src:.c=.o})}}}: $(${call appname,$(PRG)_src:.c=.o})}}}:
$(CC) $(CFLAGS) -DAUTOSTART_ENABLE -DSELFSTART_PROCESS -D_USRDLL -c $< -o $@ $(CC) $(CFLAGS) -DAUTOSTART_ENABLE -D_USRDLL -c $< -o $@
$(PRGS:=.prg): $(PRGS:=.prg):
$(LD) -shared $^ contiki-main.$(TARGET).a -o $@ $(LD) -shared $^ contiki-main.$(TARGET).a -o $@
$(DSCS:=.dsc): $(DSCS:=.dsc):