Changeset fb4c8a9 in rtems-libbsd

Timestamp:

05/23/12 19:53:12 (11 years ago)

Author:

Jennifer Averett <jennifer.averett@…>

Branches:

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

Children:

b9fa3c9

Parents:

ae53d9e

Message:

Added pcib for Nics.

Files:

• Makefile (modified) (3 diffs)
• freebsd-to-rtems.py (modified) (4 diffs)
• freebsd/dev/pci/pci.c (modified) (12 diffs)
• freebsd/dev/pci/pci_user.c (added)
• freebsd/dev/pci/pcivar.h (modified) (1 diff)
• freebsd/i386/include/freebsd/machine/intr_machdep.h (added)
• freebsd/kern/kern_prot.c (modified) (2 diffs)
• freebsd/kern/subr_bus.c (modified) (6 diffs)
• freebsd/kern/subr_module.c (added)
• libbsd.txt (modified) (3 diffs)
• rtemsbsd/src/rtems-bsd-conf.c (added)
• rtemsbsd/src/rtems-bsd-subr_param.c (added)

Makefile

@@ -57 +57 @@
 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 += freebsd/kern/subr_eventhandler.c
 C_FILES += freebsd/kern/kern_subr.c
@@ -366 +368 @@
 C_FILES += freebsd/kern/subr_sbuf.c
 C_FILES += freebsd/kern/subr_rman.c
+C_FILES += freebsd/kern/subr_module.c
 C_FILES += freebsd/libkern/inet_ntoa.c
 C_FILES += freebsd/kern/kern_prot.c
@@ -372 +375 @@
 C_FILES += freebsd/netinet/tcp_hostcache.c
 C_FILES += freebsd/dev/pci/pci.c
+C_FILES += freebsd/dev/pci/pci_user.c
 C_FILES += freebsd/kern/uipc_accf.c
 C_FILES += freebsd/kern/kern_ntptime.c

freebsd-to-rtems.py

@@ -552 +552 @@
                 'src/rtems-bsd-copyinout.c',
                 'src/rtems-bsd-descrip.c',
+                'src/rtems-bsd-conf.c',
+                'src/rtems-bsd-subr_param.c',
         ]
 )
@@ -1203 +1205 @@
                 'i386/include/specialreg.h',
                 'i386/include/md_var.h',
+                'i386/include/intr_machdep.h',
         ]
 )
@@ -1216 +1219 @@
                 'kern/subr_sbuf.c',
                 'kern/subr_rman.c',
+                'kern/subr_module.c',
                 'libkern/inet_ntoa.c',
                 'kern/kern_prot.c',
@@ -1222 +1226 @@
                 'netinet/tcp_hostcache.c',
                 'dev/pci/pci.c',
+                'dev/pci/pci_user.c',
                 'kern/uipc_accf.c',
                 'kern/kern_ntptime.c',

freebsd/dev/pci/pci.c

@@ -58 +58 @@
 #include <freebsd/machine/stdarg.h>
 
-#ifndef __rtems__
 #if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
 #include <freebsd/machine/intr_machdep.h>
 #endif
-#endif /* __rtems__ */
 
 #include <freebsd/sys/pciio.h>
 #include <freebsd/dev/pci/pcireg.h>
 #include <freebsd/dev/pci/pcivar.h>
-#ifndef __rtems__
 #include <freebsd/dev/pci/pci_private.h>
 
 #include <freebsd/dev/usb/controller/ehcireg.h>
 #include <freebsd/dev/usb/controller/ohcireg.h>
+#ifndef __rtems__
 #include <freebsd/dev/usb/controller/uhcireg.h>
+#endif /* __rtems__ */
 
 #include <freebsd/local/pcib_if.h>
@@ -83 +82 @@
 #define ACPI_PWR_FOR_SLEEP(x, y, z)
 #endif
-#endif /* __rtems__ */
-
-#ifndef __rtems__
+
 static pci_addr_t       pci_mapbase(uint64_t mapreg);
 static const char       *pci_maptype(uint64_t mapreg);
@@ -333 +330 @@
 }
 
+#ifndef __rtems__
 /* Find a device_t by vendor/device ID */
 
@@ -349 +347 @@
         return (NULL);
 }
+#endif /* __rtems__ */
 
 static int
@@ -1615 +1614 @@
         }
 }
-#endif /* __rtems__ */
 
 int
@@ -1651 +1649 @@
 }
 
-#ifndef __rtems__
 /*
  * Support for MSI message signalled interrupts.
@@ -2626 +2623 @@
         /* Let the user override the IRQ with a tunable. */
         irq = PCI_INVALID_IRQ;
+#ifndef __rtems__
         snprintf(tunable_name, sizeof(tunable_name),
             "hw.pci%d.%d.%d.INT%c.irq",
@@ -2631 +2629 @@
         if (TUNABLE_INT_FETCH(tunable_name, &irq) && (irq >= 255 || irq <= 0))
                 irq = PCI_INVALID_IRQ;
+#endif /* __rtems__ */
 
         /*
@@ -2697 +2696 @@
 }
 
+#ifndef __rtems__
 /* Perform early UHCI takeover from SMM. */
 static void
@@ -2720 +2720 @@
         }
 }
+#endif /* __rtems__ */
 
 /* Perform early EHCI takeover from SMM. */
@@ -2827 +2828 @@
                 else if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_OHCI)
                         ohci_early_takeover(dev);
+#ifndef __rtems__
                 else if (pci_get_progif(dev) == PCIP_SERIALBUS_USB_UHCI)
                         uhci_early_takeover(dev);
+#endif /* __rtems__ */
         }
 }
@@ -4115 +4118 @@
                 pci_set_powerstate(dev, PCI_POWERSTATE_D3);
 }
-#endif /* __rtems__ */

freebsd/dev/pci/pcivar.h

@@ -447 +447 @@
 device_t pci_find_bsf(uint8_t, uint8_t, uint8_t);
 device_t pci_find_dbsf(uint32_t, uint8_t, uint8_t, uint8_t);
+#ifndef __rtems__
 device_t pci_find_device(uint16_t, uint16_t);
+#endif /* __rtems__ */
 
 /* Can be used by drivers to manage the MSI-X table. */

freebsd/kern/kern_prot.c

@@ -1287 +1287 @@
 }
 
-#ifndef __rtems__
 /*
  * Test the active securelevel against a given level.  securelevel_gt()
@@ -1314 +1313 @@
         return (cr->cr_prison->pr_securelevel >= level ? EPERM : 0);
 }
-
-#endif /* __rtems__ */
 
 /*

freebsd/kern/subr_bus.c

@@ -2862 +2862 @@
 }
 
-#ifndef __rtems__
 /*======================================*/
 /*
@@ -3194 +3193 @@
         }
 }
-#endif /* __rtems__ */
 
 device_t
@@ -3519 +3517 @@
 }
 
-#ifndef __rtems__
 /**
  * @brief Helper function for implementing BUS_ALLOC_RESOURCE().
@@ -3587 +3584 @@
         return (EINVAL);
 }
-#endif /* __rtems__ */
 
 /**
@@ -3657 +3653 @@
 }
 
-#ifndef __rtems__
 /**
  * @brief Helper function for implementing BUS_GET_RESOURCE().
@@ -3774 +3769 @@
             start, end, count, flags));
 }
-#endif /* __rtems__ */
 
 /**

libbsd.txt

@@ -555 +555 @@
 are only used by the Nic test are the most suspect.
 
+[listing]
+----
 rtems-libbsd File:      rtems-bsd-assert.c
 FreeBSD File:           rtems-bsd-config.h redefines BSD_ASSERT.
@@ -738 +740 @@
 Description:            
 Status:                 USB, Nic 
-
+----
+
+== Notes by File ==
+
+altq_subr.c - Arbitrary choices were made in this file that RTEMS would
+not support tsc frequency change.  Additionally, the clock frequency
+for machclk_freq is always measured for RTEMS.
+
+conf.h - In order to add make_dev and destroy_dev, variables in the cdev
+structure that were not being used were conditionally compiled out. The
+capability of supporting children did not appear to be needed and was
+not implemented in the rtems version of these routines.
+ 
 == NICs Status ==
 
+[listing]
+----
 Driver                  Symbol                          Status
 ======                  ======                          ======
@@ -749 +765 @@
 Broadcom BCM4401        _bsd_bfe_pcimodule_sys_init     Links
 Broadcom BCM570x        _bsd_bge_pcimodule_sys_init     Needs Symbols (A)
-E1000 xxx               _bsd_igb_pcimodule_sys_init     Needs Symbols (B)       
-E1000 XXX               _bsd_em_pcimodule_sys_init      Needs Symbols (B)
+E1000 IGB               _bsd_igb_pcimodule_sys_init     Links
+E1000 EM                _bsd_em_pcimodule_sys_init      Links
+----
 
 
 Symbols (A)
-         pci_find_dbsf
          pci_get_vpd_ident
-Symbols (B)
-        make_dev()
-        destroy_dev()