diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 1998-12-11 00:09:54 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 1998-12-11 00:09:54 +0000 |
| commit | 8a1e798f6c4da3b904036deada61cda8ff34b6c1 (patch) | |
| tree | 1fb46343b947858a3d4662bc1871bb297dfc3179 /sys/dev/pci | |
| parent | 1e8cf44a58e1b5714fdefaceee0c27e5d8911044 (diff) | |
Notes
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/ohci_pci.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/uhci_pci.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index e1d973ba920c..76d5be42e42a 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -90,8 +90,6 @@ struct cfattach ohci_pci_ca = { }; #elif defined(__FreeBSD__) -#define PCI_INTERFACE_MASK 0x0000ff00 -#define PCI_INTERFACE_SHIFT 8 #define PCI_INTERFACE(d) (((d) >> 8) & 0xff) #define PCI_SUBCLASS(d) ((d) & PCI_SUBCLASS_MASK) #define PCI_CLASS(d) ((d) & PCI_CLASS_MASK) @@ -249,9 +247,10 @@ ohci_pci_attach(pcici_t config_id, int unit) if (bootverbose) #endif { - printf("usb%d: OHCI version %d%d, interrupting at %d\n", unit, /* XXX is this correct? Does the correct version show up? */ - (rev & 0xf0) >> 8, rev & 0x0f, + rev = inw(sc->sc_iobase+OHCI_REVISION); + printf("usb%d: OHCI version %d%d, interrupting at %d\n", unit, + OHCI_REV_HI(rev), OHCI_REV_LO(rev), (int)pci_conf_read(config_id,PCI_INTERRUPT_REG) & 0xff); } diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index 7fe405bc14af..cfca628398de 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -81,9 +81,7 @@ struct cfattach uhci_pci_ca = { #elif defined(__FreeBSD__) -#define PCI_INTERFACE_MASK 0x0000ff00 -#define PCI_INTERFACE_SHIFT 8 -#define PCI_INTERFACE(d) (((d)>>8)&PCI_INTERFACE_MASK) +#define PCI_INTERFACE(d) (((d)>>8)&0xff) #define PCI_SUBCLASS(d) ((d)&PCI_SUBCLASS_MASK) #define PCI_CLASS(d) ((d)&PCI_CLASS_MASK) |