Removed 'Dracarys' support.

Given the popularity of FujiNet, there's no momentum anymore for a W5100 device on the ATATRI.

README.md

@@ -16,9 +16,8 @@ On the C64 there are two supported Ethernet devices:
 
 On the Apple II there are three supported Ethernet cards:
 - The [Uthernet](https://web.archive.org/web/20150323031638/http://a2retrosystems.com/products.htm) - emulated by [AppleWin](https://github.com/AppleWin/AppleWin) and [GSport](https://david-schmidt.github.io/gsport/)
+- The [Uthernet II](https://a2retrosystems.com/products.htm) - emulated by [AppleWin](https://github.com/AppleWin/AppleWin)
 - The [LANceGS](https://web.archive.org/web/20010331001718/http://lancegs.a2central.com:80/)
-- The [Uthernet II](https://a2retrosystems.com/products.htm)
 
-On the ATARI (XL) there are two supported Ethernet devices:
+On the ATARI (XL) there is one supported Ethernet device:
 - The [Dragon Cart](https://www.atari8ethernet.com/) - emulated by [Altirra](http://www.virtualdub.org/altirra.html)
-- The [Dracarys](https://atariage.com/forums/topic/287376-preannouncement-dragon-cart-ii/)

apps/Makefile

@@ -16,11 +16,10 @@ else ifeq ($(eth),sm)
   A2DRIVERLIB  = ../drivers/a2lancegs.lib
 else ifeq ($(eth),wn)
   A2DRIVERLIB  = ../drivers/a2uther2.lib
-  ATRDRIVERLIB = ../drivers/atrdracarys.lib
 else
   C64DRIVERLIB = ../drivers/c64combo.lib
   A2DRIVERLIB  = ../drivers/a2combo.lib
-  ATRDRIVERLIB = ../drivers/atrcombo.lib
+  ATRDRIVERLIB = ../drivers/atrdragon.lib
 endif
 
 C64_DRIVERLIB = ../drivers/ip65_c64.lib

drivers/Makefile

@@ -1,38 +1,34 @@
 # For assembler programs
 # ----------------------
-# c64rrnet.lib    : C64 with RR-Net (or clone)
-# c64eth64.lib    : C64 with ETH64
-# c64combo.lib    : C64 with RR-Net or ETH64
-# a2uther.lib     : Apple ][ with Uthernet (default slot: #3)
-# a2lancegs.lib   : Apple ][ with LANceGS (default slot: #3)
-# a2uther2.lib    : Apple ][ with Uthernet II (default slot: #3)
-# a2combo.lib     : Apple ][ with Uthernet or LANceGS or Uthernet II (default slot: #3)
-# atrdragon.lib   : ATARI 8-bit with Dragon Cart
-# atrdracarys.lib : ATARI 8-bit with Dracarys (default PBI device ID: #8)
-# atrcombo.lib    : ATARI 8-bit with Dragon Cart or Dracarys (default PBI device ID: #8)
-# vic20rrnet.lib  : VIC20 with RR-Net (or clone)
+# c64rrnet.lib   : C64 with RR-Net (or clone)
+# c64eth64.lib   : C64 with ETH64
+# c64combo.lib   : C64 with RR-Net or ETH64
+# a2uther.lib    : Apple ][ with Uthernet (default slot: #3)
+# a2uther2.lib   : Apple ][ with Uthernet II (default slot: #3)
+# a2lancegs.lib  : Apple ][ with LANceGS (default slot: #3)
+# a2combo.lib    : Apple ][ with Uthernet or Uthernet II or LANceGS (default slot: #3)
+# atrdragon.lib  : ATARI 8-bit with Dragon Cart
+# vic20rrnet.lib : VIC20 with RR-Net (or clone)
 
 # For C programs
 # --------------
 # ip65_c64.lib     : C64 with RR-Net or ETH64
-# ip65_apple2.lib  : Apple ][ with Uthernet or LANceGS or Uthernet II (default slot: #3)
-# ip65_atari.lib   : ATARI 8-bit with Dragon Cart or Dracarys (default PBI device ID: #8)
-# ip65_atarixl.lib : ATARI XL with Dragon Cart or Dracarys (default PBI device ID: #8)
+# ip65_apple2.lib  : Apple ][ with Uthernet or Uthernet II or LANceGS (default slot: #3)
+# ip65_atari.lib   : ATARI 8-bit with Dragon Cart
+# ip65_atarixl.lib : ATARI XL with Dragon Cart
 
 DRIVERS=\
 	c64rrnet.lib \
 	c64eth64.lib \
 	c64combo.lib \
 	ip65_c64.lib \
 	a2uther.lib \
-	a2lancegs.lib \
 	a2uther2.lib \
+	a2lancegs.lib \
 	a2combo.lib \
 	ip65_apple2.lib \
 	ip65_apple2_uther2.lib \
 	atrdragon.lib \
-	atrdracarys.lib \
-	atrcombo.lib \
 	ip65_atari.lib \
 	ip65_atarixl.lib \
 	vic20rrnet.lib
@@ -118,9 +114,9 @@ rr-net.o uthernet.o dragoncart.o vic20-rr-net.o: cs8900a.s
 
 eth64.o lancegs.o: lan91c96.s
 
-uthernet2.o dracarys.o: w5100.s
+uthernet2.o: w5100.s
 
-c64combo.o a2combo.o atrcombo.o: ethernetcombo.s
+c64combo.o a2combo.o: ethernetcombo.s
 
 c64rrnet.lib: rr-net.o $(CS8900AOBJS) c64init.o $(C64OBJS)
 
@@ -132,10 +128,10 @@ ip65_c64.lib: rr-net.o eth64.o c64combo.o c64init.o $(C64_OBJS)
 
 a2uther.lib: uthernet.o $(CS8900AOBJS) a2init.o $(A2OBJS)
 
-a2lancegs.lib: lancegs.o $(LAN91C96OBJS) a2init.o $(A2OBJS)
-
 a2uther2.lib: uthernet2.o $(W5100OBJS) a2init.o $(A2OBJS)
 
+a2lancegs.lib: lancegs.o $(LAN91C96OBJS) a2init.o $(A2OBJS)
+
 a2combo.lib: uthernet.o lancegs.o uthernet2.o a2combo.o a2init.o $(A2OBJS)
 
 ip65_apple2.lib: uthernet.o lancegs.o uthernet2.o a2combo.o a2init.o $(A2_OBJS)
@@ -144,13 +140,9 @@ ip65_apple2_uther2.lib: uthernet2.o $(W5100OBJS) a2init.o $(A2_OBJS)
 
 atrdragon.lib: dragoncart.o $(CS8900AOBJS) atrinit.o $(ATROBJS)
 
-atrdracarys.lib: dracarys.o $(W5100OBJS) atrinit.o $(ATROBJS)
-
-atrcombo.lib: dragoncart.o dracarys.o atrcombo.o atrinit.o $(ATROBJS)
-
-ip65_atari.lib: dragoncart.o dracarys.o atrcombo.o atrinit.o $(ATR_OBJS)
+ip65_atari.lib: dragoncart.o $(CS8900AOBJS) atrinit.o $(ATR_OBJS)
 
-ip65_atarixl.lib: dragoncart.o dracarys.o atrcombo.o atrinit.o $(ATRXL_OBJS)
+ip65_atarixl.lib: dragoncart.o $(CS8900AOBJS) atrinit.o $(ATRXL_OBJS)
 
 vic20rrnet.lib: vic20-rr-net.o $(CS8900AOBJS) vic20init.o $(VIC20OBJS)
 

drivers/atrinit.s

@@ -1 +1 @@
-.exportzp eth_init_default = 8  ; PBI default device ID
+.exportzp eth_init_default = 0

drivers/ethernetcombo.s

@@ -132,7 +132,7 @@ set_name:
 eth_init:
   sta eth_init_value
 
-.if .defined (__APPLE2__) .or .defined (__ATARI__)
+.if .defined (__APPLE2__)
   ldax #_w5100
   jsr patch_wrapper
   ldax #_w5100_name

drivers/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

inc/ip65.h

@@ -8,8 +8,6 @@
 //
 #if defined(__APPLE2__)
 #define ETH_INIT_DEFAULT 3  // Apple II slot number
-#elif defined(__ATARI__)
-#define ETH_INIT_DEFAULT 8  // ATARI PBI device ID
 #else
 #define ETH_INIT_DEFAULT 0  // Unused
 #endif

test/Makefile

@@ -17,11 +17,10 @@ else ifeq ($(eth),sm)
   A2DRIVERLIB  = ../drivers/a2lancegs.lib
 else ifeq ($(eth),wn)
   A2DRIVERLIB  = ../drivers/a2uther2.lib
-  ATRDRIVERLIB = ../drivers/atrdracarys.lib
 else
   C64DRIVERLIB = ../drivers/c64combo.lib
   A2DRIVERLIB  = ../drivers/a2combo.lib
-  ATRDRIVERLIB = ../drivers/atrcombo.lib
+  ATRDRIVERLIB = ../drivers/atrdragon.lib
   VICDRIVERLIB = ../drivers/vic20rrnet.lib
 endif