d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed same as Julian did in uhci_pci.c and fixed the fetching of the revision ohci_pci.c; clean up

Browse Source
This commit is contained in:
n_hibma 1998-12-11 00:09:54 +00:00
parent 9fcdcd63a5
commit ae03a8f07d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/pci/ohci_pci.c
View File

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

4
sys/dev/pci/uhci_pci.c
View File

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