From: Alan Cox Date: Fri, 7 Sep 2018 21:10:18 +0000 (+0100) Subject: sbcv2: and turn on the Wiznet X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=4459bff2318b01ec475e7f96be2f450790bc68bf;p=FUZIX.git sbcv2: and turn on the Wiznet --- diff --git a/Kernel/platform-sbcv2/Makefile b/Kernel/platform-sbcv2/Makefile index 2b8e51b9..e7787f86 100644 --- a/Kernel/platform-sbcv2/Makefile +++ b/Kernel/platform-sbcv2/Makefile @@ -2,7 +2,7 @@ CROSS_CCOPTS += -I../dev/ -I../dev/net/ CSRCS = devtty.c -CSRCS += devices.c main.c +CSRCS += devices.c main.c wiznet.c DISCSRCS = discard.c @@ -13,7 +13,7 @@ DISCARD_DSRCS = ../dev/devide_discard.c DSRCS = ../dev/blkdev.c ../dev/devide.c ../dev/mbr.c ../dev/ds1302_discard.c DSRCS += ../dev/propio2.c ../dev/ds1302.c DSRCS += ../dev/devfd.c ../dev/ppide_rbc.c -NSRCS = ../dev/net/net_wiznet.c ../dev/net/net_native.c +NSRCS = ../dev/net/net_w5100.c ../dev/net/net_native.c DASRCS = ../dev/rbcfd9266_hw.s ../dev/ds1302_rbc.s diff --git a/Kernel/platform-sbcv2/fuzix.lnk b/Kernel/platform-sbcv2/fuzix.lnk index 2cbf8aab..2d342893 100644 --- a/Kernel/platform-sbcv2/fuzix.lnk +++ b/Kernel/platform-sbcv2/fuzix.lnk @@ -46,5 +46,6 @@ platform-sbcv2/ds1302_rbc.rel platform-sbcv2/devfd.rel platform-sbcv2/rbcfd9266_hw.rel platform-sbcv2/net_native.rel -platform-sbcv2/net_wiznet.rel +platform-sbcv2/net_w5100.rel +platform-sbcv2/wiznet.rel -e diff --git a/Kernel/platform-sbcv2/main.c b/Kernel/platform-sbcv2/main.c index e4df431f..53ceb442 100644 --- a/Kernel/platform-sbcv2/main.c +++ b/Kernel/platform-sbcv2/main.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include uint16_t ramtop = PROGTOP; uint16_t swap_dev = 0xFFFF; @@ -44,7 +44,7 @@ void platform_interrupt(void) { tty_poll(); #ifdef CONFIG_NET_WIZNET - wiz_poll(); + w5100_poll(); #endif }