Updated for the new kernel API
diff --git a/contiki-c128/Makefile b/contiki-c128/Makefile
index 4c815e7..1006f3a 100644
--- a/contiki-c128/Makefile
+++ b/contiki-c128/Makefile
@@ -9,10 +9,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Adam Dunkels.
-# 4. The name of the author may not be used to endorse or promote
+# 3. The name of the author may not be used to endorse or promote
# products derived from this software without specific prior
# written permission.
#
@@ -30,7 +27,7 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile,v 1.2 2003/09/07 18:11:56 adamdunkels Exp $
+# $Id: Makefile,v 1.3 2004/07/04 19:51:19 adamdunkels Exp $
#
all: contiki loader-arch-module.o loader-arch-dsc.o contiki-labels.o \
@@ -46,7 +43,7 @@
CFLAGS=$(CFLAGSCOMMON) -DWITH_LOADER_ARCH
-UIP=uip.o uip_arch.o uip_main.o resolv.o
+UIP=uip.o uip_arch.o uiplib.o resolv.o tcpip.o
WWW=www.o webclient.o http-strings.o htmlparser.o html-strings.o
EMAIL=email.o smtp.o smtp-strings.o
@@ -54,7 +51,7 @@
TELNET=simpletelnet.o telnet.o
contiki: contiki-main.o strncasecmp.o petsciiconv.o \
- ctk-conio.o ctk.o arg.o dispatcher.o \
+ ctk-conio.o ctk.o arg.o ek.o timer.o \
program-handler.o loader-arch.o \
about-dsc.o netconf-dsc.o processes-dsc.o memstat-dsc.o
$(CL) $(CLFLAGS) -o contiki -t $(SYS) $^
diff --git a/contiki-c128/Makefile.depend b/contiki-c128/Makefile.depend
index 92e4e4c..fc1cff0 100644
--- a/contiki-c128/Makefile.depend
+++ b/contiki-c128/Makefile.depend
@@ -1,9 +1,10 @@
-contiki-main.o: contiki-main.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ctk/ctk-draw.h ../contiki/ek/dispatcher.h \
+contiki-main.o: contiki-main.c ../contiki/ek/contiki.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
+ ../contiki/lib/memb.h ../contiki/lib/timer.h ../contiki/lib/clock.h \
+ conf/clock-conf.h ../contiki/ctk/ctk-draw.h ../contiki/ctk/ctk.h \
+ conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
../contiki/apps/processes-dsc.h ../contiki/apps/about-dsc.h \
../contiki/apps/netconf-dsc.h ../contiki-cc65/apps/memstat-dsc.h \
@@ -12,315 +13,310 @@
about-dsc.o: ../contiki/apps/about-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-about.o: ../contiki/apps/about.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ctk/ctk-draw.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/lib/petsciiconv.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
+about.o: ../contiki/apps/about.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/lib/petsciiconv.h
calc-dsc.o: ../contiki/apps/calc-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-calc.o: ../contiki/apps/calc.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
+calc.o: ../contiki/apps/calc.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h
email-dsc.o: ../contiki/apps/email-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-email.o: ../contiki/apps/email.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
+email.o: ../contiki/apps/email.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/apps/smtp.h \
../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/apps/smtp.h ../contiki/uip/uiplib.h \
+ ../contiki/uip/tcpip.h ../contiki/uip/uiplib.h \
../contiki/lib/petsciiconv.h ../contiki/lib/ctk-textedit.h
html-strings.o: ../contiki/apps/html-strings.c
htmlparser.o: ../contiki/apps/htmlparser.c \
../contiki/apps/htmlparser.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h \
../contiki/apps/html-strings.h conf/www-conf.h
http-strings.o: ../contiki/apps/http-strings.c
http-user-agent-string.o: ../contiki/apps/http-user-agent-string.c
-httpd-cgi.o: ../contiki/apps/httpd-cgi.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/httpd.h \
- ../contiki/apps/httpd-cgi.h ../contiki/apps/httpd-fs.h \
- ../contiki/lib/petsciiconv.h
-httpd-fs.o: ../contiki/apps/httpd-fs.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/httpd.h \
- ../contiki/apps/httpd-fs.h ../contiki/apps/httpd-fsdata.h \
- ../contiki/apps/httpd-fsdata.c
httpd-fsdata.o: ../contiki/apps/httpd-fsdata.c
-httpd.o: ../contiki/apps/httpd.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/httpd.h \
- ../contiki/apps/httpd-fs.h ../contiki/apps/httpd-fsdata.h \
- ../contiki/apps/httpd-cgi.h
netconf-dsc.o: ../contiki/apps/netconf-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-netconf.o: ../contiki/apps/netconf.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uiplib.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
+netconf.o: ../contiki/apps/netconf.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/uip/uiplib.h \
../contiki/uip/uip_arp.h ../contiki/uip/resolv.h ../contiki/ctk/ctk.h \
conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
../contiki/ctk/ctk-draw.h
processes-dsc.o: ../contiki/apps/processes-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-processes.o: ../contiki/apps/processes.c ../contiki/ctk/ctk.h \
- conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
+processes.o: ../contiki/apps/processes.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h
program-handler.o: ../contiki/apps/program-handler.c \
- ../contiki/lib/petsciiconv.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/ctk/ctk.h \
- conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
- ../contiki/ctk/ctk-draw.h ../contiki/uip/resolv.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h \
+ ../contiki/lib/petsciiconv.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ctk/ctk-draw.h \
../contiki/apps/program-handler.h ../contiki/ek/dsc.h
shell-dsc.o: ../contiki/apps/shell-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-shell-gui.o: ../contiki/apps/shell-gui.c \
- ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
- ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
- ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h \
- ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h \
- ../contiki/apps/shell.h ../contiki/uip/uip-signal.h
-simpletelnet.o: ../contiki/apps/simpletelnet.c \
- ../contiki/lib/petsciiconv.h ../contiki/uip/uiplib.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/uip/resolv.h \
- ../contiki/apps/telnet.h ../contiki/apps/simpletelnet.h
+ ../contiki/ek/loader.h
+simpletelnet.o: ../contiki/apps/simpletelnet.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/lib/petsciiconv.h \
+ ../contiki/uip/uiplib.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/ctk/ctk.h \
+ conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
+ ../contiki/uip/resolv.h ../contiki/apps/telnet.h \
+ ../contiki/apps/simpletelnet.h
smtp-strings.o: ../contiki/apps/smtp-strings.c
smtp.o: ../contiki/apps/smtp.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/smtp.h \
../contiki/apps/smtp-strings.h
telnet-dsc.o: ../contiki/apps/telnet-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-telnet.o: ../contiki/apps/telnet.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
+telnet.o: ../contiki/apps/telnet.c ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/apps/telnet.h
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/apps/telnet.h
telnetd-dsc.o: ../contiki/apps/telnetd-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
telnetd-gui.o: ../contiki/apps/telnetd-gui.c \
../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h \
- ../contiki/lib/petsciiconv.h ../contiki/uip/uip_arp.h \
- ../contiki/uip/resolv.h ../contiki/apps/telnetd.h \
- ../contiki/lib/memb.h ../contiki/apps/shell.h \
- ../contiki/uip/uip-signal.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/lib/petsciiconv.h \
+ ../contiki/uip/uip_arp.h ../contiki/uip/resolv.h \
+ ../contiki/apps/telnetd.h ../contiki/ek/contiki.h \
+ ../contiki/lib/memb.h ../contiki/lib/timer.h ../contiki/lib/clock.h \
+ conf/clock-conf.h ../contiki/apps/shell.h ../contiki/uip/uip-signal.h
vnc-dsc.o: ../contiki/apps/vnc-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
vnc-viewer.o: ../contiki/apps/vnc-viewer.c ../contiki/apps/vnc-draw.h \
../contiki-cc65/uip/uip_arch.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h \
../contiki/apps/vnc-viewer.h
-webclient.o: ../contiki/apps/webclient.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/apps/webclient.h ../contiki/apps/http-strings.h \
+webclient.o: ../contiki/apps/webclient.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/tcpip.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/apps/webclient.h \
+ ../contiki/apps/http-strings.h \
../contiki/apps/http-user-agent-string.h ../contiki/uip/resolv.h \
../contiki/uip/uiplib.h conf/www-conf.h
webserver-dsc.o: ../contiki/apps/webserver-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-webserver.o: ../contiki/apps/webserver.c ../contiki/ctk/ctk.h \
- conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/apps/http-strings.h ../contiki/lib/petsciiconv.h \
- ../contiki/apps/webserver.h ../contiki/apps/httpd.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
www-dsc.o: ../contiki/apps/www-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
-www.o: ../contiki/apps/www.c ../contiki/ctk/ctk.h conf/ctk-conf.h \
- ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/apps/webclient.h ../contiki/apps/http-strings.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
+www.o: ../contiki/apps/www.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/apps/webclient.h \
+ ../contiki/apps/http-strings.h \
../contiki/apps/http-user-agent-string.h ../contiki/uip/resolv.h \
- ../contiki/apps/htmlparser.h ../contiki/lib/petsciiconv.h \
- ../contiki/apps/program-handler.h ../contiki/ek/dsc.h \
- ../contiki/uip/uiplib.h conf/www-conf.h
+ ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/apps/htmlparser.h \
+ ../contiki/lib/petsciiconv.h ../contiki/apps/program-handler.h \
+ ../contiki/ek/dsc.h ../contiki/uip/uiplib.h conf/www-conf.h
+ctk-conio-service.o: ../contiki/ctk/ctk-conio-service.c \
+ ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
+ ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk-draw-service.h ../contiki/ek/ek-service.h \
+ ctk/ctk-conio-conf.h
ctk-conio.o: ../contiki/ctk/ctk-conio.c ../contiki/ctk/ctk.h \
conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ctk/ctk-draw.h ctk/ctk-conio-conf.h
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
+ ctk/ctk-conio-conf.h
+ctk-draw.o: ../contiki/ctk/ctk-draw.c ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
+ ../contiki/ctk/ctk-conio.h ../contiki/ctk/ctk-draw-service.h
ctk-vncfont.o: ../contiki/ctk/ctk-vncfont.c
-ctk.o: ../contiki/ctk/ctk.c ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ctk/ctk.h \
- conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
- ../contiki/ctk/ctk-draw.h ../contiki/ctk/ctk-mouse.h
+ctk.o: ../contiki/ctk/ctk.c ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
+ ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ctk/ctk-draw.h \
+ ../contiki/ctk/ctk-mouse.h ../contiki/lib/timer.h \
+ ../contiki/lib/clock.h conf/clock-conf.h
vnc-server.o: ../contiki/ctk/vnc-server.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h \
../contiki/ctk/vnc-server.h ../contiki/ctk/vnc-out.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h
arg.o: ../contiki/ek/arg.c ../contiki/ek/arg.h
-dispatcher-paper.o: ../contiki/ek/dispatcher-paper.c \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h ../contiki/uip/uip-signal.h
-dispatcher.o: ../contiki/ek/dispatcher.c ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/ek/dispatcher.h ../contiki/lib/cc.h \
- conf/cc-conf.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/uip/uip-signal.h
+ek-service.o: ../contiki/ek/ek-service.c ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
ek.o: ../contiki/ek/ek.c ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/ek/ek-x.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/uip/uip-event.h
-tcpip.o: ../contiki/ek/tcpip.c ../contiki/ek/tcpip.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
../contiki/ek/loader.h
+mtp.o: ../contiki/ek/mtp.c ../contiki/ek/mtp.h ../contiki/ek/loader.h
+cfs.o: ../contiki/lib/cfs.c ../contiki/ek/contiki.h ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
+ conf/uip-conf.h ../contiki/uip/tcpip.h ../contiki/lib/memb.h \
+ ../contiki/lib/timer.h ../contiki/lib/clock.h conf/clock-conf.h \
+ ../contiki/lib/cfs.h ../contiki/lib/cfs-service.h \
+ ../contiki/ek/ek-service.h
ctk-textedit.o: ../contiki/lib/ctk-textedit.c \
../contiki/lib/ctk-textedit.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
list.o: ../contiki/lib/list.c ../contiki/lib/list.h
memb.o: ../contiki/lib/memb.c ../contiki/lib/memb.h
petsciiconv.o: ../contiki/lib/petsciiconv.c
strncasecmp.o: ../contiki/lib/strncasecmp.c
-resolv.o: ../contiki/uip/resolv.c ../contiki/uip/resolv.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+timer.o: ../contiki/lib/timer.c ../contiki/lib/timer.h \
+ ../contiki/lib/clock.h conf/clock-conf.h
+packet-service.o: ../contiki/uip/packet-service.c \
+ ../contiki/uip/packet-service.h ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h
+resolv.o: ../contiki/uip/resolv.c ../contiki/ek/ek.h conf/ek-conf.h \
../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/uip/uip-signal.h
+ ../contiki/ek/loader.h ../contiki/uip/tcpip.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/resolv.h \
+ ../contiki/uip/uip-event.h
slipdev.o: ../contiki/uip/slipdev.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip-fw.h \
../contiki/uip/slipdev.h
+tcpip.o: ../contiki/uip/tcpip.c ../contiki/uip/tcpip.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/ek-service.h \
+ ../contiki/uip/uip-fw.h ../contiki/lib/timer.h ../contiki/lib/clock.h \
+ conf/clock-conf.h ../contiki/uip/packet-service.h
+uip-event.o: ../contiki/uip/uip-event.c ../contiki/ek/ek.h \
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h ../contiki/uip/uip-event.h
+uip-fw-service.o: ../contiki/uip/uip-fw-service.c \
+ ../contiki/uip/packet-service.h ../contiki/ek/ek-service.h \
+ ../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
+ ../contiki/uip/uip-fw.h
uip-fw.o: ../contiki/uip/uip-fw.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip_arch.h \
../contiki/uip/uip-fw.h
-uip-signal.o: ../contiki/uip/uip-signal.c ../contiki/uip/uip-signal.h \
- ../contiki/ek/ek.h conf/ek-conf.h ../contiki/ek/dispatcher.h \
- ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
- ../contiki/ek/loader.h ../contiki/uip/uip.h ../contiki/uip/uipopt.h \
- conf/uip-conf.h
uip-split.o: ../contiki/uip/uip-split.c ../contiki/uip/uip-split.h \
../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ek/ek.h conf/ek-conf.h \
../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
../contiki/ek/loader.h ../contiki/uip/uip-fw.h \
../contiki/uip/uip_arch.h
uip.o: ../contiki/uip/uip.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip_arch.h
uip_arp.o: ../contiki/uip/uip_arp.c ../contiki/uip/uip_arp.h \
../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ek/ek.h conf/ek-conf.h \
../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
../contiki/ek/loader.h
uipbuf.o: ../contiki/uip/uipbuf.c ../contiki/uip/uipbuf.h \
../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/ek.h conf/ek-conf.h \
+ ../contiki/uip/tcpip.h ../contiki/ek/ek.h conf/ek-conf.h \
../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
../contiki/ek/loader.h
uiplib.o: ../contiki/uip/uiplib.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip_arp.h \
../contiki/uip/uiplib.h
directory-dsc.o: ../contiki-cc65/apps/directory-dsc.c \
../contiki/ek/dsc.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
directory.o: ../contiki-cc65/apps/directory.c ../contiki/ctk/ctk.h \
conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ctk/ctk-draw.h ../contiki/ek/dispatcher.h \
- ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h \
+ ../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/ctk/ctk-draw.h \
../contiki/apps/program-handler.h ../contiki/ek/dsc.h
memstat-dsc.o: ../contiki-cc65/apps/memstat-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
memstat.o: ../contiki-cc65/apps/memstat.c ../contiki/ctk/ctk.h \
conf/ctk-conf.h ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
- ../contiki/ek/dispatcher.h ../contiki/ek/arg.h ../contiki/ek/loader.h \
- ../contiki/uip/uip.h ../contiki/uip/uipopt.h conf/uip-conf.h
+ ../contiki/ek/arg.h ../contiki/ek/loader.h
loader-arch.o: ../contiki-cc65/loader/loader-arch.c \
../contiki/ek/loader.h ../contiki-cc65/loader/loader-arch.h \
../contiki/ek/dsc.h ../contiki/ctk/ctk.h conf/ctk-conf.h \
ctk/ctk-arch.h ../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h \
- conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h
+ conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h
rs232dev.o: ../contiki-cc65/uip/rs232dev.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h
slip-drv.o: ../contiki-cc65/uip/slip-drv.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h ../contiki/uip/uip_arp.h \
../contiki/uip/uip-signal.h ../contiki-cc65/uip/rs232dev.h
slip-dsc.o: ../contiki-cc65/uip/slip-dsc.c ../contiki/ek/dsc.h \
../contiki/ctk/ctk.h conf/ctk-conf.h ctk/ctk-arch.h \
../contiki/ctk/ctk-conio.h ../contiki/ek/ek.h conf/ek-conf.h \
- ../contiki/lib/cc.h conf/cc-conf.h
+ ../contiki/lib/cc.h conf/cc-conf.h ../contiki/ek/arg.h \
+ ../contiki/ek/loader.h
uip_arch.o: ../contiki-cc65/uip/uip_arch.c ../contiki/uip/uip.h \
- ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/ek/dispatcher.h \
+ ../contiki/uip/uipopt.h conf/uip-conf.h ../contiki/uip/tcpip.h \
../contiki/ek/ek.h conf/ek-conf.h ../contiki/lib/cc.h conf/cc-conf.h \
../contiki/ek/arg.h ../contiki/ek/loader.h \
../contiki-cc65/uip/uip_arch.h
diff --git a/contiki-c128/conf/ek-conf.h b/contiki-c128/conf/ek-conf.h
index 7357c2b..eb9ade7 100644
--- a/contiki-c128/conf/ek-conf.h
+++ b/contiki-c128/conf/ek-conf.h
@@ -32,7 +32,7 @@
*
* This file is part of the "ek" event kernel.
*
- * $Id: ek-conf.h,v 1.1 2003/04/08 18:08:29 adamdunkels Exp $
+ * $Id: ek-conf.h,v 1.2 2004/07/04 19:51:19 adamdunkels Exp $
*
*/
@@ -44,29 +44,12 @@
typedef void *ek_data_t;
-typedef unsigned char ek_signal_t;
+typedef unsigned char ek_event_t;
typedef unsigned char ek_id_t;
-/* ek_ticks_t: should be defined to be the largest type that fits the
- highest timeout value used by the system. For example, if all
- timeouts are between 1 and 150, the ek_ticks_t can be typedef'd as
- "unsigned char", but if the maximum timeout is over 256, "unsigned
- short" is a better choise. */
-typedef unsigned short ek_ticks_t;
+#define EK_CONF_NUMEVENTS 32 /* Must be 2^n */
+typedef unsigned char ek_num_events_t;
-/* ek_clock_t: should be defined to be the native clock ticks type
- used by the underlying system. (Look for time_t or similar.) */
-typedef unsigned long ek_clock_t;
-
-#define EK_CONF_NUMSIGNALS 32 /* Must be 2^n */
-typedef unsigned char ek_num_signals_t;
-
-#define EK_CONF_NUMTIMERS 4 /* Must be 2^n */
-typedef unsigned char ek_num_timers_t;
-
-#define EK_CONF_NUMLISTENERS 32 /* Must be 2^n */
-typedef unsigned char ek_num_listeners_t;
-
-#define EK_CONF_UNLISTEN 0
+#define EK_CONF_MAXPROCS 16
#endif /* __EK_CONF_H__ */
diff --git a/contiki-c128/conf/uip-conf.h b/contiki-c128/conf/uip-conf.h
index 04439aa..30b6f66 100644
--- a/contiki-c128/conf/uip-conf.h
+++ b/contiki-c128/conf/uip-conf.h
@@ -32,7 +32,7 @@
*
* This file is part of the Contiki Destop OS
*
- * $Id: uip-conf.h,v 1.1 2003/09/07 18:12:53 adamdunkels Exp $
+ * $Id: uip-conf.h,v 1.2 2004/07/04 19:51:19 adamdunkels Exp $
*
*/
#ifndef __UIP_CONF_H__
@@ -43,4 +43,6 @@
#define UIP_CONF_BYTE_ORDER LITTLE_ENDIAN
+#define UIP_CONF_UDP 1
+
#endif /* __UIP_CONF_H__ */
diff --git a/contiki-c128/contiki-main.c b/contiki-c128/contiki-main.c
index 58a6de5..7c443f9 100644
--- a/contiki-c128/contiki-main.c
+++ b/contiki-c128/contiki-main.c
@@ -32,13 +32,13 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: contiki-main.c,v 1.3 2004/06/06 06:35:12 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.4 2004/07/04 19:51:19 adamdunkels Exp $
*
*/
-#include "ctk.h"
+#include "contiki.h"
#include "ctk-draw.h"
-#include "dispatcher.h"
+#include "ek.h"
#include "program-handler.h"
#include "processes-dsc.h"
@@ -58,14 +58,15 @@
/*-----------------------------------------------------------------------------------*/
int
-main(int argc, char **argv)
+main(void)
{
/* toggle_videomode(); */ /* Turn on 80 column mode */
- dispatcher_init();
+ ek_init();
#ifdef WITH_UIP
uip_init();
+ tcpip_init();
resolv_init();
#ifdef WITH_TFE
@@ -93,19 +94,17 @@
program_handler_add(&memstat_dsc, "Memory stats", 1);
-
- dispatcher_run();
+ while(1) {
+ ek_run();
+ }
clrscr();
return 0;
-
- argv = argv;
- argc = argc;
}
/*-----------------------------------------------------------------------------------*/
-ek_clock_t
-ek_clock(void)
+clock_time_t
+clock_time(void)
{
return clock();
}
diff --git a/contiki-c128/ctk/ctk-arch.h b/contiki-c128/ctk/ctk-arch.h
index 03e4c1d..42c2c7e 100644
--- a/contiki-c128/ctk/ctk-arch.h
+++ b/contiki-c128/ctk/ctk-arch.h
@@ -32,7 +32,7 @@
*
* This file is part of the "ctk" console GUI toolkit for cc65
*
- * $Id: ctk-arch.h,v 1.2 2004/06/06 06:34:39 adamdunkels Exp $
+ * $Id: ctk-arch.h,v 1.3 2004/07/04 19:51:19 adamdunkels Exp $
*
*/
#ifndef __CTK_ARCH_H__
@@ -41,6 +41,4 @@
#include <ctype.h>
#include "ctk-conio.h"
-#define ctk_arch_isprint(x) isprint(x)
-
#endif /* __CTK_ARCH_H__ */
diff --git a/contiki-c128/ctk/ctk-conio-conf.h b/contiki-c128/ctk/ctk-conio-conf.h
index d08e9b5..c71beaa 100644
--- a/contiki-c128/ctk/ctk-conio-conf.h
+++ b/contiki-c128/ctk/ctk-conio-conf.h
@@ -32,14 +32,14 @@
*
* This file is part of the "ctk" console GUI toolkit for cc65
*
- * $Id: ctk-conio-conf.h,v 1.1 2003/04/08 18:08:33 adamdunkels Exp $
+ * $Id: ctk-conio-conf.h,v 1.2 2004/07/04 19:51:19 adamdunkels Exp $
*
*/
#ifndef __CTK_CONIO_CONF_H__
#define __CTK_CONIO_CONF_H__
-#if 0
+#if 1
/* Light gray inverted color scheme: */
#define BORDERCOLOR COLOR_WHITE
#define SCREENCOLOR COLOR_WHITE
@@ -81,7 +81,7 @@
#define ACTIVEMENUITEMCOLOR COLOR_YELLOW
#endif /* 0 */
-#if 1
+#if 0
/* Black and white monocrome color scheme: */
#define BORDERCOLOR COLOR_BLACK
#define SCREENCOLOR COLOR_BLACK