From 14f0d9c612ccab03147de76970f3028c1bb475b5 Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Sat, 23 Oct 2010 20:39:47 +0000
Subject: [PATCH] Included FTP example into cc65 binary relaease tools. This
 made four disk images necessary for the Apple II and the Atari.

---
 tools/6502/Makefile     | 41 +++++++++++++++++++++++++++++++++--------
 tools/6502/contiki.html |  8 +++++---
 tools/6502/download.php |  2 +-
 3 files changed, 39 insertions(+), 12 deletions(-)

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 <ol.sc@web.de>
 #
-# $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 @@
   </style>
   <script type="text/javascript">
    function disks(disks) {
-    for (var i = 3; i; i--) {
+    for (var i = 4; i; i--) {
      document.forms[0].disk[i].disabled = i > disks;
      if (document.forms[0].disk[i].checked &&
          document.forms[0].disk[i].disabled)
@@ -25,7 +25,7 @@
    <table align="center" cellpadding="0" cellspacing="0">
     <tr class="p">
      <td>
-      <input type="radio" name="machine" id="apple2" value="apple2" onclick="disks(3)" checked="checked" />
+      <input type="radio" name="machine" id="apple2" value="apple2" onclick="disks(4)" checked="checked" />
       <label for="apple2">Apple //e</label>
      </td><td>
       <label for="apple2-drv">Ethernet Card:</label>
@@ -77,7 +77,7 @@
      <td colspan="3" />
     </tr><tr class="p">
      <td>
-      <input type="radio" name="machine" id="atari" value="atari" onclick="disks(3)" />
+      <input type="radio" name="machine" id="atari" value="atari" onclick="disks(4)" />
       <label for="atari">Atari 8-bit</label>
      </td><td colspan="2">
       <label for="atari-drv">Ethernet Card:</label>
@@ -135,6 +135,8 @@
       <label for="disk-2">Complete Image Of Disk 2</label><br />
       <input type="radio" name="disk" id="disk-3" value="3" />
       <label for="disk-3">Complete Image Of Disk 3</label>
+      <input type="radio" name="disk" id="disk-4" value="4" />
+      <label for="disk-4">Complete Image Of Disk 4</label>
      </td>
     </tr><tr class="bg">
      <td colspan="3" />
diff --git a/tools/6502/download.php b/tools/6502/download.php
index d78ed5407..7077aa8d3 100644
--- a/tools/6502/download.php
+++ b/tools/6502/download.php
@@ -32,7 +32,7 @@ case 'atari':
     $hex = strtok($_GET['atari-addr-drv'], '-');
     $drv = strtok('-');
     $ext = '-' . $dsk . '.atr';
-    $blk = array(0, 5, 4, 272);
+    $blk = array(0, 5, 4, 4, 273);
     $ofs = 0x00010 + ($blk[$dsk] - 1) * 0x80;
     break;
 }