Added configuration editor
diff --git a/contiki-c64/Makefile.c64 b/contiki-c64/Makefile.c64
index 9aba95c..9e80cb3 100644
--- a/contiki-c64/Makefile.c64
+++ b/contiki-c64/Makefile.c64
@@ -30,7 +30,7 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile.c64,v 1.4 2003/08/05 13:53:19 adamdunkels Exp $
+# $Id: Makefile.c64,v 1.5 2003/08/06 23:15:10 adamdunkels Exp $
#
all: contiki contiki-labels.o
@@ -44,7 +44,7 @@
contiki: main.o petsciiconv.o \
ctk.o ek.o dispatcher.o loader-arch.o \
- netconf-dsc.o processes-dsc.o directory-dsc.o \
+ configedit-dsc.o processes-dsc.o directory-dsc.o \
ctk-mouse.o ctk-mouse-asm.o \
ctk-hires.o ctk-hires-asm.o ctk-hires-theme-default.o \
$(UIP) uip_arp.o \
diff --git a/contiki-c64/Makefile.programs b/contiki-c64/Makefile.programs
index 2da4bdc..9a8e60d 100644
--- a/contiki-c64/Makefile.programs
+++ b/contiki-c64/Makefile.programs
@@ -30,7 +30,7 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile.programs,v 1.11 2003/08/05 13:54:31 adamdunkels Exp $
+# $Id: Makefile.programs,v 1.12 2003/08/06 23:13:06 adamdunkels Exp $
#
all: loader-arch-module.o loader-arch-dsc.o contiki-labels.o \
@@ -44,7 +44,7 @@
vnc.prg \
webserver.prg webserver.dsc \
wget.prg wget.dsc \
- calc.prg calc.dsc \
+ calc.prg \
directory.prg directory.dsc \
blueround.prg blueround.dsc \
enabler.prg enabler.dsc \
@@ -54,7 +54,8 @@
rrnet.drv rrnet.dsc \
slip.drv slip.dsc \
tfe.drv tfe.dsc \
- ssconfig.prg
+ ssconfig.prg \
+ config.prg configedit.prg configedit.dsc
SYS=c64
@@ -65,6 +66,8 @@
-DWITH_LOADER_ARCH \
-DWITH_UIP -DWITH_ETHERNET
+configedit.prg: configedit.o c64-fs-write.o
+
email.prg: $(EMAIL)
www.prg: $(WWW)
diff --git a/contiki-c64/main.c b/contiki-c64/main.c
index 090c596..d7a7ea9 100644
--- a/contiki-c64/main.c
+++ b/contiki-c64/main.c
@@ -32,7 +32,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: main.c,v 1.3 2003/08/05 13:54:50 adamdunkels Exp $
+ * $Id: main.c,v 1.4 2003/08/06 23:13:16 adamdunkels Exp $
*
*/
@@ -47,7 +47,7 @@
#include "uip.h"
#include "uip_arp.h"
-#include "netconf-dsc.h"
+#include "configedit-dsc.h"
#include "directory-dsc.h"
#include "processes-dsc.h"
@@ -65,13 +65,17 @@
ek_init();
dispatcher_init();
ctk_init();
-
+
+ uip_signal_init();
+
program_handler_init();
program_handler_add(&directory_dsc, "Directory", 1);
- program_handler_add(&netconf_dsc, "Network setup", 1);
+ program_handler_add(&configedit_dsc, "Configuration", 1);
program_handler_add(&processes_dsc, "Processes", 1);
+ program_handler_load("config.prg");
+
ek_run();
return 0;