From 28e7d7faed355e451cc8b0c037035dfcf873a965 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 20 Aug 1998 22:04:22 +0000 Subject: Patches from Eric Norum --- c/src/lib/libbsp/bare/README | 2 +- c/src/lib/libbsp/bare/do-bare-bsp-build | 2 +- c/src/lib/libbsp/i386/pc386/Makefile.in | 4 ++-- c/src/lib/libbsp/i386/pc386/include/Makefile.in | 7 ++++--- c/src/lib/libbsp/i386/pc386/network/network.c | 2 ++ c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in | 4 ++-- c/src/lib/libbsp/m68k/gen68360/Makefile.in | 6 +----- c/src/lib/libbsp/m68k/gen68360/README | 2 +- c/src/lib/libbsp/m68k/gen68360/include/bsp.h | 8 ++++++++ c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in | 6 +----- 10 files changed, 23 insertions(+), 20 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/bare/README b/c/src/lib/libbsp/bare/README index 11362253b0..f2d43f974d 100644 --- a/c/src/lib/libbsp/bare/README +++ b/c/src/lib/libbsp/bare/README @@ -82,7 +82,7 @@ # --enable-gmake-print-directory \ # --disable-tests \ # --disable-posix \ -# --enable-ka9q \ +# --enable-networking \ # --enable-bare-cpu-cflags=-mcpu32 \ # --enable-bare-cpu-model=mcpu32 \ # --enable-rtemsbsp=bare diff --git a/c/src/lib/libbsp/bare/do-bare-bsp-build b/c/src/lib/libbsp/bare/do-bare-bsp-build index 6449756405..16da69e0fe 100644 --- a/c/src/lib/libbsp/bare/do-bare-bsp-build +++ b/c/src/lib/libbsp/bare/do-bare-bsp-build @@ -138,7 +138,7 @@ for cpu in ${CPUS}; do echo "Configuring RTEMS target bare-${rtems_target} ... " ../${RTEMS}/configure --target=${TARGET} --prefix=${RTEMS_PREFIX} \ --enable-cxx --enable-gmake-print-directory \ - --disable-tests --disable-posix --enable-ka9q \ + --disable-tests --disable-posix --enable-networking \ --enable-bare-cpu-cflags=-m${rtems_target} \ --enable-bare-cpu-model=m${rtems_target} \ --enable-rtemsbsp=bare diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.in b/c/src/lib/libbsp/i386/pc386/Makefile.in index 92963be422..4862454e13 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/Makefile.in @@ -11,9 +11,9 @@ PROJECT_ROOT = @PROJECT_ROOT@ include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg -# We only build the Network library if HAS_KA9Q was defined +# We only build the Network library if HAS_NETWORKING was defined NETWORK_yes_V = network -NETWORK = $(NETWORK_$(HAS_KA9Q)_V) +NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.in b/c/src/lib/libbsp/i386/pc386/include/Makefile.in index 0af71afba1..9dafa8662f 100644 --- a/c/src/lib/libbsp/i386/pc386/include/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/include/Makefile.in @@ -8,9 +8,10 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -# We only install wd80x3.h if HAS_KA9Q was defined -WD80X3_yes_V = $(srcdir)/wd80x3.h -WD80X3 = $(WD80X3_$(HAS_KA9Q)_V) +# This driver needs to be reworked for the BSD stack. +# # We only install wd80x3.h if HAS_NETWORKING was defined +# WD80X3_yes_V = $(srcdir)/wd80x3.h +# WD80X3 = $(WD80X3_$(HAS_NETWORKING)_V) H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h $(srcdir)/crt.h \ $(srcdir)/pc386uart.h $(srcdir)/pcibios.h \ diff --git a/c/src/lib/libbsp/i386/pc386/network/network.c b/c/src/lib/libbsp/i386/pc386/network/network.c index 2a13c6e514..639d2eb699 100644 --- a/c/src/lib/libbsp/i386/pc386/network/network.c +++ b/c/src/lib/libbsp/i386/pc386/network/network.c @@ -1,4 +1,6 @@ /* + * XXX This driver needs to be reworked to support the new BSD stack + * * RTEMS/KA9Q driver for WD8003 Ethernet Controller * * diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in index 93c14df9ed..70515fdb8e 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in @@ -8,9 +8,9 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -# We only build the Network library if HAS_KA9Q was defined +# We only build the Network library if HAS_NETWORKING was defined NETWORK_yes_V = network -NETWORK = $(NETWORK_$(HAS_KA9Q)_V) +NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) BSP_PIECES=startup clock console timer pc386dev $(NETWORK) GENERIC_PIECES= diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/Makefile.in index 98cf93acef..b06c1fc69c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.in @@ -13,10 +13,6 @@ include $(RTEMS_ROOT)/make/directory.cfg SRCS=README -# We only build the ka9q device driver if HAS_KA9Q was defined -KA9Q_DRIVER_yes_V = ka9q_network -KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V) - # We only build the networking device driver if HAS_NETWORKING was defined NETWORKING_DRIVER_yes_V = network NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) @@ -26,4 +22,4 @@ all: $(SRCS) # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories SUB_DIRS=include start360 startup clock console timer \ - $(KA9Q_DRIVER) $(NETWORKING_DRIVER) wrapup + $(NETWORKING_DRIVER) wrapup diff --git a/c/src/lib/libbsp/m68k/gen68360/README b/c/src/lib/libbsp/m68k/gen68360/README index 1a5ec2e667..8e14552641 100644 --- a/c/src/lib/libbsp/m68k/gen68360/README +++ b/c/src/lib/libbsp/m68k/gen68360/README @@ -33,7 +33,7 @@ # # Decisions to be made a link-edit time are: # - The size of the memory allocator heap. The default value is -# 64 kbytes. If the KA9Q network package is used the heap +# 64 kbytes. If the network package is used the heap # should be at least 256 kbytes. If your network is large, or # busy, the heap should be even larger. # To choose a heap size of 256 kbytes, diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index a52dc1e69c..885fdd117d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -36,6 +36,14 @@ extern "C" { #include #include +/* + * Network driver configuration + */ +struct rtems_bsdnet_ifconfig; +extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config); +#define RTEMS_BSP_NETWORK_DRIVER_NAME "scc1" +#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_scc1_driver_attach + /* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in index de02880710..c7523cd10f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.in @@ -8,15 +8,11 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -# We only build the ka9q device driver if HAS_KA9Q was defined -KA9Q_DRIVER_yes_V = ka9q_network -KA9Q_DRIVER = $(KA9Q_DRIVER_$(HAS_KA9Q)_V) - # We only build the networking device driver if HAS_NETWORKING was defined NETWORKING_DRIVER_yes_V = network NETWORKING_DRIVER = $(NETWORKING_DRIVER_$(HAS_NETWORKING)_V) -BSP_PIECES=startup clock console timer $(KA9Q_DRIVER) $(NETWORKING_DRIVER) +BSP_PIECES=startup clock console timer $(NETWORKING_DRIVER) CPU_PIECES= GENERIC_PIECES= -- cgit v1.2.3