From cd4b7f1b9eb78a4d5a82c76c9c32d65d52e0ee04 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 11 Jan 2016 19:06:40 +0000 Subject: [PATCH] z80pack: add this lot to the build --- Kernel/platform-z80pack/Makefile | 9 +++++++-- Kernel/platform-z80pack/devices.c | 2 ++ Kernel/platform-z80pack/fuzix.lnk | 2 ++ Kernel/platform-z80pack/main.c | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Kernel/platform-z80pack/Makefile b/Kernel/platform-z80pack/Makefile index d890c0ae..6204f814 100644 --- a/Kernel/platform-z80pack/Makefile +++ b/Kernel/platform-z80pack/Makefile @@ -1,5 +1,6 @@ -DSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c ../dev/z80pack/devrtc.c +DSRCS = ../dev/z80pack/devlpr.c ../dev/z80pack/devtty.c ../dev/z80pack/devfd.c ../dev/z80pack/devrtc.c ../dev/z80pack/devatsim.c +NSRCS = ../dev/net/net_at.c CSRCS += devices.c main.c ASRCS = crt0.s z80pack.s @@ -8,8 +9,9 @@ ASRCS += tricks.s commonmem.s AOBJS = $(ASRCS:.s=.rel) COBJS = $(CSRCS:.c=.rel) DOBJS = $(patsubst ../dev/z80pack/%.c,%.rel, $(DSRCS)) +NOBJS = $(patsubst ../dev/net/%.c,%.rel, $(NSRCS)) -OBJS = $(AOBJS) $(COBJS) $(DOBJS) +OBJS = $(AOBJS) $(COBJS) $(DOBJS) $(NOBJS) CROSS_CCOPTS += -I../dev/z80pack/ @@ -26,6 +28,9 @@ $(COBJS): %.rel: %.c $(DOBJS): %.rel: ../dev/z80pack/%.c $(CROSS_CC) $(CROSS_CCOPTS) -c $< +$(NOBJS): %.rel: ../dev/net/%.c + $(CROSS_CC) $(CROSS_CCOPTS) -c $< + clean: rm -f $(OBJS) $(JUNK) core *~ diff --git a/Kernel/platform-z80pack/devices.c b/Kernel/platform-z80pack/devices.c index fdd4ff7d..d44f9ca7 100644 --- a/Kernel/platform-z80pack/devices.c +++ b/Kernel/platform-z80pack/devices.c @@ -7,6 +7,7 @@ #include #include #include +#include struct devsw dev_tab[] = /* The device driver switch table */ { @@ -42,4 +43,5 @@ void device_init(void) /* Add 64 swaps (4MB) to use the entire J drive */ for (i = 0; i < MAX_SWAPS; i++) swapmap_add(i); + netdev_init(); } diff --git a/Kernel/platform-z80pack/fuzix.lnk b/Kernel/platform-z80pack/fuzix.lnk index f27812e2..525d44a1 100644 --- a/Kernel/platform-z80pack/fuzix.lnk +++ b/Kernel/platform-z80pack/fuzix.lnk @@ -40,4 +40,6 @@ level2.rel syscall_level2.rel syscall_net.rel select.rel +platform-z80pack/devatsim.rel +platform-z80pack/net_at.rel -e diff --git a/Kernel/platform-z80pack/main.c b/Kernel/platform-z80pack/main.c index b364a8d3..c7a4cf61 100644 --- a/Kernel/platform-z80pack/main.c +++ b/Kernel/platform-z80pack/main.c @@ -3,10 +3,10 @@ #include #include #include +#include uint16_t ramtop = PROGTOP; - void pagemap_init(void) { int i; @@ -28,6 +28,7 @@ void platform_interrupt(void) { tty_pollirq(); timer_interrupt(); + netat_poll(); } /* Nothing to do for the map of init */ -- 2.34.1