From 737d5fd6dcdefd4b37083566bd62a0e92094a928 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <ol.sc@web.de>
Date: Thu, 21 Nov 2013 21:57:42 +0100
Subject: [PATCH] Replaced web configurator with target-based ethconfig.

---
 cpu/6502/ethconfig/Makefile        |   5 +
 cpu/6502/ethconfig/Makefile.target |   1 +
 cpu/6502/ethconfig/ethconfig.c     |  84 +++++++++++++++++
 tools/6502/Makefile                | 141 +++++++++++++++++++----------
 tools/6502/contiki.html            | 123 -------------------------
 tools/6502/download.php            |  37 --------
 6 files changed, 181 insertions(+), 210 deletions(-)
 create mode 100644 cpu/6502/ethconfig/Makefile
 create mode 100644 cpu/6502/ethconfig/Makefile.target
 create mode 100644 cpu/6502/ethconfig/ethconfig.c
 delete mode 100644 tools/6502/contiki.html
 delete mode 100644 tools/6502/download.php

diff --git a/cpu/6502/ethconfig/Makefile b/cpu/6502/ethconfig/Makefile
new file mode 100644
index 000000000..7a0df8d8f
--- /dev/null
+++ b/cpu/6502/ethconfig/Makefile
@@ -0,0 +1,5 @@
+CONTIKI_PROJECT = ethconfig
+all: $(CONTIKI_PROJECT)
+
+CONTIKI = ../../..
+include $(CONTIKI)/Makefile.include
diff --git a/cpu/6502/ethconfig/Makefile.target b/cpu/6502/ethconfig/Makefile.target
new file mode 100644
index 000000000..8a093ec8f
--- /dev/null
+++ b/cpu/6502/ethconfig/Makefile.target
@@ -0,0 +1 @@
+TARGET = apple2enh
diff --git a/cpu/6502/ethconfig/ethconfig.c b/cpu/6502/ethconfig/ethconfig.c
new file mode 100644
index 000000000..c710a7fa6
--- /dev/null
+++ b/cpu/6502/ethconfig/ethconfig.c
@@ -0,0 +1,84 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "cfs/cfs.h"
+
+static struct {
+  char     *screen;
+  uint16_t address;
+  char     *driver;
+} drivers[] = {
+#ifdef __APPLE2__
+  {"Uthernet",    0xC080, "cs8900a.eth" },
+  {"Uthernet II", 0xC080, "w5100.eth"   },
+  {"LANceGS",     0xC080, "lan91c96.eth"}
+#endif
+#ifdef __ATARI__
+  {"Dragon Cart", 0xD500, "cs8900a.eth" }
+#endif
+#ifdef __CBM__
+  {"RR-Net",      0xDE08, "cs8900a.eth" },
+  {"TFE",         0xDE00, "cs8900a.eth" },
+  {"ETH64",       0xDE00, "lan91c96.eth"}
+#endif
+};
+
+uint8_t ipcfg[16];
+
+/*-----------------------------------------------------------------------------------*/
+uint8_t
+choose(uint8_t max)
+{
+  char val;
+
+  do {
+    printf("\n?");
+    val = getchar();
+  } while(val < '0' || val > max + '0');
+
+  putchar('\n');
+  if(val == '0') {
+    exit(0);
+  }
+
+  return val - '0';
+}
+/*-----------------------------------------------------------------------------------*/
+void
+main(void)
+{
+  int f;
+  uint8_t d;
+
+  f = cfs_open("contiki.cfg", CFS_READ);
+  if(f == -1) {
+    printf("Loading Config - Error\n");
+    return;
+  }
+  cfs_read(f, ipcfg, sizeof(ipcfg));
+  cfs_close(f);
+
+  for(d = 0; d < sizeof(drivers) / sizeof(drivers[0]); ++d) {
+    printf("%d: %s\n", d + 1, drivers[d].screen);
+  }
+  d = choose(d) - 1;
+
+#ifdef __APPLE2__
+  printf("\nSlot (1-7)\n");
+  drivers[d].address += choose(7) * 0x10;
+#endif
+
+  f = cfs_open("contiki.cfg", CFS_WRITE);
+  if(f == -1) {
+    printf("\nSaving Config - Error\n");
+    return;
+  }
+  cfs_write(f, ipcfg, sizeof(ipcfg));
+  cfs_write(f, &drivers[d].address, sizeof(drivers[d].address));
+  cfs_write(f, drivers[d].driver, strlen(drivers[d].driver));
+  cfs_close(f);
+
+  printf("\nSaving Config - Done\n");
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/tools/6502/Makefile b/tools/6502/Makefile
index b765b9108..dbd9f2468 100644
--- a/tools/6502/Makefile
+++ b/tools/6502/Makefile
@@ -55,6 +55,7 @@ all: apple2 atari c64 c128
 
 define makes
 $1-makes:
+	$(MAKE) -C ../../cpu/6502/ethconfig     TARGET=$1
 	$(MAKE) -C ../../cpu/6502/ipconfig      TARGET=$1
 	$(MAKE) -C ../../examples/webbrowser    TARGET=$1
 	$(MAKE) -C ../../examples/wget          TARGET=$1
@@ -73,6 +74,8 @@ apple2: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-a
 contiki-apple2-1.dsk: apple2enh-makes
 	cp ../apple2enh/prodos.dsk $@
 	java -jar $(AC) -p    $@ menu.system     sys 0 < ../apple2enh/menu.system
+	java -jar $(AC) -p    $@ ethconfi.system sys 0 < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -cc65 $@ ethconfi        bin 0 < ../../cpu/6502/ethconfig/ethconfig.apple2enh
 	java -jar $(AC) -p    $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
 	java -jar $(AC) -p    $@ webbrows.system sys 0 < $(CC65_HOME)/targetutil/loader.system
@@ -80,13 +83,16 @@ contiki-apple2-1.dsk: apple2enh-makes
 	java -jar $(AC) -p    $@ wget.system     sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ wget            bin   < ../../examples/wget/wget.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
-	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
-	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
+	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
 	java -jar $(AC) -p    $@ a2e.stdmou.mou  rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
 
 contiki-apple2-2.dsk: apple2enh-makes
 	cp ../apple2enh/prodos.dsk $@
 	java -jar $(AC) -p    $@ menu.system     sys 0 < ../apple2enh/menu.system
+	java -jar $(AC) -p    $@ ethconfi.system sys 0 < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -cc65 $@ ethconfi        bin 0 < ../../cpu/6502/ethconfig/ethconfig.apple2enh
 	java -jar $(AC) -p    $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
 	java -jar $(AC) -p    $@ irc.system      sys 0 < $(CC65_HOME)/targetutil/loader.system
@@ -94,13 +100,16 @@ contiki-apple2-2.dsk: apple2enh-makes
 	java -jar $(AC) -p    $@ breadbox.system sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ breadbox        bin   < ../../../contikiprojects/vandenbrande.com/twitter/platform/apple2enh/breadbox64.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
-	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
-	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
+	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
 	java -jar $(AC) -p    $@ a2e.stdmou.mou  rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
 
 contiki-apple2-3.dsk: apple2enh-makes
 	cp ../apple2enh/prodos.dsk $@
 	java -jar $(AC) -p    $@ menu.system     sys 0 < ../apple2enh/menu.system
+	java -jar $(AC) -p    $@ ethconfi.system sys 0 < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -cc65 $@ ethconfi        bin 0 < ../../cpu/6502/ethconfig/ethconfig.apple2enh
 	java -jar $(AC) -p    $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
 	java -jar $(AC) -p    $@ email.system    sys 0 < $(CC65_HOME)/targetutil/loader.system
@@ -108,13 +117,16 @@ contiki-apple2-3.dsk: apple2enh-makes
 	java -jar $(AC) -p    $@ ftp.system      sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ ftp             bin   < ../../examples/ftp/ftp-client.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
-	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
-	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
+	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
 	java -jar $(AC) -p    $@ a2e.stdmou.mou  rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
 
 contiki-apple2-4.dsk: apple2enh-makes
 	cp ../apple2enh/prodos.dsk $@
 	java -jar $(AC) -p    $@ menu.system     sys 0 < ../apple2enh/menu.system
+	java -jar $(AC) -p    $@ ethconfi.system sys 0 < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -cc65 $@ ethconfi        bin 0 < ../../cpu/6502/ethconfig/ethconfig.apple2enh
 	java -jar $(AC) -p    $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
 	java -jar $(AC) -p    $@ webserv.system  sys 0 < $(CC65_HOME)/targetutil/loader.system
@@ -122,8 +134,9 @@ contiki-apple2-4.dsk: apple2enh-makes
 	java -jar $(AC) -p    $@ telnetd.system  sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ telnetd         bin   < ../../examples/telnet-server/telnet-server.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
-	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
-	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
+	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
 	java -jar $(AC) -p    $@ a2e.stdmou.mou  rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
 	java -jar $(AC) -p    $@ index.htm       bin 0 < ../../examples/webserver/httpd-cfs/index.htm
 	java -jar $(AC) -p    $@ backgrnd.gif    bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
@@ -133,6 +146,8 @@ contiki-apple2-4.dsk: apple2enh-makes
 contiki-apple2.2mg: apple2enh-makes
 	cp ../apple2enh/prodos.2mg $@
 	java -jar $(AC) -p    $@ menu.system     sys 0 < ../apple2enh/menu.system
+	java -jar $(AC) -p    $@ ethconfi.system sys 0 < $(CC65_HOME)/targetutil/loader.system
+	java -jar $(AC) -cc65 $@ ethconfi        bin 0 < ../../cpu/6502/ethconfig/ethconfig.apple2enh
 	java -jar $(AC) -p    $@ ipconfig.system sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ ipconfig        bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh
 	java -jar $(AC) -p    $@ webbrows.system sys 0 < $(CC65_HOME)/targetutil/loader.system
@@ -152,8 +167,9 @@ contiki-apple2.2mg: apple2enh-makes
 	java -jar $(AC) -p    $@ telnetd.system  sys 0 < $(CC65_HOME)/targetutil/loader.system
 	java -jar $(AC) -cc65 $@ telnetd         bin   < ../../examples/telnet-server/telnet-server.apple2enh
 	java -jar $(AC) -p    $@ contiki.cfg     bin 0 < ../apple2enh/default.cfg
-	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth
-	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ cs8900a.eth     rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
+	java -jar $(AC) -p    $@ lan91c96.eth    rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
+	java -jar $(AC) -p    $@ w5100.eth       rel 0 < ../../cpu/6502/ethconfig/w5100.eth
 	java -jar $(AC) -p    $@ a2e.stdmou.mou  rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
 	java -jar $(AC) -p    $@ index.htm       bin 0 < ../../examples/webserver/httpd-cfs/index.htm
 	java -jar $(AC) -p    $@ backgrnd.gif    bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
@@ -172,7 +188,7 @@ contiki-atari-1.atr: atarixl-makes
 	cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com
 	cp ../../examples/wget/wget.atarixl             atr/wget.com
 	cp ../atarixl/default.cfg                       atr/contiki.cfg
-	cp ../../cpu/6502/ipconfig/cs8900a.eth          atr/cs8900a.eth
+	cp ../../cpu/6502/ethconfig/cs8900a.eth         atr/cs8900a.eth
 	$(DIR2ATR) -b Dos25 1040 $@ atr
 	rm -r atr
 
@@ -184,7 +200,7 @@ contiki-atari-2.atr: atarixl-makes
 	cp ../../examples/irc/irc-client.atarixl                                                 atr/irc.com
 	cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atarixl/breadbox64.atarixl atr/breadbox.com
 	cp ../atarixl/default.cfg                                                                atr/contiki.cfg
-	cp ../../cpu/6502/ipconfig/cs8900a.eth                                                   atr/cs8900a.eth
+	cp ../../cpu/6502/ethconfig/cs8900a.eth                                                  atr/cs8900a.eth
 	$(DIR2ATR) -b Dos25 1040 $@ atr
 	rm -r atr
 
@@ -196,7 +212,7 @@ contiki-atari-3.atr: atarixl-makes
 	cp ../../examples/email/email-client.atarixl atr/email.com
 	cp ../../examples/ftp/ftp-client.atarixl     atr/ftp.com
 	cp ../atarixl/default.cfg                    atr/contiki.cfg
-	cp ../../cpu/6502/ipconfig/cs8900a.eth       atr/cs8900a.eth
+	cp ../../cpu/6502/ethconfig/cs8900a.eth      atr/cs8900a.eth
 	$(DIR2ATR) -b Dos25 1040 $@ atr
 	rm -r atr
 
@@ -208,7 +224,7 @@ contiki-atari-4.atr: atarixl-makes
 	cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com
 	cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
 	cp ../atarixl/default.cfg                             atr/contiki.cfg
-	cp ../../cpu/6502/ipconfig/cs8900a.eth                atr/cs8900a.eth
+	cp ../../cpu/6502/ethconfig/cs8900a.eth               atr/cs8900a.eth
 	cp ../../examples/webserver/httpd-cfs/index.htm       atr/index.htm
 	cp ../../examples/webserver/httpd-cfs/backgrnd.gif    atr/backgrnd.gif
 	cp ../../examples/webserver/httpd-cfs/contiki.gif     atr/contiki.gif
@@ -230,7 +246,7 @@ contiki-atari.atr: atarixl-makes
 	cp ../../examples/webserver/webserver-example.atarixl                                    atr/webserv.com
 	cp ../../examples/telnet-server/telnet-server.atarixl                                    atr/telnetd.com
 	cp ../atarixl/default.cfg                                                                atr/contiki.cfg
-	cp ../../cpu/6502/ipconfig/cs8900a.eth                                                   atr/cs8900a.eth
+	cp ../../cpu/6502/ethconfig/cs8900a.eth                                                  atr/cs8900a.eth
 	cp ../../examples/webserver/httpd-cfs/index.htm                                          atr/index.htm
 	cp ../../examples/webserver/httpd-cfs/backgrnd.gif                                       atr/backgrnd.gif
 	cp ../../examples/webserver/httpd-cfs/contiki.gif                                        atr/contiki.gif
@@ -240,30 +256,41 @@ contiki-atari.atr: atarixl-makes
 
 $(eval $(call makes,c64))
 
-c64: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64.d71 contiki-c64.d81
+c64: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64-3.d64 contiki-c64.d71 contiki-c64.d81
 
 contiki-c64-1.d64: c64-makes
 	$(C1541) -format contiki-1,00 d64 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64                                          ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64                                      webbrowser,p
-	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                                                  wget,p
-	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64                                             irc,p
-	$(C1541) -attach $@ -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p
-	$(C1541) -attach $@ -write ../c64/default.cfg                                                            contiki.cfg,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth                                           cs8900a.eth,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth                                          lan91c96.eth,u
-	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                                                 c64-1351.mou,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64   ethconfig,p
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64     ipconfig,p
+	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p
+	$(C1541) -attach $@ -write ../../examples/wget/wget.c64             wget,p
+	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c64        irc,p
+	$(C1541) -attach $@ -write ../c64/default.cfg                       contiki.cfg,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth     cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth    lan91c96.eth,u
+	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou            c64-1351.mou,u
 
 contiki-c64-2.d64: c64-makes
 	$(C1541) -format contiki-2,00 d64 $@
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64                                        ethconfig,p
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64                                          ipconfig,p
+	$(C1541) -attach $@ -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p
+	$(C1541) -attach $@ -write ../../examples/email/email-client.c64                                         email,p
+	$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c64                                             ftp,p
+	$(C1541) -attach $@ -write ../c64/default.cfg                                                            contiki.cfg,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth                                          cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth                                         lan91c96.eth,u
+	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                                                 c64-1351.mou,u
+
+contiki-c64-3.d64: c64-makes
+	$(C1541) -format contiki-3,00 d64 $@
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64          ethconfig,p
 	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64            ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/email/email-client.c64           email,p
-	$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c64               ftp,p
 	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64  webserver,p
 	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64  telnetd,p
 	$(C1541) -attach $@ -write ../c64/default.cfg                              contiki.cfg,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth             cs8900a.eth,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth            lan91c96.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,u
 	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                   c64-1351.mou,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u
@@ -272,6 +299,7 @@ contiki-c64-2.d64: c64-makes
 
 contiki-c64.d71: c64-makes
 	$(C1541) -format contiki,00 d71 $@
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64                                        ethconfig,p
 	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64                                          ipconfig,p
 	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64                                      webbrowser,p
 	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                                                  wget,p
@@ -282,8 +310,8 @@ contiki-c64.d71: c64-makes
 	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64                                webserver,p
 	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64                                telnetd,p
 	$(C1541) -attach $@ -write ../c64/default.cfg                                                            contiki.cfg,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth                                           cs8900a.eth,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth                                          lan91c96.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth                                          cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth                                         lan91c96.eth,u
 	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                                                 c64-1351.mou,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm                                  index.htm,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif                               backgrnd.gif,u
@@ -292,6 +320,7 @@ contiki-c64.d71: c64-makes
 
 contiki-c64.d81: c64-makes
 	$(C1541) -format contiki,00 d81 $@
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c64                                        ethconfig,p
 	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64                                          ipconfig,p
 	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64                                      webbrowser,p
 	$(C1541) -attach $@ -write ../../examples/wget/wget.c64                                                  wget,p
@@ -302,8 +331,8 @@ contiki-c64.d81: c64-makes
 	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64                                webserver,p
 	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64                                telnetd,p
 	$(C1541) -attach $@ -write ../c64/default.cfg                                                            contiki.cfg,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth                                           cs8900a.eth,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth                                          lan91c96.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth                                          cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth                                         lan91c96.eth,u
 	$(C1541) -attach $@ -write $(CC65_HOME)/mou/c64-1351.mou                                                 c64-1351.mou,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm                                  index.htm,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif                               backgrnd.gif,u
@@ -312,29 +341,39 @@ contiki-c64.d81: c64-makes
 
 $(eval $(call makes,c128))
 
-c128: contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki-c128.d81
+c128: contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128-3.d64 contiki-c128.d71 contiki-c128.d81
 
 contiki-c128-1.d64: c128-makes
 	$(C1541) -format contiki-1,00 d64 $@
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128                                           ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128                                       webbrowser,p
-	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                                                   wget,p
-	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c128                                              irc,p
-	$(C1541) -attach $@ -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p
-	$(C1541) -attach $@ -write ../c128/default.cfg                                                             contiki.cfg,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth                                             cs8900a.eth,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth                                            lan91c96.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128   ethconfig,p
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128     ipconfig,p
+	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p
+	$(C1541) -attach $@ -write ../../examples/wget/wget.c128             wget,p
+	$(C1541) -attach $@ -write ../../examples/irc/irc-client.c128        irc,p
+	$(C1541) -attach $@ -write ../c128/default.cfg                       contiki.cfg,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth      cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth     lan91c96.eth,u
 
 contiki-c128-2.d64: c128-makes
 	$(C1541) -format contiki-2,00 d64 $@
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128                                         ethconfig,p
+	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128                                           ipconfig,p
+	$(C1541) -attach $@ -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p
+	$(C1541) -attach $@ -write ../../examples/email/email-client.c128                                          email,p
+	$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c128                                              ftp,p
+	$(C1541) -attach $@ -write ../c128/default.cfg                                                             contiki.cfg,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth                                            cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth                                           lan91c96.eth,u
+
+contiki-c128-3.d64: c128-makes
+	$(C1541) -format contiki-3,00 d64 $@
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128         ethconfig,p
 	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128           ipconfig,p
-	$(C1541) -attach $@ -write ../../examples/email/email-client.c128          email,p
-	$(C1541) -attach $@ -write ../../examples/ftp/ftp-client.c128              ftp,p
 	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p
 	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p
 	$(C1541) -attach $@ -write ../c128/default.cfg                             contiki.cfg,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth             cs8900a.eth,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth            lan91c96.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth            cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth           lan91c96.eth,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm    index.htm,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif  contiki.gif,u
@@ -342,6 +381,7 @@ contiki-c128-2.d64: c128-makes
 
 contiki-c128.d71: c128-makes
 	$(C1541) -format contiki,00 d71 $@
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128                                         ethconfig,p
 	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128                                           ipconfig,p
 	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128                                       webbrowser,p
 	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                                                   wget,p
@@ -352,8 +392,8 @@ contiki-c128.d71: c128-makes
 	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128                                 webserver,p
 	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128                                 telnetd,p
 	$(C1541) -attach $@ -write ../c128/default.cfg                                                             contiki.cfg,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth                                             cs8900a.eth,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth                                            lan91c96.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth                                            cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth                                           lan91c96.eth,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm                                    index.htm,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif                                 backgrnd.gif,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif                                  contiki.gif,u
@@ -361,6 +401,7 @@ contiki-c128.d71: c128-makes
 
 contiki-c128.d81: c128-makes
 	$(C1541) -format contiki,00 d81 $@
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/ethconfig.c128                                         ethconfig,p
 	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128                                           ipconfig,p
 	$(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c128                                       webbrowser,p
 	$(C1541) -attach $@ -write ../../examples/wget/wget.c128                                                   wget,p
@@ -371,8 +412,8 @@ contiki-c128.d81: c128-makes
 	$(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128                                 webserver,p
 	$(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128                                 telnetd,p
 	$(C1541) -attach $@ -write ../c128/default.cfg                                                             contiki.cfg,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/cs8900a.eth                                             cs8900a.eth,u
-	$(C1541) -attach $@ -write ../../cpu/6502/ipconfig/lan91c96.eth                                            lan91c96.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth                                            cs8900a.eth,u
+	$(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth                                           lan91c96.eth,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm                                    index.htm,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif                                 backgrnd.gif,u
 	$(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif                                  contiki.gif,u
diff --git a/tools/6502/contiki.html b/tools/6502/contiki.html
deleted file mode 100644
index f87a06bb7..000000000
--- a/tools/6502/contiki.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
- <head>
-  <title>Contiki Configuration Download</title>
-  <style type="text/css">
-   tr.hr { background-color: black; height: 1px }
-  </style>
- </head>
- <body>
-  <form action="download.php">
-   <h3 align="center">Download your custom generated Contiki configuration</h3>
-   <table align="center" cellpadding="0" cellspacing="10">
-    <tr>
-     <td>
-      <input type="radio" name="machine" id="apple2" value="apple2" checked="checked" />
-      <label for="apple2">Apple //e</label>
-     </td><td>
-      <label for="apple2-drv">Ethernet Card:</label>
-      <select name="apple2-drv" id="apple2-drv" size="1">
-       <option value="cs8900a.eth" >Uthernet</option>
-       <option value="lan91c96.eth">LANceGS </option>
-      </select>
-     </td><td>
-      <label for="apple2-addr">Slot:</label>
-      <select name="apple2-addr" id="apple2-addr" size="1">
-       <option value="C090"                    >1</option>
-       <option value="C0A0"                    >2</option>
-       <option value="C0B0" selected="selected">3</option>
-       <option value="C0C0"                    >4</option>
-       <option value="C0D0"                    >5</option>
-       <option value="C0E0"                    >6</option>
-       <option value="C0F0"                    >7</option>
-      </select>
-     </td>
-    </tr><tr class="hr">
-     <td colspan="3" />
-    </tr><tr>
-     <td>
-      <input type="radio" name="machine" id="atari" value="atari" />
-      <label for="atari">Atari XL</label>
-     </td><td>
-      <label for="atari-drv">Ethernet Card:</label>
-      <select name="atari-addr-drv" id="atari-drv" size="1">
-       <option value="D500-cs8900a.eth" >Dragon Cart</option>
-      </select>
-     </td>
-    </tr><tr class="hr">
-     <td colspan="3" />
-    </tr><tr>
-     <td>
-      <input type="radio" name="machine" id="c64" value="c64" />
-      <label for="c64">C64</label>
-     </td><td>
-      <label for="c64-drv">Ethernet Card:</label>
-      <select name="c64-addr-drv" id="c64-drv" size="1">
-       <option value="DE08-CS8900A.ETH" >RR-Net</option>
-       <option value="DE00-CS8900A.ETH" >TFE   </option>
-       <option value="DE00-LAN91C96.ETH">ETH64 </option>
-      </select>
-     </td>
-    </tr><tr class="hr">
-     <td colspan="3" />
-    </tr><tr>
-     <td>
-      <input type="radio" name="machine" id="c128" value="c128" />
-      <label for="c128">C128</label>
-     </td><td>
-      <label for="c128-drv">Ethernet Card:</label>
-      <select name="c128-addr-drv" id="c128-drv" size="1">
-       <option value="DE08-CS8900A.ETH" >RR-Net</option>
-       <option value="DE00-CS8900A.ETH" >TFE   </option>
-       <option value="DE00-LAN91C96.ETH">ETH64 </option>
-      </select>
-     </td>
-    </tr><tr class="hr">
-     <td colspan="3" />
-    </tr><tr>
-     <td>
-      <label for="addr-a">IP Address:</label>
-     </td><td colspan="2">
-      <input type="text" name="addr-a" id="addr-a" size="3" maxlength="3" value="192" />.
-      <input type="text" name="addr-b" id="addr-b" size="3" maxlength="3" value="168" />.
-      <input type="text" name="addr-c" id="addr-c" size="3" maxlength="3" value="0"   />.
-      <input type="text" name="addr-d" id="addr-d" size="3" maxlength="3" value="111" />
-     </td>
-    </tr><tr>
-     <td>
-      <label for="mask-a">Subnet Mask:</label>
-     </td><td colspan="2">
-      <input type="text" name="mask-a" id="mask-a" size="3" maxlength="3" value="255" />.
-      <input type="text" name="mask-b" id="mask-b" size="3" maxlength="3" value="255" />.
-      <input type="text" name="mask-c" id="mask-c" size="3" maxlength="3" value="255" />.
-      <input type="text" name="mask-d" id="mask-d" size="3" maxlength="3" value="0"   />
-     </td>
-    </tr><tr>
-     <td>
-      <label for="dgw-a">Default Gateway:&nbsp;</label>
-     </td><td colspan="2">
-      <input type="text" name="dgw-a" id="dgw-a" size="3" maxlength="3" value="192" />.
-      <input type="text" name="dgw-b" id="dgw-b" size="3" maxlength="3" value="168" />.
-      <input type="text" name="dgw-c" id="dgw-c" size="3" maxlength="3" value="0"   />.
-      <input type="text" name="dgw-d" id="dgw-d" size="3" maxlength="3" value="1"   />
-     </td>
-    </tr><tr>
-     <td>
-      <label for="dns-a">DNS Server:</label>
-     </td><td colspan="2">
-      <input type="text" name="dns-a" id="dns-a" size="3" maxlength="3" value="192" />.
-      <input type="text" name="dns-b" id="dns-b" size="3" maxlength="3" value="168" />.
-      <input type="text" name="dns-c" id="dns-c" size="3" maxlength="3" value="0"   />.
-      <input type="text" name="dns-d" id="dns-d" size="3" maxlength="3" value="1"   />
-     </td>
-    </tr><tr class="hr">
-     <td colspan="3" />
-    </tr><tr>
-     <td colspan="3" align="center">
-      <input type="submit" value="Download" />
-     </td>
-    </tr>
-   </table>
-  </form>
- </body>
-</html>
diff --git a/tools/6502/download.php b/tools/6502/download.php
deleted file mode 100644
index bd26c743b..000000000
--- a/tools/6502/download.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-error_reporting(0);
-
-$cfg  = chr($_GET['addr-a']).chr($_GET['addr-b']).chr($_GET['addr-c']).chr($_GET['addr-d']);
-$cfg .= chr($_GET['mask-a']).chr($_GET['mask-b']).chr($_GET['mask-c']).chr($_GET['mask-d']);
-$cfg .= chr($_GET['dgw-a']). chr($_GET['dgw-b']). chr($_GET['dgw-c']). chr($_GET['dgw-d']);
-$cfg .= chr($_GET['dns-a']). chr($_GET['dns-b']). chr($_GET['dns-c']). chr($_GET['dns-d']);
-
-switch ($_GET['machine']) {
-case 'apple2':
-    $hex = $_GET['apple2-addr'];
-    $drv = $_GET['apple2-drv'];
-    break;
-case 'atari':
-    $hex = strtok($_GET['atari-addr-drv'], '-');
-    $drv = strtok('-');
-    break;
-case 'c64':
-    $hex = strtok($_GET['c64-addr-drv'],  '-');
-    $drv = strtok('-');
-    break;
-case 'c128':
-    $hex = strtok($_GET['c128-addr-drv'], '-');
-    $drv = strtok('-');
-    break;
-}
-
-$addr = hexdec($hex);
-$cfg .= chr($addr % 0x100).chr($addr / 0x100);
-$cfg .= $drv;
-
-header('Content-Type: application/octetstream');
-header('Content-Disposition: attachment; filename=contiki.cfg');
-print($cfg);
-
-?>