diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-11-06 09:35:05 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-11-11 10:08:06 +0100 |
| commit | 0a57e1db23218393483a356c07868413a45caeeb (patch) | |
| tree | a2d1dd67f5b05a52b1f79f571c690ebcf299d775 /freebsd/sys/i386 | |
| parent | Change license to BSD (diff) | |
| download | rtems-libbsd-0a57e1db23218393483a356c07868413a45caeeb.tar.bz2 | |
Reduce divergence from FreeBSD sources
Diffstat (limited to 'freebsd/sys/i386')
| -rw-r--r-- | freebsd/sys/i386/i386/legacy.c | 2 | ||||
| -rw-r--r-- | freebsd/sys/i386/include/machine/intr_machdep.h | 6 | ||||
| -rw-r--r-- | freebsd/sys/i386/pci/pci_bus.c | 8 |
3 files changed, 3 insertions, 13 deletions
diff --git a/freebsd/sys/i386/i386/legacy.c b/freebsd/sys/i386/i386/legacy.c index d2b0a78a..c81ccc5e 100644 --- a/freebsd/sys/i386/i386/legacy.c +++ b/freebsd/sys/i386/i386/legacy.c @@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <sys/smp.h> -#ifndef __rtems__ #include <rtems/bsd/local/opt_mca.h> -#endif /* __rtems__ */ #ifdef DEV_MCA #include <i386/bios/mca_machdep.h> #endif diff --git a/freebsd/sys/i386/include/machine/intr_machdep.h b/freebsd/sys/i386/include/machine/intr_machdep.h index fc490b35..535fcf8f 100644 --- a/freebsd/sys/i386/include/machine/intr_machdep.h +++ b/freebsd/sys/i386/include/machine/intr_machdep.h @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#ifndef __MACHINE_INTR_MACHDEP_HH__ -#define __MACHINE_INTR_MACHDEP_HH__ +#ifndef __MACHINE_INTR_MACHDEP_H__ +#define __MACHINE_INTR_MACHDEP_H__ #ifdef _KERNEL @@ -158,4 +158,4 @@ int msix_release(int irq); #endif /* !LOCORE */ #endif /* _KERNEL */ -#endif /* !__MACHINE_INTR_MACHDEP_HH__ */ +#endif /* !__MACHINE_INTR_MACHDEP_H__ */ diff --git a/freebsd/sys/i386/pci/pci_bus.c b/freebsd/sys/i386/pci/pci_bus.c index 53446262..ad0342ec 100644 --- a/freebsd/sys/i386/pci/pci_bus.c +++ b/freebsd/sys/i386/pci/pci_bus.c @@ -60,7 +60,6 @@ static int pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin); #endif /* __rtems__ */ - int legacy_pcib_maxslots(device_t dev) { @@ -69,15 +68,9 @@ legacy_pcib_maxslots(device_t dev) /* read configuration space register */ -#ifdef __rtems__ -uint32_t -legacy_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func, - u_int reg, int bytes) -#else u_int32_t legacy_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) -#endif { return(pci_cfgregread(bus, slot, func, reg, bytes)); } @@ -514,7 +507,6 @@ legacy_pcib_attach(device_t dev) if (pir != NULL) device_probe_and_attach(pir); } -#else /* __rtems__ */ #endif /* __rtems__ */ device_add_child(dev, "pci", bus); return bus_generic_attach(dev); |