Added legacy in order to get pcib to work correctly and resoleved fxp attach issue.

The fxp attach has a resource allocation issue still to address, but
should work as soon as that is debugged.

9 files changed, 555 insertions, 48 deletions

diff --git a/Makefile b/Makefile
index c48040cb..5c543d98 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,8 @@ C_FILES += rtemsbsd/src/rtems-bsd-copyinout.c
 C_FILES += rtemsbsd/src/rtems-bsd-descrip.c
 C_FILES += rtemsbsd/src/rtems-bsd-conf.c
 C_FILES += rtemsbsd/src/rtems-bsd-subr_param.c
+C_FILES += rtemsbsd/src/rtems-bsd-pci_cfgreg.c
+C_FILES += rtemsbsd/src/rtems-bsd-pci_bus.c
 C_FILES += freebsd/kern/subr_eventhandler.c
 C_FILES += freebsd/kern/kern_subr.c
 C_FILES += freebsd/kern/kern_tc.c
@@ -387,6 +389,7 @@ C_FILES += freebsd/kern/subr_unit.c
 C_FILES += freebsd/dev/pci/pci_pci.c
 ifeq ($(RTEMS_CPU), i386)
 C_FILES += freebsd/i386/pci/pci_bus.c
+C_FILES += freebsd/i386/i386/legacy.c
 endif
 C_FILES += freebsd/dev/re/if_re.c
 C_FILES += freebsd/dev/fxp/if_fxp.c
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index f11c42b6..548f647c 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -553,6 +553,8 @@ rtems.addRTEMSSourceFiles(
 		'src/rtems-bsd-descrip.c',
 		'src/rtems-bsd-conf.c',
 		'src/rtems-bsd-subr_param.c',
+		'src/rtems-bsd-pci_cfgreg.c',
+		'src/rtems-bsd-pci_bus.c',
 	]
 )
 rtems.addEmptyHeaderFiles(
@@ -1213,6 +1215,7 @@ devNic.addCPUDependentSourceFiles(
 	'i386',
 	[
 		'i386/pci/pci_bus.c',
+		'i386/i386/legacy.c',
 	]
 )
 devNic.addSourceFiles(
diff --git a/freebsd/dev/pci/pci_pci.c b/freebsd/dev/pci/pci_pci.c
index f65c0b85..c2a829c8 100644
--- a/freebsd/dev/pci/pci_pci.c
+++ b/freebsd/dev/pci/pci_pci.c
@@ -246,6 +246,7 @@ pcib_attach_common(device_t dev)
 	sc->flags |= PCIB_SUBTRACTIVE;
 	break;
 
+#ifndef __rtems__
     /* Compaq R3000 BIOS sets wrong subordinate bus number. */
     case 0x00dd10de:
 	{
@@ -271,6 +272,7 @@ pcib_attach_common(device_t dev)
 	    }
 	    break;
 	}
+#endif /* __rtems__ */
     }
 
     if (pci_msi_device_blacklisted(dev))
diff --git a/freebsd/i386/i386/legacy.c b/freebsd/i386/i386/legacy.c
new file mode 100644
index 00000000..24021809
--- /dev/null
+++ b/freebsd/i386/i386/legacy.c
@@ -0,0 +1,347 @@
+#include <freebsd/machine/rtems-bsd-config.h>
+
+/*-
+ * Copyright 1998 Massachusetts Institute of Technology
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that both the above copyright notice and this
+ * permission notice appear in all copies, that both the above
+ * copyright notice and this permission notice appear in all
+ * supporting documentation, and that the name of M.I.T. not be used
+ * in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  M.I.T. makes
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
+ * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
+ * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <freebsd/sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * This code implements a system driver for legacy systems that do not
+ * support ACPI or when ACPI support is not present in the kernel.
+ */
+
+#include <freebsd/sys/param.h>
+#include <freebsd/sys/systm.h>
+#include <freebsd/sys/bus.h>
+#include <freebsd/sys/cpu.h>
+#include <freebsd/sys/kernel.h>
+#include <freebsd/sys/malloc.h>
+#include <freebsd/sys/module.h>
+#include <freebsd/machine/bus.h>
+#include <freebsd/sys/pcpu.h>
+#include <freebsd/sys/rman.h>
+#include <freebsd/sys/smp.h>
+
+#ifndef __rtems__
+#include <freebsd/local/opt_mca.h>
+#endif /* __rtems__ */
+#ifdef DEV_MCA
+#include <freebsd/i386/bios/mca_machdep.h>
+#endif
+
+#include <freebsd/machine/legacyvar.h>
+#include <freebsd/machine/resource.h>
+
+static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device");
+struct legacy_device {
+	int			lg_pcibus;
+};
+
+#define DEVTOAT(dev)	((struct legacy_device *)device_get_ivars(dev))
+
+static	int legacy_probe(device_t);
+static	int legacy_attach(device_t);
+static	int legacy_print_child(device_t, device_t);
+static device_t legacy_add_child(device_t bus, u_int order, const char *name,
+				int unit);
+static	int legacy_read_ivar(device_t, device_t, int, uintptr_t *);
+static	int legacy_write_ivar(device_t, device_t, int, uintptr_t);
+
+static device_method_t legacy_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		legacy_probe),
+	DEVMETHOD(device_attach,	legacy_attach),
+	DEVMETHOD(device_detach,	bus_generic_detach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
+
+	/* Bus interface */
+	DEVMETHOD(bus_print_child,	legacy_print_child),
+	DEVMETHOD(bus_add_child,	legacy_add_child),
+	DEVMETHOD(bus_read_ivar,	legacy_read_ivar),
+	DEVMETHOD(bus_write_ivar,	legacy_write_ivar),
+	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
+	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
+	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
+	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
+
+	{ 0, 0 }
+};
+
+static driver_t legacy_driver = {
+	"legacy",
+	legacy_methods,
+	1,			/* no softc */
+};
+static devclass_t legacy_devclass;
+
+DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0);
+
+static int
+legacy_probe(device_t dev)
+{
+
+	device_set_desc(dev, "legacy system");
+	device_quiet(dev);
+	return (0);
+}
+
+static int
+legacy_attach(device_t dev)
+{
+	device_t child;
+
+	/*
+	 * Let our child drivers identify any child devices that they
+	 * can find.  Once that is done attach any devices that we
+	 * found.
+	 */
+	bus_generic_probe(dev);
+	bus_generic_attach(dev);
+
+#ifndef PC98
+	/*
+	 * If we didn't see EISA or ISA on a pci bridge, create some
+	 * connection points now so they show up "on motherboard".
+	 */
+	if (!devclass_get_device(devclass_find("eisa"), 0)) {
+		child = BUS_ADD_CHILD(dev, 0, "eisa", 0);
+		if (child == NULL)
+			panic("legacy_attach eisa");
+		device_probe_and_attach(child);
+	}
+#endif
+#ifdef DEV_MCA
+	if (MCA_system && !devclass_get_device(devclass_find("mca"), 0)) {
+        	child = BUS_ADD_CHILD(dev, 0, "mca", 0);
+        	if (child == 0)
+                	panic("legacy_probe mca");
+		device_probe_and_attach(child);
+	}
+#endif
+	if (!devclass_get_device(devclass_find("isa"), 0)) {
+		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
+		if (child == NULL)
+			panic("legacy_attach isa");
+		device_probe_and_attach(child);
+	}
+
+	return 0;
+}
+
+static int
+legacy_print_child(device_t bus, device_t child)
+{
+	struct legacy_device *atdev = DEVTOAT(child);
+	int retval = 0;
+
+	retval += bus_print_child_header(bus, child);
+	if (atdev->lg_pcibus != -1)
+		retval += printf(" pcibus %d", atdev->lg_pcibus);
+	retval += printf(" on motherboard\n");	/* XXX "motherboard", ick */
+
+	return (retval);
+}
+
+static device_t
+legacy_add_child(device_t bus, u_int order, const char *name, int unit)
+{
+	device_t child;
+	struct legacy_device *atdev;
+
+	atdev = malloc(sizeof(struct legacy_device), M_LEGACYDEV,
+	    M_NOWAIT | M_ZERO);
+	if (atdev == NULL)
+		return(NULL);
+	atdev->lg_pcibus = -1;
+
+	child = device_add_child_ordered(bus, order, name, unit);
+	if (child == NULL)
+		free(atdev, M_LEGACYDEV);
+	else
+		/* should we free this in legacy_child_detached? */
+		device_set_ivars(child, atdev);
+
+	return (child);
+}
+
+static int
+legacy_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
+{
+	struct legacy_device *atdev = DEVTOAT(child);
+
+	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		*result = 0;
+		break;
+	case LEGACY_IVAR_PCIBUS:
+		*result = atdev->lg_pcibus;
+		break;
+	default:
+		return ENOENT;
+	}
+	return 0;
+}
+	
+
+static int
+legacy_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
+{
+	struct legacy_device *atdev = DEVTOAT(child);
+
+	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		return EINVAL;
+	case LEGACY_IVAR_PCIBUS:
+		atdev->lg_pcibus = value;
+		break;
+	default:
+		return ENOENT;
+	}
+	return 0;
+}
+
+/*
+ * Legacy CPU attachment when ACPI is not available.  Drivers like
+ * cpufreq(4) hang off this.
+ */
+static void	cpu_identify(driver_t *driver, device_t parent);
+static int	cpu_read_ivar(device_t dev, device_t child, int index,
+		    uintptr_t *result);
+static device_t cpu_add_child(device_t bus, u_int order, const char *name,
+		    int unit);
+static struct resource_list *cpu_get_rlist(device_t dev, device_t child);
+
+struct cpu_device {
+	struct resource_list cd_rl;
+	struct pcpu *cd_pcpu;
+};
+
+static device_method_t cpu_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_identify,	cpu_identify),
+	DEVMETHOD(device_probe,		bus_generic_probe),
+	DEVMETHOD(device_attach,	bus_generic_attach),
+	DEVMETHOD(device_detach,	bus_generic_detach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
+
+	/* Bus interface */
+	DEVMETHOD(bus_add_child,	cpu_add_child),
+	DEVMETHOD(bus_read_ivar,	cpu_read_ivar),
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
+	DEVMETHOD(bus_get_resource_list, cpu_get_rlist),
+	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
+	DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
+	DEVMETHOD(bus_alloc_resource,	bus_generic_rl_alloc_resource),
+	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
+	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
+	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
+	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
+
+	{ 0, 0 }
+};
+
+static driver_t cpu_driver = {
+	"cpu",
+	cpu_methods,
+	1,		/* no softc */
+};
+static devclass_t cpu_devclass;
+DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0);
+
+static void
+cpu_identify(driver_t *driver, device_t parent)
+{
+	device_t child;
+	int i;
+
+	/*
+	 * Attach a cpuX device for each CPU.  We use an order of 150
+	 * so that these devices are attached after the Host-PCI
+	 * bridges (which are added at order 100).
+	 */
+	for (i = 0; i <= mp_maxid; i++)
+		if (!CPU_ABSENT(i)) {
+			child = BUS_ADD_CHILD(parent, 150, "cpu", i);
+			if (child == NULL)
+				panic("legacy_attach cpu");
+		}
+}
+
+static device_t
+cpu_add_child(device_t bus, u_int order, const char *name, int unit)
+{
+	struct cpu_device *cd;
+	device_t child;
+	struct pcpu *pc;
+
+	if ((cd = malloc(sizeof(*cd), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL)
+		return (NULL);
+
+	resource_list_init(&cd->cd_rl);
+	pc = pcpu_find(device_get_unit(bus));
+	cd->cd_pcpu = pc;
+
+	child = device_add_child_ordered(bus, order, name, unit);
+	if (child != NULL) {
+		pc->pc_device = child;
+		device_set_ivars(child, cd);
+	} else
+		free(cd, M_DEVBUF);
+	return (child);
+}
+
+static struct resource_list *
+cpu_get_rlist(device_t dev, device_t child)
+{
+	struct cpu_device *cpdev;
+
+	cpdev = device_get_ivars(child);
+	return (&cpdev->cd_rl);
+}
+
+static int
+cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result)
+{
+	struct cpu_device *cpdev;
+
+	if (index != CPU_IVAR_PCPU)
+		return (ENOENT);
+	cpdev = device_get_ivars(child);
+	*result = (uintptr_t)cpdev->cd_pcpu;
+	return (0);
+}
diff --git a/freebsd/i386/pci/pci_bus.c b/freebsd/i386/pci/pci_bus.c
index 51c463e5..f9d750f1 100644
--- a/freebsd/i386/pci/pci_bus.c
+++ b/freebsd/i386/pci/pci_bus.c
@@ -52,8 +52,13 @@ __FBSDID("$FreeBSD$");
 
 #include <freebsd/local/pcib_if.h>
 
+#ifndef __rtems__
 static int	pcibios_pcib_route_interrupt(device_t pcib, device_t dev,
     int pin);
+#else /* __rtems__ */
+int	pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin);
+#endif /* __rtems__ */
+
 
 int
 legacy_pcib_maxslots(device_t dev)
@@ -480,11 +485,14 @@ legacy_pcib_attach(device_t dev)
 	 * our method of routing interrupts if we have one.
 	 */
 	bus = pcib_get_bus(dev);
+#ifndef __rtems__
 	if (pci_pir_probe(bus, 0)) {
 		pir = BUS_ADD_CHILD(device_get_parent(dev), 0, "pir", 0);
 		if (pir != NULL)
 			device_probe_and_attach(pir);
 	}
+#else /* __rtems__ */
+#endif /* __rtems__ */
 	device_add_child(dev, "pci", bus);
 	return bus_generic_attach(dev);
 }
@@ -593,6 +601,7 @@ DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1);
 DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0);
 
 
+#ifndef __rtems__
 /*
  * Install placeholder to claim the resources owned by the
  * PCI bus interface.  This could be used to extract the
@@ -711,3 +720,4 @@ pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
 	return (pci_pir_route_interrupt(pci_get_bus(dev), pci_get_slot(dev),
 		pci_get_function(dev), pin));
 }
+#endif /* __rtems__ */
diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h b/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
index dad640c5..0e31d3ec 100644
--- a/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
+++ b/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
@@ -59,7 +59,8 @@
 	SYSINIT_DRIVER_REFERENCE(mmcsd, mmc)
 
 #define SYSINIT_NEED_PCIB \
-	SYSINIT_REFERENCE(p0init); \
+	SYSINIT_DRIVER_REFERENCE(legacy, nexus); \
+	SYSINIT_DRIVER_REFERENCE(pcib, legacy);  \
 	SYSINIT_DRIVER_REFERENCE(pci, pcib);
 
 #define SYSINIT_NEED_NET_IF_BFE \
diff --git a/rtemsbsd/src/rtems-bsd-pci_bus.c b/rtemsbsd/src/rtems-bsd-pci_bus.c
new file mode 100644
index 00000000..199acffc
--- /dev/null
+++ b/rtemsbsd/src/rtems-bsd-pci_bus.c
@@ -0,0 +1,71 @@
+#include <freebsd/machine/rtems-bsd-config.h>
+
+/**
+ * @file
+ *
+ * @ingroup rtems_bsd_rtems
+ *
+ * @brief This file contains methods that are rtems specific implementation
+ * of methods in pci_bus.c.
+ */
+
+/*
+ * COPYRIGHT (c) 2012. On-Line Applications Research Corporation (OAR).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <freebsd/sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <freebsd/local/opt_cpu.h>
+
+#include <freebsd/sys/param.h>
+#include <freebsd/sys/systm.h>
+#include <freebsd/sys/bus.h>
+#include <freebsd/sys/kernel.h>
+
+#include <freebsd/dev/pci/pcivar.h>
+#include <freebsd/dev/pci/pcireg.h>
+#include <freebsd/dev/pci/pcib_private.h>
+#include <freebsd/machine/pci_cfgreg.h>
+#include <freebsd/machine/resource.h>
+
+#include <freebsd/local/pcib_if.h>
+#include <rtems/pci.h>
+
+int
+pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
+{
+  int     bus;
+  int     slot;
+  int     func;
+  uint8_t irq;
+ 
+  bus  = pci_get_bus(dev);
+  slot = pci_get_slot(dev);
+  func = pci_get_function(dev);
+
+  pci_read_config_byte(bus, slot, func, PCI_INTERRUPT_LINE, &irq);
+  return irq;
+}
diff --git a/rtemsbsd/src/rtems-bsd-pci_cfgreg.c b/rtemsbsd/src/rtems-bsd-pci_cfgreg.c
new file mode 100644
index 00000000..5606219d
--- /dev/null
+++ b/rtemsbsd/src/rtems-bsd-pci_cfgreg.c
@@ -0,0 +1,116 @@
+#include <freebsd/machine/rtems-bsd-config.h>
+
+/**
+ * @file
+ *
+ * @ingroup rtems_bsd_rtems
+ *
+ * @brief This is the rtems version for the FreeBSD cpu specific
+ * file pci_cfgreg.c.  Please note that the Ether Express is not
+ * supported in this version.
+ */
+
+/*
+ * COPYRIGHT (c) 2012. On-Line Applications Research Corporation (OAR).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <freebsd/sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <freebsd/sys/param.h>
+#include <freebsd/sys/systm.h>
+#include <freebsd/sys/bus.h>
+#include <freebsd/sys/lock.h>
+#include <freebsd/sys/kernel.h>
+#include <freebsd/sys/malloc.h>
+#include <freebsd/sys/sysctl.h>
+#include <freebsd/dev/pci/pcivar.h>
+#include <freebsd/dev/pci/pcireg.h>
+#include <freebsd/machine/pci_cfgreg.h>
+
+#include <rtems/pci.h>
+
+
+/* 
+ * Initialise access to PCI configuration space 
+ */
+int
+pci_cfgregopen(void)
+{
+  return(1);
+}
+
+/* 
+ * Read configuration space register
+ */
+u_int32_t
+pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
+{
+  u_int32_t value;
+  uint8_t   v8;
+  uint16_t  v16;
+  uint32_t  v32;
+  int       data;
+
+  switch (bytes) {
+    case 1:
+      data = pci_read_config_byte( bus, slot, func, reg, &v8 );
+      value = v8;
+      break;
+    case 2:
+      data = pci_read_config_word( bus, slot, func, reg, &v16 );
+      value = v16;
+      break;
+    case 4:
+      data = pci_read_config_dword( bus, slot, func, reg, &v32 );
+      value = v32;
+      break;
+  }
+
+  return value;
+}
+
+/* 
+ * Write configuration space register 
+ */
+void
+pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes)
+{
+  uint8_t   v8  = data & 0xff;
+  uint16_t  v16 = data & 0xffff;
+  uint32_t  v32 = data;
+
+  switch (bytes) {
+    case 1:
+      pci_write_config_byte( bus, slot, func, reg, v8 );
+      break;
+    case 2:
+      pci_write_config_word( bus, slot, func, reg, v16 );
+      break;
+    case 4:
+      pci_write_config_dword( bus, slot, func, reg, v32 );
+      break;
+  }
+}
diff --git a/testsuite/link01/test.c b/testsuite/link01/test.c
index 8d1a0045..661fe1d5 100644
--- a/testsuite/link01/test.c
+++ b/testsuite/link01/test.c
@@ -47,52 +47,6 @@ rtems_task Init(
 
 #include <freebsd/machine/rtems-bsd-sysinit.h>
 
-/*
- *  User says I need XXX
- */
-#define CONFIGURE_NEED_NET
-#define CONFIGURE_NEED_PCIB
-#define CONFIGURE_NEED_NET_IF_FXP
-
-/*
- *  We "read" that and generate references and nexus devices
- */
-#if defined(CONFIGURE_NEED_NET)
-  SYSINIT_NEED_FREEBSD_CORE;
-#endif
-
-  SYSINIT_NEED_USB_CORE;
-#if defined(CONFIGURE_NEED_PCIB)
-  SYSINIT_NEED_PCIB;
-#endif
-
-#if defined(CONFIGURE_NEED_NET_IF_FXP)
-  SYSINIT_NEED_NET_IF_FXP;
-#endif
-#if defined(CONFIGURE_NEED_NET_IF_DC)
-  SYSINIT_NEED_NET_IF_DC;
-#endif
-
-#if 0
-SYSINIT_NEED_NET_IF_BFE;
-SYSINIT_NEED_NET_IF_RE;
-SYSINIT_NEED_NET_IF_EM;
-SYSINIT_NEED_NET_IF_IGB;
-SYSINIT_NEED_NET_IF_BCE;
-SYSINIT_NEED_NET_IF_LEM;
-
-SYSINIT_NEED_NET_IF_BGE; // does not link 23 May 2012
-#endif
-
-
-const char *const _bsd_nexus_devices [] = {
-	#if defined(CONFIGURE_NEED_PCIB)
-		"pcib",
-	#endif
-	#if defined(CONFIGURE_NEED_NET_IF_FXP)
-		"fxp",
-	#endif
-	NULL
-};
+#include "nic-sysinit.h"
 
 /* end of file */