summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>1999-08-13 08:55:58 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>1999-08-13 08:55:58 +0000
commitabb202c692e3c8dedbb4423ba0b33136edf81027 (patch)
tree2b5242b89f6ef668de6aa166263e9c2d8875c001 /sys/dev
parent8eafa877c0b64f0d9304f492468872a5a5ee95f2 (diff)
shorten dmesg output.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/ohci_pci.c4
-rw-r--r--sys/dev/usb/ohci.c14
2 files changed, 15 insertions, 3 deletions
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index 796ad8e0bb5..d339b1c8fc5 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci_pci.c,v 1.2 1999/08/13 08:09:26 fgsch Exp $ */
+/* $OpenBSD: ohci_pci.c,v 1.3 1999/08/13 08:55:57 fgsch Exp $ */
/* $NetBSD: ohci_pci.c,v 1.9 1999/05/20 09:52:35 augustss Exp $ */
/*
@@ -131,7 +131,7 @@ ohci_pci_attach(parent, self, aux)
printf("\n");
return;
}
- printf(": %s\n", intrstr);
+ printf(": %s", intrstr);
r = ohci_init(sc);
if (r != USBD_NORMAL_COMPLETION) {
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 50245dbac12..b92435c9176 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.1 1999/08/13 05:28:03 fgsch Exp $ */
+/* $OpenBSD: ohci.c,v 1.2 1999/08/13 08:55:57 fgsch Exp $ */
/* $NetBSD: ohci.c,v 1.33 1999/06/30 06:44:23 augustss Exp $ */
/*
@@ -354,13 +354,25 @@ ohci_init(sc)
DPRINTF(("ohci_init: start\n"));
rev = OREAD4(sc, OHCI_REVISION);
+#if defined(__OpenBSD__)
+ printf(", version %d.%d%s",
+#else
printf("%s: OHCI version %d.%d%s\n", USBDEVNAME(sc->sc_bus.bdev),
+#endif
OHCI_REV_HI(rev), OHCI_REV_LO(rev),
OHCI_REV_LEGACY(rev) ? ", legacy support" : "");
if (OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) {
+#if defined(__OpenBSD__)
+ printf(": unsupported\n");
+#else
printf("%s: unsupported OHCI revision\n",
USBDEVNAME(sc->sc_bus.bdev));
+#endif
return (USBD_INVAL);
+#if defined(__OpenBSD__)
+ } else {
+ printf("\n");
+#endif
}
for (i = 0; i < OHCI_HASH_SIZE; i++)