rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-14 07:15:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reduce divergence from FreeBSD sources

Browse Source
This commit is contained in:
Sebastian Huber
2013-11-06 09:35:05 +01:00
parent c4c34f3c45
commit 0a57e1db23
164 changed files with 693 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
freebsd/sys/sh/pci/pci_bus.c
View File

@@ -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);

2
freebsd/sys/sh/sh/legacy.c
View File

@@ -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