Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-21 19:29:18 +00:00
Code Issues Projects Releases Wiki Activity

Removed 'Dracarys' support.

Browse Source 
Given the popularity of FujiNet, there's no momentum anymore for a W5100 device on the ATARI.
This commit is contained in:
Oliver Schmidt 2022-07-30 16:13:25 +02:00
parent 7fb2bc1c49
commit c2e0b9a0e2
6 changed files with 46 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -20,10 +20,6 @@
*.exp5438 *.exp5438
*.mbxxx *.mbxxx
*.win32 *.win32
*.apple2enh
*.atarixl
*.c128
*.c64
*.cc2538dk *.cc2538dk
*.zoul *.zoul
*.jn516x *.jn516x
@ -80,7 +76,6 @@ contiki-cc2530dk.lib
*.dsc *.dsc
#cc65 build artifacts #cc65 build artifacts
*.s
*.eth *.eth
*.dsk *.dsk
*.po *.po

10
cpu/6502/ethconfig/ethconfig.c
View File

@ -15,8 +15,7 @@ static struct {
{"LANceGS", "lan91c96.eth"} {"LANceGS", "lan91c96.eth"}
#endif #endif
#ifdef __ATARI__ #ifdef __ATARI__
{"Dragon Cart", "cs8900a.eth" }, {"Dragon Cart", "cs8900a.eth" }
{"Dracarys", "w5100.eth" }
#endif #endif
#ifdef __CBM__ #ifdef __CBM__
{"RR-Net", "cs8900a.eth" }, {"RR-Net", "cs8900a.eth" },
@ -78,13 +77,6 @@ main(void)
param = choose(7); param = choose(7);
#endif #endif
#ifdef __ATARI__
if(d == 1) {
printf("PBI device ID (1-8)\n");
param = choose(8);
}
#endif
f = cfs_open("contiki.cfg", CFS_WRITE); f = cfs_open("contiki.cfg", CFS_WRITE);
if(f == -1) { if(f == -1) {
printf("Saving Config - Error\n"); printf("Saving Config - Error\n");

69
cpu/6502/net/w5100.S
View File

@ -41,12 +41,7 @@
; Ethernet address ; Ethernet address
mac: .byte $00, $08, $DC ; OUI of WIZnet mac: .byte $00, $08, $DC ; OUI of WIZnet
.ifdef __APPLE2__
.byte $A2, $A2, $A2 .byte $A2, $A2, $A2
.endif
.ifdef __ATARI__
.byte $A8, $A8, $A8
.endif
; Buffer attributes ; Buffer attributes
bufaddr:.res 2 ; Address bufaddr:.res 2 ; Address
@ -91,8 +86,6 @@ tmp := tmp4 ; Temporary value
;===================================================================== ;=====================================================================
.ifdef __APPLE2__
.rodata .rodata
fixup: .byte fixup02-fixup01, fixup03-fixup02, fixup04-fixup03 fixup: .byte fixup02-fixup01, fixup03-fixup02, fixup04-fixup03
@ -155,54 +148,6 @@ init:
bcs :- ; Always 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 ; Indirect Bus I/F mode, Address Auto-Increment
@ -287,13 +232,6 @@ fixup14:sta data
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
poll: poll:
.ifdef __ATARI__
; Select parallel device
lda pdbit
sta shpdvs
sta pdvs
.endif
; Check for completion of previous command ; Check for completion of previous command
; Socket 0 Command Register: = 0 ? ; Socket 0 Command Register: = 0 ?
jsr set_addrcmdreg0 jsr set_addrcmdreg0
@ -401,13 +339,6 @@ send:
sta adv sta adv
stx adv+1 stx adv+1
.ifdef __ATARI__
; Select parallel device
lda pdbit
sta shpdvs
sta pdvs
.endif
; Set parameters for transmitting data ; Set parameters for transmitting data
lda #>$4000 ; Socket 0 TX Base Address lda #>$4000 ; Socket 0 TX Base Address
ldx #$01 ; Write ldx #$01 ; Write

7
platform/atarixl/Makefile.atarixl
View File

@ -33,14 +33,16 @@
ifdef SLIP ifdef SLIP
DEFINES += STATIC_DRIVER=atrxrdev_ser DEFINES += STATIC_DRIVER=atrxrdev_ser
else
DEFINES += STATIC_DRIVER=cs8900a
endif endif
ETHERNET_SOURCEFILES = cs8900a.S w5100.S ETHERNET_SOURCEFILES = cs8900a.S
CONTIKI_CPU = $(CONTIKI)/cpu/6502 CONTIKI_CPU = $(CONTIKI)/cpu/6502
include $(CONTIKI_CPU)/Makefile.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 SHADOW_RAM2_SOURCEFILES = clock.c uip_arch.c uip_arp.c unload.c random.c
# Set target-specific variable values # Set target-specific variable values
@ -62,7 +64,6 @@ ifdef SLIP
cp $(CONTIKI)/tools/6502/sample.cfg atr/contiki.cfg cp $(CONTIKI)/tools/6502/sample.cfg atr/contiki.cfg
else else
cp $(CONTIKI)/tools/$(TARGET)/sample.cfg atr/contiki.cfg cp $(CONTIKI)/tools/$(TARGET)/sample.cfg atr/contiki.cfg
cp cs8900a.$(TARGET) atr/cs8900a.eth
endif endif
ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE) ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE)
cp $(CC65_TARGET_DIR)/drv/mou/atrxst.mou atr/contiki.mou cp $(CC65_TARGET_DIR)/drv/mou/atrxst.mou atr/contiki.mou

5
platform/atarixl/README.md
View File

@ -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 Most things are shared between the 6502-based targets so please consult
cpu/6502/README.md for further details. 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 - Dragon Cart
- Dracarys: w5100.eth
The 'disk' make goal requires HiassofT's dir2atr program. It is available at 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 https://www.horus.com/~hias/atari/ - either as source code (being part of the

120
tools/6502/Makefile
View File

@ -197,87 +197,67 @@ atari: contiki-atari.zip
atari-clean: atarixl-cleanmakes atari-clean: atarixl-cleanmakes
rm -f contiki-atari.zip contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari.atr 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 contiki-atari-1.atr: atarixl-makes
mkdir atr mkdir atr
cp ../atarixl/dos25/dos.sys atr/dos.sys cp ../atarixl/dos25/dos.sys atr/dos.sys
cp ../atarixl/dos25/dup.sys atr/dup.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
ifdef SLIP ifdef SLIP
cp default.cfg atr/contiki.cfg cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com
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 endif
cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com
cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou cp ../../examples/wget/wget.atarixl atr/wget.com
cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou ifdef SLIP
cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou 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 $(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr rm -r atr
contiki-atari-2.atr: atarixl-makes contiki-atari-2.atr: atarixl-makes
mkdir atr mkdir atr
cp ../atarixl/dos25/dos.sys atr/dos.sys cp ../atarixl/dos25/dos.sys atr/dos.sys
cp ../atarixl/dos25/dup.sys atr/dup.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
ifdef SLIP ifdef SLIP
cp default.cfg atr/contiki.cfg cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com
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 endif
cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou cp ../../examples/irc/irc-client.atarixl atr/irc.com
cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou ifdef SLIP
cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou cp default.cfg atr/contiki.cfg
cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou 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 $(DIR2ATR) -b Dos25 1040 $@ atr
rm -r atr rm -r atr
contiki-atari-3.atr: atarixl-makes 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 mkdir atr
cp ../atarixl/dos25/dos.sys atr/dos.sys cp ../atarixl/dos25/dos.sys atr/dos.sys
cp ../atarixl/dos25/dup.sys atr/dup.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 ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com
cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
ifdef SLIP ifdef SLIP
cp default.cfg atr/contiki.cfg cp default.cfg atr/contiki.cfg
else else
cp ../atarixl/default.cfg atr/contiki.cfg 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 endif
cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou 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/atrxami.mou atr/ami.mou
@ -291,33 +271,13 @@ endif
$(DIR2ATR) -b Dos25 1040 $@ atr $(DIR2ATR) -b Dos25 1040 $@ atr
rm -r 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 contiki-atari.atr: atarixl-makes
mkdir atr mkdir atr
cp ../atarixl/mydos4534/dos.sys atr/dos.sys cp ../atarixl/mydos4534/dos.sys atr/dos.sys
cp ../atarixl/mydos4534/dup.sys atr/dup.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 ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com
cp ../../examples/wget/wget.atarixl atr/wget.com cp ../../examples/wget/wget.atarixl atr/wget.com
@ -328,8 +288,6 @@ ifdef SLIP
cp default.cfg atr/contiki.cfg cp default.cfg atr/contiki.cfg
else else
cp ../atarixl/default.cfg atr/contiki.cfg 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 endif
cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou 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/atrxami.mou atr/ami.mou