From b175ba746395d3239a7b7090594caaf239388b75 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Fri, 1 Feb 2013 23:19:12 +0100 Subject: [PATCH 1/2] Moved retro IP configuration from web site to target machine. Better match user expectations by allowing to download plain disk images and configure the IP settings afterwards on the target machine - then most likely leveraging DHCP. This works for the users with the most usual Ethernet adapter and settings - which are now pre-configured in default.cfg's. Only the few users with non-default Ethernet adapter and/or settings are required to download a custom contiki.cfg and inject it manually into their disk image files. --- tools/6502/Makefile | 22 ++++++++-------- tools/6502/contiki.html | 51 +++++++++--------------------------- tools/6502/download.php | 26 ++---------------- tools/6502/dummy.cfg | Bin 30 -> 0 bytes tools/apple2enh/default.cfg | Bin 0 -> 29 bytes tools/atari/default.cfg | Bin 0 -> 29 bytes tools/c128/default.cfg | Bin 0 -> 29 bytes tools/c64/default.cfg | Bin 0 -> 29 bytes 8 files changed, 26 insertions(+), 73 deletions(-) delete mode 100644 tools/6502/dummy.cfg create mode 100644 tools/apple2enh/default.cfg create mode 100644 tools/atari/default.cfg create mode 100644 tools/c128/default.cfg create mode 100644 tools/c64/default.cfg diff --git a/tools/6502/Makefile b/tools/6502/Makefile index a4bbbc63e..38e3ff70f 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -74,7 +74,7 @@ $(eval $(call makes,apple2enh)) apple2enh-1-disk: apple2enh-makes cp ../apple2enh/prodos.dsk contiki-1.dsk - java -jar $(AC) -p contiki-1.dsk contiki.cfg bin 0 < dummy.cfg + java -jar $(AC) -p contiki-1.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg java -jar $(AC) -p contiki-1.dsk menu.system sys 0 < ../apple2enh/menu.system java -jar $(AC) -p contiki-1.dsk ipconfig.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-1.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh @@ -92,7 +92,7 @@ apple2enh-1-disk: apple2enh-makes apple2enh-2-disk: apple2enh-makes cp ../apple2enh/prodos.dsk contiki-2.dsk - java -jar $(AC) -p contiki-2.dsk contiki.cfg bin 0 < dummy.cfg + java -jar $(AC) -p contiki-2.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg java -jar $(AC) -p contiki-2.dsk menu.system sys 0 < ../apple2enh/menu.system java -jar $(AC) -p contiki-2.dsk ipconfig.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-2.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh @@ -106,7 +106,7 @@ apple2enh-2-disk: apple2enh-makes apple2enh-3-disk: apple2enh-makes cp ../apple2enh/prodos.dsk contiki-3.dsk - java -jar $(AC) -p contiki-3.dsk contiki.cfg bin 0 < dummy.cfg + java -jar $(AC) -p contiki-3.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg java -jar $(AC) -p contiki-3.dsk menu.system sys 0 < ../apple2enh/menu.system java -jar $(AC) -p contiki-3.dsk ipconfig.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-3.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh @@ -120,7 +120,7 @@ apple2enh-3-disk: apple2enh-makes 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 contiki.cfg bin 0 < ../apple2enh/default.cfg java -jar $(AC) -p contiki-4.dsk menu.system sys 0 < ../apple2enh/menu.system java -jar $(AC) -p contiki-4.dsk ipconfig.system sys 0 < ../apple2enh/loader.system java -jar $(AC) -cc65 contiki-4.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh @@ -134,7 +134,7 @@ $(eval $(call makes,c64)) c64-1-disk: c64-makes $(C1541) -format contiki,00 d64 contiki-1.d64 - $(C1541) -attach contiki-1.d64 -write dummy.cfg contiki.cfg,u + $(C1541) -attach contiki-1.d64 -write ../c64/default.cfg contiki.cfg,u $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p $(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 @@ -150,7 +150,7 @@ c64-1-disk: c64-makes 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 ../c64/default.cfg contiki.cfg,u $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,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 @@ -163,7 +163,7 @@ $(eval $(call makes,c128)) c128-1-disk: c128-makes $(C1541) -format contiki,00 d71 contiki-1.d71 - $(C1541) -attach contiki-1.d71 -write dummy.cfg contiki.cfg,u + $(C1541) -attach contiki-1.d71 -write ../c128/default.cfg contiki.cfg,u $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/webserver-example.c128 webserver,p $(C1541) -attach contiki-1.d71 -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p @@ -186,7 +186,7 @@ atari-1-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 ../atari/default.cfg atr/contiki.cfg cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../examples/webserver/webserver-example.atari atr/webserve.com cp ../../examples/webbrowser/webbrowser.atari atr/webbrows.com @@ -201,7 +201,7 @@ atari-2-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 ../atari/default.cfg atr/contiki.cfg cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../examples/wget/wget.atari atr/wget.com cp ../../examples/irc/irc-client.atari atr/irc.com @@ -212,7 +212,7 @@ 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 ../atari/default.cfg atr/contiki.cfg cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../examples/email/email-client.atari atr/email.com cp ../../examples/ftp/ftp-client.atari atr/ftp.com @@ -223,7 +223,7 @@ 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 ../atari/default.cfg atr/contiki.cfg cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com $(DIR2ATR) -b Dos25 1040 contiki-4.atr atr diff --git a/tools/6502/contiki.html b/tools/6502/contiki.html index 5eb7a9849..07103872e 100644 --- a/tools/6502/contiki.html +++ b/tools/6502/contiki.html @@ -1,31 +1,21 @@ - Contiki Download + Contiki Configuration Download -
-

Download your custom generated Contiki

+

Download your custom generated Contiki configuration

@@ -125,21 +115,6 @@ - - -
- + @@ -49,40 +39,40 @@
- +
- +
- +
-
- -
- -
- -
- -
- - -
diff --git a/tools/6502/download.php b/tools/6502/download.php index faf1615be..c7055b1e9 100644 --- a/tools/6502/download.php +++ b/tools/6502/download.php @@ -7,33 +7,22 @@ $cfg .= chr($_GET['mask-a']).chr($_GET['mask-b']).chr($_GET['mask-c']).chr($_GET $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']); -$dsk = $_GET['disk']; - switch ($_GET['machine']) { case 'apple2': $hex = $_GET['apple2-addr']; $drv = $_GET['apple2-drv']; - $ext = '-' . $dsk . '.dsk'; - $ofs = 0x05B00; break; case 'c64': $hex = strtok($_GET['c64-addr-drv'], '-'); $drv = strtok('-'); - $ext = '-' . $dsk . '.d64'; - $ofs = 0x15002; break; case 'c128': $hex = strtok($_GET['c128-addr-drv'], '-'); $drv = strtok('-'); - $ext = '-' . $dsk . '.d71'; - $ofs = 0x15002; break; case 'atari': $hex = strtok($_GET['atari-addr-drv'], '-'); $drv = strtok('-'); - $ext = '-' . $dsk . '.atr'; - $blk = array(0, 5, 4, 4, 275); - $ofs = 0x00010 + ($blk[$dsk] - 1) * 0x80; break; } @@ -41,19 +30,8 @@ $addr = hexdec($hex); $cfg .= chr($addr % 0x100).chr($addr / 0x100); $cfg .= $drv; -if ($dsk) { - $img = file_get_contents('contiki'. $ext); - if ($img) - $out = substr_replace($img, $cfg, $ofs, strlen($cfg)); - else - $out = ''; -} else { - $ext = '.cfg'; - $out = $cfg; -} - header('Content-Type: application/octetstream'); -header('Content-Disposition: attachment; filename=contiki' . $ext); -print($out); +header('Content-Disposition: attachment; filename=contiki.cfg'); +print($cfg); ?> diff --git a/tools/6502/dummy.cfg b/tools/6502/dummy.cfg deleted file mode 100644 index 406218232142c6d4f05d6d681b586f4d85546f62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 KcmZQzzy|;T9smIV diff --git a/tools/apple2enh/default.cfg b/tools/apple2enh/default.cfg new file mode 100644 index 0000000000000000000000000000000000000000..e9bc3f02ad0797f8e84f1feb6789f44a3be55ef0 GIT binary patch literal 29 YcmZQzKm{8PBo|v)8W<$%rIus>045j&=l}o! literal 0 HcmV?d00001 diff --git a/tools/atari/default.cfg b/tools/atari/default.cfg new file mode 100644 index 0000000000000000000000000000000000000000..f2cf1eb3118ada532ceee72ba83a3b043146d73e GIT binary patch literal 29 WcmZQzKm%8ki!Ce-3=;KHOELf+Bm_+W literal 0 HcmV?d00001 diff --git a/tools/c128/default.cfg b/tools/c128/default.cfg new file mode 100644 index 0000000000000000000000000000000000000000..0958a903d33157c397e007df59e9478436f05a8b GIT binary patch literal 29 XcmZQzKm{E4oP#Ya4GbLhTthqn8u$aA literal 0 HcmV?d00001 diff --git a/tools/c64/default.cfg b/tools/c64/default.cfg new file mode 100644 index 0000000000000000000000000000000000000000..0958a903d33157c397e007df59e9478436f05a8b GIT binary patch literal 29 XcmZQzKm{E4oP#Ya4GbLhTthqn8u$aA literal 0 HcmV?d00001 From 21407162c4cb427f9f721c5a80e8173d229186bd Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sat, 2 Feb 2013 01:07:50 +0100 Subject: [PATCH 2/2] Deliver retro CBM disk images as .d64, .d71 and .d81 files. --- tools/6502/Makefile | 296 ++++++++++++++++++++++++++++---------------- 1 file changed, 187 insertions(+), 109 deletions(-) diff --git a/tools/6502/Makefile b/tools/6502/Makefile index 38e3ff70f..894eeca10 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -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 apple2enh-4-disk \ - c64-1-disk c64-2-disk \ - c128-1-disk \ - atari-1-disk atari-2-disk atari-3-disk atari-4-disk +disks: apple2-dsk-1 apple2-dsk-2 apple2-dsk-3 apple2-dsk-4 \ + c64-d64-1 c64-d64-2 c64-d71 c64-d81 \ + c128-d64-1 c128-d64-2 c128-d71 c128-d81 \ + atari-atr-1 atari-atr-2 atari-atr-3 atari-atr-4 define makes $1-makes: @@ -72,117 +72,195 @@ endef $(eval $(call makes,apple2enh)) -apple2enh-1-disk: apple2enh-makes - cp ../apple2enh/prodos.dsk contiki-1.dsk - java -jar $(AC) -p contiki-1.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg - java -jar $(AC) -p contiki-1.dsk menu.system sys 0 < ../apple2enh/menu.system - java -jar $(AC) -p contiki-1.dsk ipconfig.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-1.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh - java -jar $(AC) -p contiki-1.dsk webserve.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-1.dsk webserve bin < ../../examples/webserver/webserver-example.apple2enh - java -jar $(AC) -p contiki-1.dsk webbrows.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-1.dsk webbrows bin < ../../examples/webbrowser/webbrowser.apple2enh - java -jar $(AC) -p contiki-1.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth - java -jar $(AC) -p contiki-1.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth - java -jar $(AC) -p contiki-1.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou - java -jar $(AC) -p contiki-1.dsk index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm - java -jar $(AC) -p contiki-1.dsk backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif - java -jar $(AC) -p contiki-1.dsk contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif - java -jar $(AC) -p contiki-1.dsk notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm +apple2-dsk-1: apple2enh-makes + cp ../apple2enh/prodos.dsk contiki-apple2-1.dsk + java -jar $(AC) -p contiki-apple2-1.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg + java -jar $(AC) -p contiki-apple2-1.dsk menu.system sys 0 < ../apple2enh/menu.system + java -jar $(AC) -p contiki-apple2-1.dsk ipconfig.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-1.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh + java -jar $(AC) -p contiki-apple2-1.dsk webserve.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-1.dsk webserve bin < ../../examples/webserver/webserver-example.apple2enh + java -jar $(AC) -p contiki-apple2-1.dsk webbrows.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-1.dsk webbrows bin < ../../examples/webbrowser/webbrowser.apple2enh + java -jar $(AC) -p contiki-apple2-1.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth + java -jar $(AC) -p contiki-apple2-1.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth + java -jar $(AC) -p contiki-apple2-1.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + java -jar $(AC) -p contiki-apple2-1.dsk index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm + java -jar $(AC) -p contiki-apple2-1.dsk backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif + java -jar $(AC) -p contiki-apple2-1.dsk contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif + java -jar $(AC) -p contiki-apple2-1.dsk notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm -apple2enh-2-disk: apple2enh-makes - cp ../apple2enh/prodos.dsk contiki-2.dsk - java -jar $(AC) -p contiki-2.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg - java -jar $(AC) -p contiki-2.dsk menu.system sys 0 < ../apple2enh/menu.system - java -jar $(AC) -p contiki-2.dsk ipconfig.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-2.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh - java -jar $(AC) -p contiki-2.dsk wget.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-2.dsk wget bin < ../../examples/wget/wget.apple2enh - java -jar $(AC) -p contiki-2.dsk irc.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-2.dsk irc bin < ../../examples/irc/irc-client.apple2enh - java -jar $(AC) -p contiki-2.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth - java -jar $(AC) -p contiki-2.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth - java -jar $(AC) -p contiki-2.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou +apple2-dsk-2: apple2enh-makes + cp ../apple2enh/prodos.dsk contiki-apple2-2.dsk + java -jar $(AC) -p contiki-apple2-2.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg + java -jar $(AC) -p contiki-apple2-2.dsk menu.system sys 0 < ../apple2enh/menu.system + java -jar $(AC) -p contiki-apple2-2.dsk ipconfig.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-2.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh + java -jar $(AC) -p contiki-apple2-2.dsk wget.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-2.dsk wget bin < ../../examples/wget/wget.apple2enh + java -jar $(AC) -p contiki-apple2-2.dsk irc.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-2.dsk irc bin < ../../examples/irc/irc-client.apple2enh + java -jar $(AC) -p contiki-apple2-2.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth + java -jar $(AC) -p contiki-apple2-2.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth + java -jar $(AC) -p contiki-apple2-2.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou -apple2enh-3-disk: apple2enh-makes - cp ../apple2enh/prodos.dsk contiki-3.dsk - java -jar $(AC) -p contiki-3.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg - java -jar $(AC) -p contiki-3.dsk menu.system sys 0 < ../apple2enh/menu.system - java -jar $(AC) -p contiki-3.dsk ipconfig.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-3.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.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 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/ipconfig/cs8900a.eth - java -jar $(AC) -p contiki-3.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth - java -jar $(AC) -p contiki-3.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou +apple2-dsk-3: apple2enh-makes + cp ../apple2enh/prodos.dsk contiki-apple2-3.dsk + java -jar $(AC) -p contiki-apple2-3.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg + java -jar $(AC) -p contiki-apple2-3.dsk menu.system sys 0 < ../apple2enh/menu.system + java -jar $(AC) -p contiki-apple2-3.dsk ipconfig.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-3.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh + java -jar $(AC) -p contiki-apple2-3.dsk email.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-3.dsk email bin < ../../examples/email/email-client.apple2enh + java -jar $(AC) -p contiki-apple2-3.dsk ftp.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-3.dsk ftp bin < ../../examples/ftp/ftp-client.apple2enh + java -jar $(AC) -p contiki-apple2-3.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth + java -jar $(AC) -p contiki-apple2-3.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth + java -jar $(AC) -p contiki-apple2-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 < ../apple2enh/default.cfg - java -jar $(AC) -p contiki-4.dsk menu.system sys 0 < ../apple2enh/menu.system - java -jar $(AC) -p contiki-4.dsk ipconfig.system sys 0 < ../apple2enh/loader.system - java -jar $(AC) -cc65 contiki-4.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.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/ipconfig/cs8900a.eth - java -jar $(AC) -p contiki-4.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth - java -jar $(AC) -p contiki-4.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou +apple2-dsk-4: apple2enh-makes + cp ../apple2enh/prodos.dsk contiki-apple2-4.dsk + java -jar $(AC) -p contiki-apple2-4.dsk contiki.cfg bin 0 < ../apple2enh/default.cfg + java -jar $(AC) -p contiki-apple2-4.dsk menu.system sys 0 < ../apple2enh/menu.system + java -jar $(AC) -p contiki-apple2-4.dsk ipconfig.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-4.dsk ipconfig bin 0 < ../../cpu/6502/ipconfig/ipconfig.apple2enh + java -jar $(AC) -p contiki-apple2-4.dsk breadbox.system sys 0 < ../apple2enh/loader.system + java -jar $(AC) -cc65 contiki-apple2-4.dsk breadbox bin < ../../../contikiprojects/vandenbrande.com/twitter/platform/apple2enh/breadbox64.apple2enh + java -jar $(AC) -p contiki-apple2-4.dsk cs8900a.eth rel 0 < ../../cpu/6502/ipconfig/cs8900a.eth + java -jar $(AC) -p contiki-apple2-4.dsk lan91c96.eth rel 0 < ../../cpu/6502/ipconfig/lan91c96.eth + java -jar $(AC) -p contiki-apple2-4.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou $(eval $(call makes,c64)) -c64-1-disk: c64-makes - $(C1541) -format contiki,00 d64 contiki-1.d64 - $(C1541) -attach contiki-1.d64 -write ../c64/default.cfg contiki.cfg,u - $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p - $(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/ipconfig/cs8900a.eth cs8900a.eth,u - $(C1541) -attach contiki-1.d64 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u - $(C1541) -attach contiki-1.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u - $(C1541) -attach contiki-1.d64 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u - $(C1541) -attach contiki-1.d64 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u - $(C1541) -attach contiki-1.d64 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u - $(C1541) -attach contiki-1.d64 -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,u +c64-d64-1: c64-makes + $(C1541) -format contiki-1,00 d64 contiki-c64-1.d64 + $(C1541) -attach contiki-c64-1.d64 -write ../c64/default.cfg contiki.cfg,u + $(C1541) -attach contiki-c64-1.d64 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p + $(C1541) -attach contiki-c64-1.d64 -write ../../examples/webserver/webserver-example.c64 webserver,p + $(C1541) -attach contiki-c64-1.d64 -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p + $(C1541) -attach contiki-c64-1.d64 -write ../../examples/wget/wget.c64 wget,p + $(C1541) -attach contiki-c64-1.d64 -write ../../examples/irc/irc-client.c64 irc,p + $(C1541) -attach contiki-c64-1.d64 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-c64-1.d64 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-c64-1.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u + $(C1541) -attach contiki-c64-1.d64 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u + $(C1541) -attach contiki-c64-1.d64 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u + $(C1541) -attach contiki-c64-1.d64 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u + $(C1541) -attach contiki-c64-1.d64 -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,u -c64-2-disk: c64-makes - $(C1541) -format contiki,00 d64 contiki-2.d64 - $(C1541) -attach contiki-2.d64 -write ../c64/default.cfg contiki.cfg,u - $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,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/ipconfig/cs8900a.eth cs8900a.eth,u - $(C1541) -attach contiki-2.d64 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u - $(C1541) -attach contiki-2.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u +c64-d64-2: c64-makes + $(C1541) -format contiki-2,00 d64 contiki-c64-2.d64 + $(C1541) -attach contiki-c64-2.d64 -write ../c64/default.cfg contiki.cfg,u + $(C1541) -attach contiki-c64-2.d64 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p + $(C1541) -attach contiki-c64-2.d64 -write ../../examples/email/email-client.c64 email,p + $(C1541) -attach contiki-c64-2.d64 -write ../../examples/ftp/ftp-client.c64 ftp,p + $(C1541) -attach contiki-c64-2.d64 -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p + $(C1541) -attach contiki-c64-2.d64 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-c64-2.d64 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-c64-2.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou,u + +c64-d71: c64-makes + $(C1541) -format contiki,00 d71 contiki-c64.d71 + $(C1541) -attach contiki-c64.d71 -write ../c64/default.cfg contiki.cfg,u + $(C1541) -attach contiki-c64.d71 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p + $(C1541) -attach contiki-c64.d71 -write ../../examples/webserver/webserver-example.c64 webserver,p + $(C1541) -attach contiki-c64.d71 -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p + $(C1541) -attach contiki-c64.d71 -write ../../examples/wget/wget.c64 wget,p + $(C1541) -attach contiki-c64.d71 -write ../../examples/irc/irc-client.c64 irc,p + $(C1541) -attach contiki-c64.d71 -write ../../examples/email/email-client.c64 email,p + $(C1541) -attach contiki-c64.d71 -write ../../examples/ftp/ftp-client.c64 ftp,p + $(C1541) -attach contiki-c64.d71 -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p + $(C1541) -attach contiki-c64.d71 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-c64.d71 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-c64.d71 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u + $(C1541) -attach contiki-c64.d71 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u + $(C1541) -attach contiki-c64.d71 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u + $(C1541) -attach contiki-c64.d71 -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,u + +c64-d81: c64-makes + $(C1541) -format contiki,00 d81 contiki-c64.d81 + $(C1541) -attach contiki-c64.d81 -write ../c64/default.cfg contiki.cfg,u + $(C1541) -attach contiki-c64.d81 -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p + $(C1541) -attach contiki-c64.d81 -write ../../examples/webserver/webserver-example.c64 webserver,p + $(C1541) -attach contiki-c64.d81 -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p + $(C1541) -attach contiki-c64.d81 -write ../../examples/wget/wget.c64 wget,p + $(C1541) -attach contiki-c64.d81 -write ../../examples/irc/irc-client.c64 irc,p + $(C1541) -attach contiki-c64.d81 -write ../../examples/email/email-client.c64 email,p + $(C1541) -attach contiki-c64.d81 -write ../../examples/ftp/ftp-client.c64 ftp,p + $(C1541) -attach contiki-c64.d81 -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c64/breadbox64.c64 breadbox64,p + $(C1541) -attach contiki-c64.d81 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-c64.d81 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-c64.d81 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u + $(C1541) -attach contiki-c64.d81 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u + $(C1541) -attach contiki-c64.d81 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u + $(C1541) -attach contiki-c64.d81 -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,u $(eval $(call makes,c128)) -c128-1-disk: c128-makes - $(C1541) -format contiki,00 d71 contiki-1.d71 - $(C1541) -attach contiki-1.d71 -write ../c128/default.cfg contiki.cfg,u - $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p - $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/webserver-example.c128 webserver,p - $(C1541) -attach contiki-1.d71 -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p - $(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/ipconfig/cs8900a.eth cs8900a.eth,u - $(C1541) -attach contiki-1.d71 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u - $(C1541) -attach contiki-1.d71 -write $(CC65_HOME)/mou/c128-1351.mou c128-1351.mou,u - $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u - $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u - $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u - $(C1541) -attach contiki-1.d71 -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,u +c128-d64-1: c128-makes + $(C1541) -format contiki-1,00 d64 contiki-c128-1.d64 + $(C1541) -attach contiki-c128-1.d64 -write ../c128/default.cfg contiki.cfg,u + $(C1541) -attach contiki-c128-1.d64 -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p + $(C1541) -attach contiki-c128-1.d64 -write ../../examples/webserver/webserver-example.c128 webserver,p + $(C1541) -attach contiki-c128-1.d64 -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p + $(C1541) -attach contiki-c128-1.d64 -write ../../examples/wget/wget.c128 wget,p + $(C1541) -attach contiki-c128-1.d64 -write ../../examples/irc/irc-client.c128 irc,p + $(C1541) -attach contiki-c128-1.d64 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-c128-1.d64 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-c128-1.d64 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u + $(C1541) -attach contiki-c128-1.d64 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u + $(C1541) -attach contiki-c128-1.d64 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u + $(C1541) -attach contiki-c128-1.d64 -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,u + +c128-d64-2: c128-makes + $(C1541) -format contiki-2,00 d64 contiki-c128-2.d64 + $(C1541) -attach contiki-c128-2.d64 -write ../c128/default.cfg contiki.cfg,u + $(C1541) -attach contiki-c128-2.d64 -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p + $(C1541) -attach contiki-c128-2.d64 -write ../../examples/email/email-client.c128 email,p + $(C1541) -attach contiki-c128-2.d64 -write ../../examples/ftp/ftp-client.c128 ftp,p + $(C1541) -attach contiki-c128-2.d64 -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p + $(C1541) -attach contiki-c128-2.d64 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-c128-2.d64 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u + +c128-d71: c128-makes + $(C1541) -format contiki,00 d71 contiki-c128.d71 + $(C1541) -attach contiki-c128.d71 -write ../c128/default.cfg contiki.cfg,u + $(C1541) -attach contiki-c128.d71 -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p + $(C1541) -attach contiki-c128.d71 -write ../../examples/webserver/webserver-example.c128 webserver,p + $(C1541) -attach contiki-c128.d71 -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p + $(C1541) -attach contiki-c128.d71 -write ../../examples/wget/wget.c128 wget,p + $(C1541) -attach contiki-c128.d71 -write ../../examples/irc/irc-client.c128 irc,p + $(C1541) -attach contiki-c128.d71 -write ../../examples/email/email-client.c128 email,p + $(C1541) -attach contiki-c128.d71 -write ../../examples/ftp/ftp-client.c128 ftp,p + $(C1541) -attach contiki-c128.d71 -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p + $(C1541) -attach contiki-c128.d71 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-c128.d71 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-c128.d71 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u + $(C1541) -attach contiki-c128.d71 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u + $(C1541) -attach contiki-c128.d71 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u + $(C1541) -attach contiki-c128.d71 -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,u + +c128-d81: c128-makes + $(C1541) -format contiki,00 d81 contiki-c128.d81 + $(C1541) -attach contiki-c128.d81 -write ../c128/default.cfg contiki.cfg,u + $(C1541) -attach contiki-c128.d81 -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p + $(C1541) -attach contiki-c128.d81 -write ../../examples/webserver/webserver-example.c128 webserver,p + $(C1541) -attach contiki-c128.d81 -write ../../examples/webbrowser/webbrowser.c128 webbrowser,p + $(C1541) -attach contiki-c128.d81 -write ../../examples/wget/wget.c128 wget,p + $(C1541) -attach contiki-c128.d81 -write ../../examples/irc/irc-client.c128 irc,p + $(C1541) -attach contiki-c128.d81 -write ../../examples/email/email-client.c128 email,p + $(C1541) -attach contiki-c128.d81 -write ../../examples/ftp/ftp-client.c128 ftp,p + $(C1541) -attach contiki-c128.d81 -write ../../../contikiprojects/vandenbrande.com/twitter/platform/c128/breadbox64.c128 breadbox64,p + $(C1541) -attach contiki-c128.d81 -write ../../cpu/6502/ipconfig/cs8900a.eth cs8900a.eth,u + $(C1541) -attach contiki-c128.d81 -write ../../cpu/6502/ipconfig/lan91c96.eth lan91c96.eth,u + $(C1541) -attach contiki-c128.d81 -write ../../examples/webserver/httpd-cfs/index.htm index.htm,u + $(C1541) -attach contiki-c128.d81 -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,u + $(C1541) -attach contiki-c128.d81 -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,u + $(C1541) -attach contiki-c128.d81 -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,u $(eval $(call makes,atari)) -atari-1-disk: atari-makes +atari-atr-1: atari-makes mkdir -p atr cp ../atari/dos.sys atr/dos.sys cp ../atari/dup.sys atr/dup.sys @@ -194,10 +272,10 @@ atari-1-disk: atari-makes cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif cp ../../examples/webserver/httpd-cfs/notfound.htm atr/notfound.htm - $(DIR2ATR) -b Dos25 1040 contiki-1.atr atr + $(DIR2ATR) -b Dos25 1040 contiki-atari-1.atr atr rm -r atr -atari-2-disk: atari-makes +atari-atr-2: atari-makes mkdir -p atr cp ../atari/dos.sys atr/dos.sys cp ../atari/dup.sys atr/dup.sys @@ -205,10 +283,10 @@ atari-2-disk: atari-makes cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../examples/wget/wget.atari atr/wget.com cp ../../examples/irc/irc-client.atari atr/irc.com - $(DIR2ATR) -b Dos25 1040 contiki-2.atr atr + $(DIR2ATR) -b Dos25 1040 contiki-atari-2.atr atr rm -r atr -atari-3-disk: atari-makes +atari-atr-3: atari-makes mkdir -p atr cp ../atari/dos.sys atr/dos.sys cp ../atari/dup.sys atr/dup.sys @@ -216,15 +294,15 @@ atari-3-disk: atari-makes cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.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 + $(DIR2ATR) -b Dos25 1040 contiki-atari-3.atr atr rm -r atr -atari-4-disk: atari-makes +atari-atr-4: atari-makes mkdir -p atr cp ../atari/dos.sys atr/dos.sys cp ../atari/dup.sys atr/dup.sys cp ../atari/default.cfg atr/contiki.cfg cp ../../cpu/6502/ipconfig/ipconfig.atari atr/ipconfig.com cp ../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com - $(DIR2ATR) -b Dos25 1040 contiki-4.atr atr + $(DIR2ATR) -b Dos25 1040 contiki-atari-4.atr atr rm -r atr