diff --git a/tools/6502/Makefile b/tools/6502/Makefile
index 029e43786..06ddf8fbc 100644
--- a/tools/6502/Makefile
+++ b/tools/6502/Makefile
@@ -30,7 +30,7 @@
#
# Author: Oliver Schmidt
#
-# $Id: Makefile,v 1.10 2010/10/04 22:13:45 oliverschmidt Exp $
+# $Id: Makefile,v 1.11 2010/10/23 20:39:47 oliverschmidt Exp $
#
ifndef CONTIKI
@@ -53,10 +53,10 @@ ifndef DIR2ATR
${error DIR2ATR not defined! You must specify where dir2atr resides}
endif
-disks: apple2enh-1-disk apple2enh-2-disk apple2enh-3-disk \
+disks: apple2enh-1-disk apple2enh-2-disk apple2enh-3-disk apple2enh-4-disk \
c64-1-disk c64-2-disk \
c128-1-disk \
- atari-1-disk atari-2-disk atari-3-disk
+ atari-1-disk atari-2-disk atari-3-disk atari-4-disk
define makes
$1-makes:
@@ -66,6 +66,7 @@ $1-makes:
$(MAKE) -C ../../examples/wget TARGET=$1
$(MAKE) -C ../../examples/irc TARGET=$1
$(MAKE) -C ../../examples/email TARGET=$1
+ $(MAKE) -C ../../examples/ftp TARGET=$1
$(MAKE) -C ../../../../contikiprojects/vandenbrande.com/twitter/platform/$1
endef
@@ -111,12 +112,24 @@ apple2enh-3-disk: apple2enh-makes
java -jar $(AC) -cc65 contiki-3.dsk dhcp bin 0 < ../../cpu/6502/dhcp/dhcp-client.apple2enh
java -jar $(AC) -p contiki-3.dsk email.system sys 0 < ../apple2enh/loader.system
java -jar $(AC) -cc65 contiki-3.dsk email bin < ../../examples/email/email-client.apple2enh
- java -jar $(AC) -p contiki-3.dsk breadbox.system sys 0 < ../apple2enh/loader.system
- java -jar $(AC) -cc65 contiki-3.dsk breadbox bin < ../../../../contikiprojects/vandenbrande.com/twitter/platform/apple2enh/breadbox64.apple2enh
+ java -jar $(AC) -p contiki-3.dsk ftp.system sys 0 < ../apple2enh/loader.system
+ java -jar $(AC) -cc65 contiki-3.dsk ftp bin < ../../examples/ftp/ftp-client.apple2enh
java -jar $(AC) -p contiki-3.dsk cs8900a.eth rel 0 < ../../cpu/6502/dhcp/cs8900a.eth
java -jar $(AC) -p contiki-3.dsk lan91c96.eth rel 0 < ../../cpu/6502/dhcp/lan91c96.eth
java -jar $(AC) -p contiki-3.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
+apple2enh-4-disk: apple2enh-makes
+ cp ../apple2enh/prodos.dsk contiki-4.dsk
+ java -jar $(AC) -p contiki-4.dsk contiki.cfg bin 0 < dummy.cfg
+ java -jar $(AC) -p contiki-4.dsk menu.system sys 0 < ../apple2enh/menu.system
+ java -jar $(AC) -p contiki-4.dsk dhcp.system sys 0 < ../apple2enh/loader.system
+ java -jar $(AC) -cc65 contiki-4.dsk dhcp bin 0 < ../../cpu/6502/dhcp/dhcp-client.apple2enh
+ java -jar $(AC) -p contiki-4.dsk breadbox.system sys 0 < ../apple2enh/loader.system
+ java -jar $(AC) -cc65 contiki-4.dsk breadbox bin < ../../../../contikiprojects/vandenbrande.com/twitter/platform/apple2enh/breadbox64.apple2enh
+ java -jar $(AC) -p contiki-4.dsk cs8900a.eth rel 0 < ../../cpu/6502/dhcp/cs8900a.eth
+ java -jar $(AC) -p contiki-4.dsk lan91c96.eth rel 0 < ../../cpu/6502/dhcp/lan91c96.eth
+ java -jar $(AC) -p contiki-4.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou
+
$(eval $(call makes,c64))
c64-1-disk: c64-makes
@@ -126,6 +139,7 @@ c64-1-disk: c64-makes
$(C1541) -attach contiki-1.d64 -write ../../examples/webserver/webserver-example.c64 webserver,p
$(C1541) -attach contiki-1.d64 -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p
$(C1541) -attach contiki-1.d64 -write ../../examples/wget/wget.c64 wget,p
+ $(C1541) -attach contiki-1.d64 -write ../../examples/irc/irc-client.c64 irc,p
$(C1541) -attach contiki-1.d64 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u
$(C1541) -attach contiki-1.d64 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u
$(C1541) -attach contiki-1.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u
@@ -138,8 +152,8 @@ c64-2-disk: c64-makes
$(C1541) -format contiki,00 d64 contiki-2.d64
$(C1541) -attach contiki-2.d64 -write dummy.cfg contiki.cfg,u
$(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/dhcp-client.c64 dhcp,p
- $(C1541) -attach contiki-2.d64 -write ../../examples/irc/irc-client.c64 irc,p
$(C1541) -attach contiki-2.d64 -write ../../examples/email/email-client.c64 email,p
+ $(C1541) -attach contiki-2.d64 -write ../../examples/ftp/ftp-client.c64 ftp,p
$(C1541) -attach contiki-2.d64 -write ../../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p
$(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u
$(C1541) -attach contiki-2.d64 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u
@@ -156,6 +170,7 @@ c128-1-disk: c128-makes
$(C1541) -attach contiki-1.d71 -write ../../examples/wget/wget.c128 wget,p
$(C1541) -attach contiki-1.d71 -write ../../examples/irc/irc-client.c128 irc,p
$(C1541) -attach contiki-1.d71 -write ../../examples/email/email-client.c128 email,p
+ $(C1541) -attach contiki-1.d71 -write ../../examples/ftp/ftp-client.c128 ftp,p
$(C1541) -attach contiki-1.d71 -write ../../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p
$(C1541) -attach contiki-1.d71 -write ../../cpu/6502/dhcp/cs8900a.eth cs8900a.eth,u
$(C1541) -attach contiki-1.d71 -write ../../cpu/6502/dhcp/lan91c96.eth lan91c96.eth,u
@@ -194,12 +209,22 @@ atari-2-disk: atari-makes
rm -r atr
atari-3-disk: atari-makes
+ mkdir -p atr
+ cp ../atari/dos.sys atr/dos.sys
+ cp ../atari/dup.sys atr/dup.sys
+ cp dummy.cfg atr/contiki.cfg
+ cp ../../cpu/6502/dhcp/dhcp-client.atari atr/dhcp.com
+ cp ../../examples/email/email-client.atari atr/email.com
+ cp ../../examples/ftp/ftp-client.atari atr/ftp.com
+ $(DIR2ATR) -b Dos25 1040 contiki-3.atr atr
+ rm -r atr
+
+atari-4-disk: atari-makes
mkdir -p atr
cp ../atari/dos.sys atr/dos.sys
cp ../atari/dup.sys atr/dup.sys
cp dummy.cfg atr/contiki.cfg
cp ../../cpu/6502/dhcp/dhcp-client.atari atr/dhcp.com
- cp ../../examples/email/email-client.atari atr/email.com
cp ../../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com
- $(DIR2ATR) -b Dos25 1040 contiki-3.atr atr
+ $(DIR2ATR) -b Dos25 1040 contiki-4.atr atr
rm -r atr
diff --git a/tools/6502/contiki.html b/tools/6502/contiki.html
index 15f56c56f..4f3c202d7 100644
--- a/tools/6502/contiki.html
+++ b/tools/6502/contiki.html
@@ -10,7 +10,7 @@