diff options
| author | dfr <dfr@FreeBSD.org> | 2000-08-28 21:48:13 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2000-08-28 21:48:13 +0000 |
| commit | dd8b44b3958fa67d802cbbec7c7d82f7fb476229 (patch) | |
| tree | 61496c144b3ecd15192a2e07e755754e18346bc9 /sys/dev/pci/pcivar.h | |
| parent | 9ed8ded4d312c58a27de9402fd9802e78a591cb9 (diff) | |
| download | FreeBSD-src-dd8b44b3958fa67d802cbbec7c7d82f7fb476229.zip FreeBSD-src-dd8b44b3958fa67d802cbbec7c7d82f7fb476229.tar.gz | |
* Completely rewrite the alpha busspace to hide the implementation from
the drivers.
* Remove legacy inx/outx support from chipset and replace with macros
which call busspace.
* Rework pci config accesses to route through the pcib device instead of
calling a MD function directly.
With these changes it is possible to cleanly support machines which have
more than one independantly numbered PCI busses. As a bonus, the new
busspace implementation should be measurably faster than the old one.
Diffstat (limited to 'sys/dev/pci/pcivar.h')
| -rw-r--r-- | sys/dev/pci/pcivar.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index b767616..34df379 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -82,7 +82,6 @@ typedef struct pcicfg { u_int8_t mfdev; /* multi-function device (from hdrtype reg) */ u_int8_t nummaps; /* actual number of PCI maps used */ - u_int8_t hose; /* hose which bus is attached to */ u_int8_t bus; /* config space bus address */ u_int8_t slot; /* config space slot address */ u_int8_t func; /* config space function number */ @@ -156,6 +155,7 @@ const char *pci_chip_match(struct device *dev); int pci_cfgread (pcicfgregs *cfg, int reg, int bytes); void pci_cfgwrite (pcicfgregs *cfg, int reg, int data, int bytes); + #ifdef __alpha__ vm_offset_t pci_cvt_to_dense (vm_offset_t); vm_offset_t pci_cvt_to_bwx (vm_offset_t); @@ -192,7 +192,6 @@ enum pci_device_ivars { PCI_IVAR_FUNCTION, PCI_IVAR_SECONDARYBUS, PCI_IVAR_SUBORDINATEBUS, - PCI_IVAR_HOSE, }; /* @@ -229,7 +228,6 @@ PCI_ACCESSOR(slot, SLOT, u_int8_t) PCI_ACCESSOR(function, FUNCTION, u_int8_t) PCI_ACCESSOR(secondarybus, SECONDARYBUS, u_int8_t) PCI_ACCESSOR(subordinatebus, SUBORDINATEBUS, u_int8_t) -PCI_ACCESSOR(hose, HOSE, u_int32_t) static __inline u_int32_t pci_read_config(device_t dev, int reg, int width) @@ -249,7 +247,7 @@ pci_write_config(device_t dev, int reg, u_int32_t val, int width) /*typedef enum pci_device_ivars pcib_device_ivars;*/ enum pcib_device_ivars { - PCIB_IVAR_HOSE, + PCIB_IVAR_BUS }; #define PCIB_ACCESSOR(A, B, T) \ @@ -267,7 +265,7 @@ static __inline void pcib_set_ ## A(device_t dev, T t) \ BUS_WRITE_IVAR(device_get_parent(dev), dev, PCIB_IVAR_ ## B, v); \ } -PCIB_ACCESSOR(hose, HOSE, u_int32_t) +PCIB_ACCESSOR(bus, BUS, u_int32_t) #endif |
