Removed support for W5100 on the C64.

Now that we have per-target combo driver wrappers we can remove the W5100 support from the C64. There isn't any actual (known) W5100-based solution for the C64.
This commit is contained in:
Oliver Schmidt 2019-04-29 16:41:27 +02:00
parent 7e6b77f41b
commit 43d7d33c31
5 changed files with 13 additions and 56 deletions

View File

@ -10,17 +10,17 @@
ifeq ($(eth),cl)
C64DRIVERLIB = ../drivers/c64rrnet.lib
A2DRIVERLIB = ../drivers/a2uther.lib
ATRDRIVERLIB = ../drivers/atrdragon.lib
else ifeq ($(eth),sm)
C64DRIVERLIB = ../drivers/c64eth64.lib
A2DRIVERLIB = ../drivers/a2lancegs.lib
else ifeq ($(eth),wn)
C64DRIVERLIB = ../drivers/c64wiz811.lib
A2DRIVERLIB = ../drivers/a2uther2.lib
else
C64DRIVERLIB = ../drivers/c64combo.lib
A2DRIVERLIB = ../drivers/a2combo.lib
ATRDRIVERLIB = ../drivers/atrdragon.lib
endif
ATRDRIVERLIB = ../drivers/atrdragon.lib
C64_DRIVERLIB = ../drivers/ip65_c64.lib
A2_DRIVERLIB = ../drivers/ip65_apple2.lib

View File

@ -2,8 +2,7 @@
# ----------------------
# c64rrnet.lib : C64 with RR-Net (or clone) (default base addr: $de0x)
# c64eth64.lib : C64 with ETH64 (default base addr: $de0x)
# c64wiz811.lib : C64 with WIZ811MJ (default base addr: $de0x)
# c64combo.lib : C64 with RR-Net or ETH64 or WIZ811MJ (default base addr: $de0x)
# c64combo.lib : C64 with RR-Net or ETH64 (default base addr: $de0x)
# 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)
@ -13,7 +12,7 @@
# For C programs
# --------------
# ip65_c64.lib : C64 with RR-Net or ETH64 or WIZ811MJ (default base addr: $de0x)
# ip65_c64.lib : C64 with RR-Net or ETH64 (default base addr: $de0x)
# ip65_apple2.lib : Apple ][ with Uthernet or LANceGS or Uthernet II (default slot: #3)
# ip65_atari.lib : ATARI 8-bit with Dragon Cart (default base addr: $d500)
# ip65_atarixl.lib : ATARI XL with Dragon Cart (default base addr: $d500)
@ -21,7 +20,6 @@
DRIVERS=\
c64rrnet.lib \
c64eth64.lib \
c64wiz811.lib \
c64combo.lib \
ip65_c64.lib \
a2uther.lib \
@ -116,11 +114,9 @@ c64rrnet.lib: c64init.o rr-net.o $(CS8900AOBJS) $(C64OBJS)
c64eth64.lib: c64init.o eth64.o $(LAN91C96OBJS) $(C64OBJS)
c64wiz811.lib: c64init.o wiz811mj.o $(W5100OBJS) $(C64OBJS)
c64combo.lib: c64init.o rr-net.o eth64.o c64combo.o $(C64OBJS)
c64combo.lib: c64init.o rr-net.o eth64.o wiz811mj.o c64combo.o $(C64OBJS)
ip65_c64.lib: c64init.o rr-net.o eth64.o wiz811mj.o c64combo.o $(C64_OBJS)
ip65_c64.lib: c64init.o rr-net.o eth64.o c64combo.o $(C64_OBJS)
a2uther.lib: a2init.o uthernet.o $(CS8900AOBJS) $(A2OBJS)

View File

@ -134,6 +134,8 @@ set_name:
; inputs: none
; outputs: carry flag is set if there was an error, clear otherwise
eth_init:
.ifdef __APPLE2__
ldax #_w5100
jsr patch_wrapper
ldax #_w5100_driver_name
@ -141,6 +143,7 @@ eth_init:
ldax _w5100_driver_io_base
jsr init_adaptor
bcc @done
.endif
ldax #_cs8900a
jsr patch_wrapper

View File

@ -1,43 +0,0 @@
; WIZ811MJ driver
.export _w5100_driver_name
.export _w5100_driver_io_base
__CBM__ = 1
DYN_DRV = 0
.include "w5100.s"
.rodata
_w5100_driver_name:
.byte "WIZ811MJ",0
.data
_w5100_driver_io_base:
.word $de00
; -- LICENSE FOR wiz811mj.s --
; The contents of this file are subject to the Mozilla Public License
; Version 1.1 (the "License"); you may not use this file except in
; compliance with the License. You may obtain a copy of the License at
; http://www.mozilla.org/MPL/
;
; Software distributed under the License is distributed on an "AS IS"
; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
; License for the specific language governing rights and limitations
; under the License.
;
; The Original Code is ip65.
;
; The Initial Developer of the Original Code is Jonno Downes,
; jonno@jamtronix.com.
; Portions created by the Initial Developer are Copyright (C) 2009
; Jonno Downes. All Rights Reserved.
; -- LICENSE END --

View File

@ -10,18 +10,19 @@
ifeq ($(eth),cl)
C64DRIVERLIB = ../drivers/c64rrnet.lib
A2DRIVERLIB = ../drivers/a2uther.lib
ATRDRIVERLIB = ../drivers/atrdragon.lib
VICDRIVERLIB = ../drivers/vic20rrnet.lib
else ifeq ($(eth),sm)
C64DRIVERLIB = ../drivers/c64eth64.lib
A2DRIVERLIB = ../drivers/a2lancegs.lib
else ifeq ($(eth),wn)
C64DRIVERLIB = ../drivers/c64wiz811.lib
A2DRIVERLIB = ../drivers/a2uther2.lib
else
C64DRIVERLIB = ../drivers/c64combo.lib
A2DRIVERLIB = ../drivers/a2combo.lib
ATRDRIVERLIB = ../drivers/atrdragon.lib
VICDRIVERLIB = ../drivers/vic20rrnet.lib
endif
ATRDRIVERLIB = ../drivers/atrdragon.lib
VICDRIVERLIB = ../drivers/vic20rrnet.lib
UDP =\
dns \