30c30
< * $FreeBSD: head/sys/dev/pci/pci_pci.c 94573 2002-04-13 05:52:35Z imp $
---
> * $FreeBSD: head/sys/dev/pci/pci_pci.c 102441 2002-08-26 15:57:08Z jhb $
45a46
> #include <pci/pcib_private.h>
50,69d50
< /*
< * Bridge-specific data.
< */
< struct pcib_softc
< {
< device_t dev;
< u_int16_t command; /* command register */
< u_int8_t secbus; /* secondary bus number */
< u_int8_t subbus; /* subordinate bus number */
< pci_addr_t pmembase; /* base address of prefetchable memory */
< pci_addr_t pmemlimit; /* topmost address of prefetchable memory */
< pci_addr_t membase; /* base address of memory window */
< pci_addr_t memlimit; /* topmost address of memory window */
< u_int32_t iobase; /* base address of port window */
< u_int32_t iolimit; /* topmost address of port window */
< u_int16_t secstat; /* secondary bus status register */
< u_int16_t bridgectl; /* bridge control register */
< u_int8_t seclat; /* secondary bus latency timer */
< };
<
72,78d52
< static int pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result);
< static int pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value);
< static struct resource *pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
< u_long start, u_long end, u_long count, u_int flags);
< static int pcib_maxslots(device_t dev);
< static u_int32_t pcib_read_config(device_t dev, int b, int s, int f, int reg, int width);
< static void pcib_write_config(device_t dev, int b, int s, int f, int reg, u_int32_t val, int width);
115c89
< static devclass_t pcib_devclass;
---
> devclass_t pcib_devclass;
133,134c107,108
< static int
< pcib_attach(device_t dev)
---
> void
> pcib_attach_common(device_t dev)
137d110
< device_t child;
221a195
> }
222a197,204
> static int
> pcib_attach(device_t dev)
> {
> struct pcib_softc *sc;
> device_t child;
>
> pcib_attach_common(dev);
> sc = device_get_softc(dev);
233c215
< static int
---
> int
246c228
< static int
---
> int
287c269
< static struct resource *
---
> struct resource *
396c378
< static int
---
> int
405c387
< static u_int32_t
---
> u_int32_t
411c393
< static void
---
> void