Changeset 3cde755 in rtems-libbsd

Timestamp:

05/30/12 16:51:35 (11 years ago)

Author:

Jennifer Averett <jennifer.averett@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

9f11e40

Parents:

20b5ca1

Message:

Corrected link01 configuration and added pcib to SYSINIT.

Files:

• rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h (modified) (1 diff)
• testsuite/link01/test.c (modified) (2 diffs)

rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h

@@ -60 +60 @@
 
 #define SYSINIT_NEED_PCIB \
+        SYSINIT_REFERENCE(p0init); \
         SYSINIT_DRIVER_REFERENCE(pci, pcib);
 

testsuite/link01/test.c

@@ -30 +30 @@
 
 /* NOTICE: the clock driver is explicitly disabled */
-#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
+#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32
+
+#define CONFIGURE_UNLIMITED_OBJECTS
+#define CONFIGURE_UNIFIED_WORK_AREAS
+
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_MAXIMUM_TASKS 1
 
 #define CONFIGURE_INIT
@@ -41 +48 @@
 #include <freebsd/machine/rtems-bsd-sysinit.h>
 
-SYSINIT_NEED_FREEBSD_CORE;
+/*
+ *  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_BCE;
-SYSINIT_NEED_NET_IF_BGE;
-SYSINIT_NEED_NET_IF_FXP;
-SYSINIT_NEED_NET_IF_DC;
+
+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
 };