From 0b221b77adf11e9f9dfd31c74901a87701a2bdaf Mon Sep 17 00:00:00 2001
From: jonnosan <jonnosan@93682198-c243-4bdb-bd91-e943c89aac3b>
Date: Thu, 9 Dec 2010 10:12:40 +0000
Subject: [PATCH] moved cs8900a code from core to driver

git-svn-id: http://svn.code.sf.net/p/netboot65/code@288 93682198-c243-4bdb-bd91-e943c89aac3b
---
 client/basic/bails.s               |  6 ++-
 client/cfg/kipperbas.cfg           |  1 -
 client/drivers/Makefile            | 32 +++++++++------
 client/{ip65 => drivers}/cs8900a.i |  0
 client/{ip65 => drivers}/cs8900a.s |  0
 client/ip65/Makefile               | 62 +++++++++++++++++-------------
 6 files changed, 60 insertions(+), 41 deletions(-)
 rename client/{ip65 => drivers}/cs8900a.i (100%)
 rename client/{ip65 => drivers}/cs8900a.s (100%)

diff --git a/client/basic/bails.s b/client/basic/bails.s
index 40658c0..69babfc 100644
--- a/client/basic/bails.s
+++ b/client/basic/bails.s
@@ -216,8 +216,10 @@ install_new_vectors_loop:
   .byte "NO RR-NET FOUND - UNINSTALLING",0  
   
 @init_ok:
-;  jsr $A644 ;do a "NEW"
-;  jmp $A474 ;"READY" prompt
+  lda CHAIN_FLAG
+  
+  jsr $A644 ;do a "NEW"
+  jmp $A474 ;"READY" prompt
   rts ;so BASIC will LOAD & RUN INDEX.BAS
   
 welcome_banner:
diff --git a/client/cfg/kipperbas.cfg b/client/cfg/kipperbas.cfg
index 1f81400..4a27bab 100644
--- a/client/cfg/kipperbas.cfg
+++ b/client/cfg/kipperbas.cfg
@@ -1,4 +1,3 @@
-# CA65 config for a M/L stub that will use memory from $6000..$A000 and $c010..$cfff
 
 MEMORY {
     IP65ZP: start = $A3, size = $12, type = rw;
diff --git a/client/drivers/Makefile b/client/drivers/Makefile
index d686f85..b401116 100644
--- a/client/drivers/Makefile
+++ b/client/drivers/Makefile
@@ -9,24 +9,32 @@ AFLAGS=
 %.o: %.s
 	$(AS) $(AFLAGS) $<
 
-
-DRIVERS=\
-	apple2prog.lib \
-	c64prog.lib \
-#	c64nb65.lib \
+
+
+DRIVERS=\
+	apple2prog.lib \
+	c64prog.lib \
+#	c64nb65.lib \
+
   
 all: $(DRIVERS)
 
 
-apple2prog.lib: a2print.o uthernet.o a2timer.o a2kernal.o a2input.o a2charconv.o
+apple2prog.lib: a2print.o uthernet.o a2timer.o a2kernal.o a2input.o a2charconv.o cs8900a.o
 	ar65 a $@ $^
 
-c64prog.lib: c64print.o rr-net.o c64timer.o c64kernal.o c64inputs.o c64_disk_access.o c64charconv.o 	c64_vt100.o 
-
-	ar65 a $@ $^
-
-#c64nb65.lib: c64print.o rr-net.o c64timer_nb65.o c64kernal.o c64inputs.o c64_disk_access.o c64charconv.o
-#	ar65 a $@ $^
+c64prog.lib: c64print.o rr-net.o c64timer.o c64kernal.o c64inputs.o c64_disk_access.o c64charconv.o c64_vt100.o cs8900a.o
+	ar65 a $@ $^
+
+c64wiznet.lib: c64print.o wiznet.o c64timer.o c64kernal.o c64inputs.o c64_disk_access.o c64charconv.o c64_vt100.o 
+	ar65 a $@ $^
+
+
+
+#c64nb65.lib: c64print.o rr-net.o c64timer_nb65.o c64kernal.o c64inputs.o c64_disk_access.o c64charconv.o
+
+#	ar65 a $@ $^
+
 
 clean:
 	rm -f *.o
diff --git a/client/ip65/cs8900a.i b/client/drivers/cs8900a.i
similarity index 100%
rename from client/ip65/cs8900a.i
rename to client/drivers/cs8900a.i
diff --git a/client/ip65/cs8900a.s b/client/drivers/cs8900a.s
similarity index 100%
rename from client/ip65/cs8900a.s
rename to client/drivers/cs8900a.s
diff --git a/client/ip65/Makefile b/client/ip65/Makefile
index ed41f3a..770bea3 100644
--- a/client/ip65/Makefile
+++ b/client/ip65/Makefile
@@ -7,52 +7,62 @@ AFLAGS=
 	$(CC) -c $(CFLAGS) $<
 
 %.o: %.s
-	$(AS) $(AFLAGS) $<
+	$(AS) $(AFLAGS) $<
+
 
 ETHOBJS= \
 	copymem.o \
 	config.o \
 	timer.o \
-	cs8900a.o \
 	eth.o \
 	arp.o \
 	udp.o \
 	ip65.o \
 	printf.o \
-	debug.o \
-	http.o \
-	httpd.o \
-  dhcp.o \
-  dns.o \
-  dottedquad.o \
-  output_buffer.o\
-  tftp.o \
-  sntp.o \
-  parser.o \
-  string_utils.o \
-  telnet.o \
-  xmodem.o \
-  url.o \
-  arithmetic.o\
+	debug.o \
+	http.o \
+	httpd.o \
+	dhcp.o \
+	dns.o \
+	dottedquad.o \
+	output_buffer.o\
+	tftp.o \
+	sntp.o \
+	parser.o \
+	string_utils.o \
+	telnet.o \
+	xmodem.o \
+	url.o \
+	arithmetic.o\
+
   
 all: ip65.lib ip65_tcp.lib
 
-ip65.lib: $(ETHOBJS) function_dispatcher.s ip.s icmp.s
-	$(AS) $(AFLAGS) function_dispatcher.s
-	$(AS) $(AFLAGS) ip.s
+ip65.lib: $(ETHOBJS) function_dispatcher.s ip.s icmp.s
+
+	$(AS) $(AFLAGS) function_dispatcher.s
+
+	$(AS) $(AFLAGS) ip.s
+
 	$(AS) $(AFLAGS) icmp.s
 	ar65 a ip65.lib $(ETHOBJS) function_dispatcher.o ip.o icmp.o
-
-ip65_tcp.lib: tcp.o $(ETHOBJS) function_dispatcher.s ip.s tcp.s 	icmp.s
-	$(AS) $(AFLAGS) function_dispatcher.s -DTCP -DAPI_VERSION=2
-	$(AS) $(AFLAGS) ip.s -DTCP
-	$(AS) $(AFLAGS) icmp.s -DTCP
+
+
+ip65_tcp.lib: tcp.o $(ETHOBJS) function_dispatcher.s ip.s tcp.s 	icmp.s
+
+	$(AS) $(AFLAGS) function_dispatcher.s -DTCP -DAPI_VERSION=2
+
+	$(AS) $(AFLAGS) ip.s -DTCP
+
+	$(AS) $(AFLAGS) icmp.s -DTCP
+
 	ar65 a ip65_tcp.lib $(ETHOBJS) function_dispatcher.o ip.o tcp.o icmp.o
 
 clean:
 	rm -f *.o
 	rm -f ip65.lib
-	rm -f ip65_tcp.lib
+	rm -f ip65_tcp.lib
+
 
 
 distclean: clean