[src/trunk]: src/sys/dev/pci suggestion from Jason: have (in non-verbose boot...

[mjacob <mjacob%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f768897dc580
branches:  trunk
changeset: 526232:f768897dc580
user:      mjacob <mjacob%NetBSD.org@localhost>
date:      Sun Apr 28 21:32:14 2002 +0000

description:
suggestion from Jason: have (in non-verbose boot case) card type printed out
on same line as attachment line.

diffstat:

 sys/dev/pci/isp_pci.c |  29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diffs (131 lines):

diff -r 330609c63f83 -r f768897dc580 sys/dev/pci/isp_pci.c
--- a/sys/dev/pci/isp_pci.c     Sun Apr 28 20:23:21 2002 +0000
+++ b/sys/dev/pci/isp_pci.c     Sun Apr 28 21:32:14 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_pci.c,v 1.77 2002/03/22 02:34:05 mjacob Exp $ */
+/* $NetBSD: isp_pci.c,v 1.78 2002/04/28 21:32:14 mjacob Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.77 2002/03/22 02:34:05 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.78 2002/04/28 21:32:14 mjacob Exp $");
 
 #include <dev/ic/isp_netbsd.h>
 #include <dev/pci/pcireg.h>
@@ -360,7 +360,7 @@
 #ifdef DEBUG
        static char oneshot = 1;
 #endif
-       static const char nomem[] = "%s: no mem for sdparam table\n";
+       static const char nomem[] = "\n%s: no mem for sdparam table\n";
        u_int32_t data, rev, linesz = PCI_DFLT_LNSZ;
        struct pci_attach_args *pa = aux;
        struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) self;
@@ -368,6 +368,7 @@
        bus_space_tag_t st, iot, memt;
        bus_space_handle_t sh, ioh, memh;
        pci_intr_handle_t ih;
+       char *dstring;
        const char *intrstr;
        int ioh_valid, memh_valid;
 
@@ -387,7 +388,7 @@
                printf(": unable to map device registers\n");
                return;
        }
-       printf("\n");
+       dstring = "\n";
 
        pcs->pci_st = st;
        pcs->pci_sh = sh;
@@ -402,6 +403,7 @@
 
 #ifndef        ISP_DISABLE_1020_SUPPORT
        if (pa->pa_id == PCI_QLOGIC_ISP) {
+               dstring = ": QLogic 1020 Ultra Wide SCSI HBA\n";
                isp->isp_mdvec = &mdvec;
                isp->isp_type = ISP_HA_SCSI_UNKNOWN;
                isp->isp_param = malloc(sizeof (sdparam), M_DEVBUF, M_NOWAIT);
@@ -414,6 +416,7 @@
 #endif
 #ifndef        ISP_DISABLE_1080_SUPPORT
        if (pa->pa_id == PCI_QLOGIC_ISP1080) {
+               dstring = ": QLogic 1080 Ultra-2 Wide SCSI HBA\n";
                isp->isp_mdvec = &mdvec_1080;
                isp->isp_type = ISP_HA_SCSI_1080;
                isp->isp_param = malloc(sizeof (sdparam), M_DEVBUF, M_NOWAIT);
@@ -426,6 +429,7 @@
                    ISP1080_DMA_REGS_OFF;
        }
        if (pa->pa_id == PCI_QLOGIC_ISP1240) {
+               dstring = ": QLogic Dual Channel Ultra Wide SCSI HBA\n";
                isp->isp_mdvec = &mdvec_1080;
                isp->isp_type = ISP_HA_SCSI_1240;
                isp->isp_param =
@@ -439,6 +443,7 @@
                    ISP1080_DMA_REGS_OFF;
        }
        if (pa->pa_id == PCI_QLOGIC_ISP1280) {
+               dstring = ": QLogic Dual Channel Ultra-2 Wide SCSI HBA\n";
                isp->isp_mdvec = &mdvec_1080;
                isp->isp_type = ISP_HA_SCSI_1280;
                isp->isp_param =
@@ -454,6 +459,7 @@
 #endif
 #ifndef        ISP_DISABLE_12160_SUPPORT
        if (pa->pa_id == PCI_QLOGIC_ISP12160) {
+               dstring = ": QLogic Dual Channel Ultra-3 Wide SCSI HBA\n";
                isp->isp_mdvec = &mdvec_12160;
                isp->isp_type = ISP_HA_SCSI_12160;
                isp->isp_param =
@@ -469,6 +475,7 @@
 #endif
 #ifndef        ISP_DISABLE_2100_SUPPORT
        if (pa->pa_id == PCI_QLOGIC_ISP2100) {
+               dstring = ": QLogic FC-AL HBA\n";
                isp->isp_mdvec = &mdvec_2100;
                isp->isp_type = ISP_HA_FC_2100;
                isp->isp_param = malloc(sizeof (fcparam), M_DEVBUF, M_NOWAIT);
@@ -492,6 +499,7 @@
 #endif
 #ifndef        ISP_DISABLE_2200_SUPPORT
        if (pa->pa_id == PCI_QLOGIC_ISP2200) {
+               dstring = ": QLogic FC-AL and Fabric HBA\n";
                isp->isp_mdvec = &mdvec_2200;
                isp->isp_type = ISP_HA_FC_2200;
                isp->isp_param = malloc(sizeof (fcparam), M_DEVBUF, M_NOWAIT);
@@ -510,8 +518,11 @@
            pa->pa_id == PCI_QLOGIC_ISP2312) {
                isp->isp_mdvec = &mdvec_2300;
                if (pa->pa_id == PCI_QLOGIC_ISP2300) {
+                       dstring = ": QLogic FC-AL and 2Gbps Fabric HBA\n";
                        isp->isp_type = ISP_HA_FC_2300;
                } else {
+                       dstring =
+                           ": QLogic Dual Port FC-AL and 2Gbps Fabric HBA\n";
                        isp->isp_type = ISP_HA_FC_2312;
                        isp->isp_port = pa->pa_function;
                }
@@ -536,12 +547,14 @@
        if (bootverbose)
                isp->isp_dblev |= ISP_LOGCONFIG|ISP_LOGINFO;
 #ifdef SCSIDEBUG
-       isp->isp_dblev |= ISP_LOGDEBUG1|ISP_LOGDEBUG2;
-#endif
-#ifdef DEBUG
-       isp->isp_dblev |= ISP_LOGDEBUG0;
+       isp->isp_dblev |= ISP_LOGDEBUG0|ISP_LOGDEBUG1|ISP_LOGDEBUG2;
 #endif
 #endif
+       if (isp->isp_dblev & ISP_LOGCONFIG) {
+               printf("\n");
+       } else {
+               printf(dstring);
+       }
 
 #ifdef DEBUG
        if (oneshot) {