From c2e0b9a0e266bb4d621a2785146dd78e6c9876b7 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sat, 30 Jul 2022 16:13:25 +0200 Subject: [PATCH] Removed 'Dracarys' support. Given the popularity of FujiNet, there's no momentum anymore for a W5100 device on the ATARI. --- .gitignore | 5 -- cpu/6502/ethconfig/ethconfig.c | 10 +-- cpu/6502/net/w5100.S | 69 ----------------- platform/atarixl/Makefile.atarixl | 7 +- platform/atarixl/README.md | 5 +- tools/6502/Makefile | 120 ++++++++++-------------------- 6 files changed, 46 insertions(+), 170 deletions(-) diff --git a/.gitignore b/.gitignore index 00a6e84e9..1b4793b83 100644 --- a/.gitignore +++ b/.gitignore @@ -20,10 +20,6 @@ *.exp5438 *.mbxxx *.win32 -*.apple2enh -*.atarixl -*.c128 -*.c64 *.cc2538dk *.zoul *.jn516x @@ -80,7 +76,6 @@ contiki-cc2530dk.lib *.dsc #cc65 build artifacts -*.s *.eth *.dsk *.po diff --git a/cpu/6502/ethconfig/ethconfig.c b/cpu/6502/ethconfig/ethconfig.c index 664e1520e..084a3a229 100644 --- a/cpu/6502/ethconfig/ethconfig.c +++ b/cpu/6502/ethconfig/ethconfig.c @@ -15,8 +15,7 @@ static struct { {"LANceGS", "lan91c96.eth"} #endif #ifdef __ATARI__ - {"Dragon Cart", "cs8900a.eth" }, - {"Dracarys", "w5100.eth" } + {"Dragon Cart", "cs8900a.eth" } #endif #ifdef __CBM__ {"RR-Net", "cs8900a.eth" }, @@ -78,13 +77,6 @@ main(void) param = choose(7); #endif -#ifdef __ATARI__ - if(d == 1) { - printf("PBI device ID (1-8)\n"); - param = choose(8); - } -#endif - f = cfs_open("contiki.cfg", CFS_WRITE); if(f == -1) { printf("Saving Config - Error\n"); diff --git a/cpu/6502/net/w5100.S b/cpu/6502/net/w5100.S index 796f3c63d..2e3f5a046 100644 --- a/cpu/6502/net/w5100.S +++ b/cpu/6502/net/w5100.S @@ -41,12 +41,7 @@ ; Ethernet address mac: .byte $00, $08, $DC ; OUI of WIZnet - .ifdef __APPLE2__ .byte $A2, $A2, $A2 - .endif - .ifdef __ATARI__ - .byte $A8, $A8, $A8 - .endif ; Buffer attributes bufaddr:.res 2 ; Address @@ -91,8 +86,6 @@ tmp := tmp4 ; Temporary value ;===================================================================== - .ifdef __APPLE2__ - .rodata fixup: .byte fixup02-fixup01, fixup03-fixup02, fixup04-fixup03 @@ -155,54 +148,6 @@ init: bcs :- ; Always : - .endif - -;===================================================================== - - .ifdef __ATARI__ - - .rodata - -pdtab: .byte %00000001 - .byte %00000010 - .byte %00000100 - .byte %00001000 - .byte %00010000 - .byte %00100000 - .byte %01000000 - .byte %10000000 - -;--------------------------------------------------------------------- - - .bss - -pdbit: .res 1 - -;--------------------------------------------------------------------- - -mode := $D1F0 -addr := $D1F1 -data := $D1F3 - -pdvs := $D1FF ; parallel device select -shpdvs := $0248 ; shadow parallel device select - -;--------------------------------------------------------------------- - - .code - -init: - ; Convert parallel device ID (1-8) to parallel device bit - tay - lda pdtab-1,y - sta pdbit - - ; Select parallel device - sta shpdvs - sta pdvs - - .endif - ;===================================================================== ; Indirect Bus I/F mode, Address Auto-Increment @@ -287,13 +232,6 @@ fixup14:sta data ;--------------------------------------------------------------------- poll: - .ifdef __ATARI__ - ; Select parallel device - lda pdbit - sta shpdvs - sta pdvs - .endif - ; Check for completion of previous command ; Socket 0 Command Register: = 0 ? jsr set_addrcmdreg0 @@ -401,13 +339,6 @@ send: sta adv stx adv+1 - .ifdef __ATARI__ - ; Select parallel device - lda pdbit - sta shpdvs - sta pdvs - .endif - ; Set parameters for transmitting data lda #>$4000 ; Socket 0 TX Base Address ldx #$01 ; Write diff --git a/platform/atarixl/Makefile.atarixl b/platform/atarixl/Makefile.atarixl index 6e8271900..e5038e48b 100644 --- a/platform/atarixl/Makefile.atarixl +++ b/platform/atarixl/Makefile.atarixl @@ -33,14 +33,16 @@ ifdef SLIP DEFINES += STATIC_DRIVER=atrxrdev_ser +else + DEFINES += STATIC_DRIVER=cs8900a endif -ETHERNET_SOURCEFILES = cs8900a.S w5100.S +ETHERNET_SOURCEFILES = cs8900a.S CONTIKI_CPU = $(CONTIKI)/cpu/6502 include $(CONTIKI_CPU)/Makefile.6502 -SHADOW_RAM_SOURCEFILES = ethernet.c ethernet-drv.c timer.c uip.c uiplib.c +SHADOW_RAM_SOURCEFILES = ethernet.c uip.c uiplib.c SHADOW_RAM2_SOURCEFILES = clock.c uip_arch.c uip_arp.c unload.c random.c # Set target-specific variable values @@ -62,7 +64,6 @@ ifdef SLIP cp $(CONTIKI)/tools/6502/sample.cfg atr/contiki.cfg else cp $(CONTIKI)/tools/$(TARGET)/sample.cfg atr/contiki.cfg - cp cs8900a.$(TARGET) atr/cs8900a.eth endif ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE) cp $(CC65_TARGET_DIR)/drv/mou/atrxst.mou atr/contiki.mou diff --git a/platform/atarixl/README.md b/platform/atarixl/README.md index ac0d65e97..80063b748 100644 --- a/platform/atarixl/README.md +++ b/platform/atarixl/README.md @@ -5,10 +5,9 @@ The platform/atarixl/ directory is used for targeting an Atari XL computer. Most things are shared between the 6502-based targets so please consult cpu/6502/README.md for further details. -The following Atari XL Ethernet devices are supported: +The following Atari XL Ethernet device is supported: -- Dragon Cart: cs8900a.eth -- Dracarys: w5100.eth +- Dragon Cart The 'disk' make goal requires HiassofT's dir2atr program. It is available at https://www.horus.com/~hias/atari/ - either as source code (being part of the diff --git a/tools/6502/Makefile b/tools/6502/Makefile index 06bee3277..4740a3c65 100644 --- a/tools/6502/Makefile +++ b/tools/6502/Makefile @@ -197,87 +197,67 @@ atari: contiki-atari.zip atari-clean: atarixl-cleanmakes rm -f contiki-atari.zip contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari.atr -contiki-atari.zip: contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari-4.atr contiki-atari-5.atr contiki-atari.atr +contiki-atari.zip: contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari.atr contiki-atari-1.atr: atarixl-makes mkdir atr - cp ../atarixl/dos25/dos.sys atr/dos.sys - cp ../atarixl/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/$(DEV)config/$(DEV)config.atarixl atr/$(DEV)confi.com - cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com - cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com + cp ../atarixl/dos25/dos.sys atr/dos.sys + cp ../atarixl/dos25/dup.sys atr/dup.sys ifdef SLIP - cp default.cfg atr/contiki.cfg -else - cp ../atarixl/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ethconfig/cs8900a.atarixl atr/cs8900a.eth - cp ../../cpu/6502/ethconfig/w5100.atarixl atr/w5100.eth + cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com endif - cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou - cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou - cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou - cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou - cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou + cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com + cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com + cp ../../examples/wget/wget.atarixl atr/wget.com +ifdef SLIP + cp default.cfg atr/contiki.cfg +else + cp ../atarixl/default.cfg atr/contiki.cfg +endif + cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou + cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou + cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou + cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou + cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou $(DIR2ATR) -b Dos25 1040 $@ atr rm -r atr contiki-atari-2.atr: atarixl-makes mkdir atr - cp ../atarixl/dos25/dos.sys atr/dos.sys - cp ../atarixl/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/$(DEV)config/$(DEV)config.atarixl atr/$(DEV)confi.com - cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com - cp ../../examples/wget/wget.atarixl atr/wget.com + cp ../atarixl/dos25/dos.sys atr/dos.sys + cp ../atarixl/dos25/dup.sys atr/dup.sys ifdef SLIP - cp default.cfg atr/contiki.cfg -else - cp ../atarixl/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ethconfig/cs8900a.atarixl atr/cs8900a.eth - cp ../../cpu/6502/ethconfig/w5100.atarixl atr/w5100.eth + cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com endif - cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou - cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou - cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou - cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou - cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou + cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com + cp ../../examples/irc/irc-client.atarixl atr/irc.com +ifdef SLIP + cp default.cfg atr/contiki.cfg +else + cp ../atarixl/default.cfg atr/contiki.cfg +endif + cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou + cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou + cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou + cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou + cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou $(DIR2ATR) -b Dos25 1040 $@ atr rm -r atr contiki-atari-3.atr: atarixl-makes - mkdir atr - cp ../atarixl/dos25/dos.sys atr/dos.sys - cp ../atarixl/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/$(DEV)config/$(DEV)config.atarixl atr/$(DEV)confi.com - cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com - cp ../../examples/irc/irc-client.atarixl atr/irc.com -ifdef SLIP - cp default.cfg atr/contiki.cfg -else - cp ../atarixl/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ethconfig/cs8900a.atarixl atr/cs8900a.eth - cp ../../cpu/6502/ethconfig/w5100.atarixl atr/w5100.eth -endif - cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou - cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou - cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou - cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou - cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou - $(DIR2ATR) -b Dos25 1040 $@ atr - rm -r atr - -contiki-atari-4.atr: atarixl-makes mkdir atr cp ../atarixl/dos25/dos.sys atr/dos.sys cp ../atarixl/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/$(DEV)config/$(DEV)config.atarixl atr/$(DEV)confi.com +ifdef SLIP + cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com +endif cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com + cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com ifdef SLIP cp default.cfg atr/contiki.cfg else cp ../atarixl/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ethconfig/cs8900a.atarixl atr/cs8900a.eth - cp ../../cpu/6502/ethconfig/w5100.atarixl atr/w5100.eth endif cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou @@ -291,33 +271,13 @@ endif $(DIR2ATR) -b Dos25 1040 $@ atr rm -r atr -contiki-atari-5.atr: atarixl-makes - mkdir atr - cp ../atarixl/dos25/dos.sys atr/dos.sys - cp ../atarixl/dos25/dup.sys atr/dup.sys - cp ../../cpu/6502/$(DEV)config/$(DEV)config.atarixl atr/$(DEV)confi.com - cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com - cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com -ifdef SLIP - cp default.cfg atr/contiki.cfg -else - cp ../atarixl/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ethconfig/cs8900a.atarixl atr/cs8900a.eth - cp ../../cpu/6502/ethconfig/w5100.atarixl atr/w5100.eth -endif - cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou - cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou - cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou - cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou - cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou - $(DIR2ATR) -b Dos25 1040 $@ atr - rm -r atr - contiki-atari.atr: atarixl-makes mkdir atr cp ../atarixl/mydos4534/dos.sys atr/dos.sys cp ../atarixl/mydos4534/dup.sys atr/dup.sys - cp ../../cpu/6502/$(DEV)config/$(DEV)config.atarixl atr/$(DEV)confi.com +ifdef SLIP + cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com +endif cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com cp ../../examples/wget/wget.atarixl atr/wget.com @@ -328,8 +288,6 @@ ifdef SLIP cp default.cfg atr/contiki.cfg else cp ../atarixl/default.cfg atr/contiki.cfg - cp ../../cpu/6502/ethconfig/cs8900a.atarixl atr/cs8900a.eth - cp ../../cpu/6502/ethconfig/w5100.atarixl atr/w5100.eth endif cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou