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 406218232..000000000 Binary files a/tools/6502/dummy.cfg and /dev/null differ diff --git a/tools/apple2enh/default.cfg b/tools/apple2enh/default.cfg new file mode 100644 index 000000000..e9bc3f02a Binary files /dev/null and b/tools/apple2enh/default.cfg differ diff --git a/tools/atari/default.cfg b/tools/atari/default.cfg new file mode 100644 index 000000000..f2cf1eb31 Binary files /dev/null and b/tools/atari/default.cfg differ diff --git a/tools/c128/default.cfg b/tools/c128/default.cfg new file mode 100644 index 000000000..0958a903d Binary files /dev/null and b/tools/c128/default.cfg differ diff --git a/tools/c64/default.cfg b/tools/c64/default.cfg new file mode 100644 index 000000000..0958a903d Binary files /dev/null and b/tools/c64/default.cfg differ