diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 1999-03-23 21:35:57 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 1999-03-23 21:35:57 +0000 |
| commit | 19a0bccc49b8e77cfdc7ff4d5f6ec9c3c58c29b2 (patch) | |
| tree | 05e84b1828e75a1d7ff8aeac0f2974b3db91736a /sys | |
| parent | 11ad9ec0faf05fe2db5754c0da78e7c406f671dc (diff) | |
| download | FreeBSD-src-19a0bccc49b8e77cfdc7ff4d5f6ec9c3c58c29b2.zip FreeBSD-src-19a0bccc49b8e77cfdc7ff4d5f6ec9c3c58c29b2.tar.gz | |
1) clean up debugging output
2) remove erroneous querying of PCI LegSup register while it should be
fetched from PCI config space
3) change name of define for this register
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/uhci.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/uhcireg.h | 5 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index fe08096..7506d9f 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -306,11 +306,6 @@ uhci_init(sc) LIST_INIT(&uhci_ii_free); } -#if defined(USB_DEBUG) - if (uhcidebug > 2) - uhci_dumpregs(sc); -#endif - uhci_run(sc, 0); /* stop the controller */ UWRITE2(sc, UHCI_INTR, 0); /* disable interrupts */ @@ -392,8 +387,7 @@ uhci_dumpregs(sc) uhci_softc_t *sc; { printf("%s: regs: cmd=%04x, sts=%04x, intr=%04x, frnum=%04x, " - "flbase=%08x, sof=%02x, portsc1=%04x, portsc2=%04x, " - "legsup=%04x\n", + "flbase=%08x, sof=%02x, portsc1=%04x, portsc2=%04x, ", USBDEVNAME(sc->sc_bus.bdev), UREAD2(sc, UHCI_CMD), UREAD2(sc, UHCI_STS), @@ -402,8 +396,7 @@ uhci_dumpregs(sc) UREAD4(sc, UHCI_FLBASEADDR), UREAD1(sc, UHCI_SOF), UREAD2(sc, UHCI_PORTSC1), - UREAD2(sc, UHCI_PORTSC2), - UREAD2(sc, UHCI_LEGSUP)); + UREAD2(sc, UHCI_PORTSC2)); } int uhci_longtd = 1; @@ -412,7 +405,7 @@ void uhci_dump_td(p) uhci_soft_td_t *p; { - printf("TD(%p) at %08lx = 0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", + printf("TD(%p) at %08lx link=0x%08lx st=0x%08lx tok=0x%08lx buf=0x%08lx\n", p, (long)p->physaddr, (long)p->td->td_link, (long)p->td->td_status, diff --git a/sys/dev/usb/uhcireg.h b/sys/dev/usb/uhcireg.h index 08983b2..d5daa08 100644 --- a/sys/dev/usb/uhcireg.h +++ b/sys/dev/usb/uhcireg.h @@ -48,6 +48,9 @@ #define PCI_USBREV_PRE_1_0 0x00 #define PCI_USBREV_1_0 0x10 +#define PCI_LEGSUP 0xc0 /* Legacy Support register */ +#define PCI_LEGSUP_USBPIRQDEN 0x2000 /* USB PIRQ D Enable */ + #define PCI_CBIO 0x20 /* configuration base IO */ #define PCI_INTERFACE_UHCI 0x00 @@ -102,8 +105,6 @@ #define UHCI_PORTSC_OCIC 0x0800 #define UHCI_PORTSC_SUSP 0x1000 -#define UHCI_LEGSUP 0xc0 - #define UHCI_FRAMELIST_COUNT 1024 #define UHCI_FRAMELIST_ALIGN 4096 |
