trs80m1: rearrange memory a bit and turn on networking

It all fits so why not.

diff --git a/Kernel/platform-trs80m1/Makefile b/Kernel/platform-trs80m1/Makefile
index 9a937ad..00ebc58 100644 (file)
--- a/Kernel/platform-trs80m1/Makefile
+++ b/Kernel/platform-trs80m1/Makefile
@@ -1,7 +1,7 @@
 
-CSRCS = devlpr.c devtty.c devgfx.c
-CSRCS += devices.c main.c devstringy.c devinput.c
+CSRCS =
 DISCARD_CSRCS = discard.c devhd_discard.c
+NSRCS = ../dev/net/net_native.c
 
 ASRCS = trs80.s trs80-bank.s crt0.s vtsupport.s
 ASRCS += tricks.s commonmem.s floppy.s floppy3.s stringy.s
@@ -9,12 +9,17 @@ ASRCS += tricks.s commonmem.s floppy.s floppy3.s stringy.s
 # buffers.c must be in CODE2, direct users are more convenient there as
 # the asm helpers then can avoid another switch
 C2SRCS = buffers.c devfd.c devfd3.c devhd.c
+# And these so CODE1 is under 32K
+C2SRCS += devices.c main.c devstringy.c devinput.c
+C2SRCS += devlpr.c devtty.c devgfx.c
+
 
 COBJS = $(CSRCS:.c=.rel)
 C2OBJS = $(C2SRCS:.c=.rel)
 AOBJS = $(ASRCS:.s=.rel)
+NOBJS = $(patsubst ../dev/net/%.c,%.rel, $(NSRCS))
 DISCARD_COBJS = $(DISCARD_CSRCS:.c=.rel)
-OBJS  = $(COBJS) $(C2OBJS) $(AOBJS) $(DISCARD_COBJS) $(DOBJS)
+OBJS  = $(COBJS) $(C2OBJS) $(AOBJS) $(DISCARD_COBJS) $(DOBJS) $(NOBJS)
 
 CROSS_CCOPTS += -I../dev/
 
@@ -34,6 +39,9 @@ $(AOBJS): %.rel: %.s
 $(DISCARD_COBJS): %.rel: %.c
        $(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEGDISC) -c $<
 
+$(NOBJS): %.rel: ../dev/net/%.c
+       $(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEG2) -c $<
+
 clean:
        rm -f $(OBJS) $(JUNK)  core *~ 
 

diff --git a/Kernel/platform-trs80m1/config.h b/Kernel/platform-trs80m1/config.h
index 4a08ed7..fb36fbe 100644 (file)
--- a/Kernel/platform-trs80m1/config.h
+++ b/Kernel/platform-trs80m1/config.h
@@ -27,6 +27,9 @@
 #define CONFIG_BLKBUF_EXTERNAL
 /* And our buffer pool is dynamically sized */
 #define CONFIG_DYNAMIC_BUFPOOL
+/* And networking */
+#define CONFIG_NET
+#define CONFIG_NET_NATIVE
 
 #define MAX_MAPS       16      /* 512K */
 

diff --git a/Kernel/platform-trs80m1/fuzix.lnk b/Kernel/platform-trs80m1/fuzix.lnk
index 56474c1..6b30c55 100644 (file)
--- a/Kernel/platform-trs80m1/fuzix.lnk
+++ b/Kernel/platform-trs80m1/fuzix.lnk
@@ -30,6 +30,7 @@ platform-trs80m1/devstringy.rel
 platform-trs80m1/stringy.rel
 platform-trs80m1/devices.rel
 platform-trs80m1/buffers.rel
+platform-trs80m1/net_native.rel
 devio.rel
 filesys.rel
 process.rel
@@ -38,6 +39,7 @@ syscall_exec16.rel
 syscall_fs.rel
 syscall_fs2.rel
 syscall_fs3.rel
+syscall_net.rel
 syscall_proc.rel
 syscall_other.rel
 tty.rel