[src/trunk]: src/sys/dev/scsipi scsiprint() is needed even without scsibus'es...

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

details:   https://anonhg.NetBSD.org/src/rev/183b5f76cc39
branches:  trunk
changeset: 483758:183b5f76cc39
user:      soren <soren%NetBSD.org@localhost>
date:      Fri Mar 17 11:45:49 2000 +0000

description:
scsiprint() is needed even without scsibus'es, so move it to scsi_base.c .

diffstat:

 sys/dev/scsipi/scsi_base.c |  20 +++++++++++++++++++-
 sys/dev/scsipi/scsiconf.c  |  20 +-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diffs (65 lines):

diff -r 230bcb4be319 -r 183b5f76cc39 sys/dev/scsipi/scsi_base.c
--- a/sys/dev/scsipi/scsi_base.c        Fri Mar 17 11:30:14 2000 +0000
+++ b/sys/dev/scsipi/scsi_base.c        Fri Mar 17 11:45:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsi_base.c,v 1.71 2000/01/17 17:59:48 bouyer Exp $    */
+/*     $NetBSD: scsi_base.c,v 1.72 2000/03/17 11:45:50 soren Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -172,3 +172,21 @@
                scsipi_done(xs);
        }
 }
+
+int
+scsiprint(aux, pnp)
+       void *aux;
+       const char *pnp;
+{
+       struct scsipi_link *l = aux;
+
+       /* only "scsibus"es can attach to "scsi"s; easy. */
+       if (pnp)
+               printf("scsibus at %s", pnp);
+
+       /* don't print channel if the controller says there can be only one. */
+       if (l->scsipi_scsi.channel != SCSI_CHANNEL_ONLY_ONE)
+               printf(" channel %d", l->scsipi_scsi.channel);
+
+       return (UNCONF);
+}
diff -r 230bcb4be319 -r 183b5f76cc39 sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Fri Mar 17 11:30:14 2000 +0000
+++ b/sys/dev/scsipi/scsiconf.c Fri Mar 17 11:45:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.135 2000/03/13 09:56:26 martin Exp $    */
+/*     $NetBSD: scsiconf.c,v 1.136 2000/03/17 11:45:49 soren Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -119,24 +119,6 @@
 cdev_decl(scsibus);
 
 int
-scsiprint(aux, pnp)
-       void *aux;
-       const char *pnp;
-{
-       struct scsipi_link *l = aux;
-
-       /* only "scsibus"es can attach to "scsi"s; easy. */
-       if (pnp)
-               printf("scsibus at %s", pnp);
-
-       /* don't print channel if the controller says there can be only one. */
-       if (l->scsipi_scsi.channel != SCSI_CHANNEL_ONLY_ONE)
-               printf(" channel %d", l->scsipi_scsi.channel);
-
-       return (UNCONF);
-}
-
-int
 scsibusmatch(parent, cf, aux)
        struct device *parent;
        struct cfdata *cf;