Module Name: src
Committed By: jmcneill
Date: Sun Aug 23 16:21:36 UTC 2009
Modified Files:
src/sys/dev/pci: pciide_common.c
Log Message:
Print device description on the same line as locators.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/pciide_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pciide_common.c
diff -u src/sys/dev/pci/pciide_common.c:1.41 src/sys/dev/pci/pciide_common.c:1.42
--- src/sys/dev/pci/pciide_common.c:1.41 Sun Mar 15 21:28:09 2009
+++ src/sys/dev/pci/pciide_common.c Sun Aug 23 16:21:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_common.c,v 1.41 2009/03/15 21:28:09 cegger Exp $ */
+/* $NetBSD: pciide_common.c,v 1.42 2009/08/23 16:21:36 jmcneill Exp $ */
/*
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.41 2009/03/15 21:28:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.42 2009/08/23 16:21:36 jmcneill Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -132,7 +132,6 @@
const char *displaydev;
aprint_naive(": disk controller\n");
- aprint_normal("\n");
sc->sc_pci_id = pa->pa_id;
if (pp == NULL) {
@@ -147,9 +146,10 @@
/* if displaydev == NULL, printf is done in chip-specific map */
if (displaydev)
- aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev,
- "%s (rev. 0x%02x)\n", displaydev,
+ aprint_normal(": %s (rev. 0x%02x)\n", displaydev,
PCI_REVISION(pa->pa_class));
+ else
+ aprint_normal("\n");
sc->sc_pc = pa->pa_pc;
sc->sc_tag = pa->pa_tag;
