diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 1999-01-07 23:01:11 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 1999-01-07 23:01:11 +0000 |
| commit | a1aa3832a4d49f1bf68445735b317bce8de3707c (patch) | |
| tree | fffcfce6d3df63a80c3ec01c46fff629377cdb39 | |
| parent | 002ad23e7a033e54cd1c885cd5b9b5f4db76c5ce (diff) | |
Notes
| -rw-r--r-- | sys/dev/pci/ohci_pci.c | 19 | ||||
| -rw-r--r-- | sys/dev/pci/uhci_pci.c | 6 |
2 files changed, 7 insertions, 18 deletions
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index 032281ba8883..9ab678b176d2 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -1,4 +1,4 @@ -/* FreeBSD $Id: ohci_pci.c,v 1.7 1999/01/06 12:31:28 n_hibma Exp $ */ +/* FreeBSD $Id: ohci_pci.c,v 1.8 1999/01/06 19:55:49 n_hibma Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -148,28 +148,17 @@ ohci_pci_attach(pcici_t config_id, int unit) if(!pci_map_mem(config_id, PCI_CBMEM, (vm_offset_t *)&sc->sc_iobase, &pbase)) { - printf("usb%d: couldn't map memory\n", unit); + printf("usb%d: could not map memory\n", unit); return; } sc->unit = unit; if ( !pci_map_int(config_id, (pci_inthand_t *)ohci_intr, (void *) sc, &bio_imask)) { - printf("usb%d: Unable to map irq\n", unit); + printf("usb%d: could not map irq\n", unit); return; } -#ifndef USBVERBOSE - if (bootverbose) -#endif - { - /* XXX is this correct? Does the correct version show up? */ - rev = *((unsigned int *)(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); - } - /* Figure out vendor for root hub descriptor. */ id = pci_conf_read(config_id, PCI_ID_REG); if (PCI_VENDOR(id) == PCI_OHCI_VENDORID_ALI) @@ -197,7 +186,7 @@ ohci_pci_attach(pcici_t config_id, int unit) */ sc->sc_bus.bdev = device_add_child(root_bus, "usb", unit, sc); if (!sc->sc_bus.bdev) { - printf("%s%d: unable to add USB device to root bus\n", + printf("%s%d: could not add USB device to root bus\n", device_get_name(sc->sc_bus.bdev), device_get_unit(sc->sc_bus.bdev)); return; diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index b21fad92deee..083540f4b792 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* FreeBSD $Id: uhci_pci.c,v 1.6 1999/01/06 12:31:28 n_hibma Exp $ */ +/* FreeBSD $Id: uhci_pci.c,v 1.7 1999/01/06 19:55:49 n_hibma Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -146,7 +146,7 @@ uhci_pci_attach(pcici_t config_id, int unit) if ( !pci_map_int(config_id, (pci_inthand_t *)uhci_intr, (void *) sc, &bio_imask)) { - printf("usb%d: Unable to map irq\n", unit); + printf("usb%d: could not map irq\n", unit); return; } @@ -193,7 +193,7 @@ uhci_pci_attach(pcici_t config_id, int unit) */ sc->sc_bus.bdev = device_add_child(root_bus, "usb", unit, sc); if (!sc->sc_bus.bdev) { - printf("%s%d: unable to add USB device to root bus\n", + printf("%s%d: could not add USB device to root bus\n", device_get_name(sc->sc_bus.bdev), device_get_unit(sc->sc_bus.bdev)); return; |