Added scsiprint from NetBSD, needed by new driver for VAX. -moj

2 files changed, 23 insertions, 2 deletions

diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index d308fd0ec53..164ea3440d5 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.c,v 1.20 1997/01/15 05:50:27 deraadt Exp $	*/
+/*	$OpenBSD: scsiconf.c,v 1.21 1997/01/16 14:23:32 maja Exp $	*/
 /*	$NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $	*/
 
 /*
@@ -103,6 +103,25 @@ int scsidebug_level = SCSIDEBUG_LEVEL;
 int scsibusprint __P((void *, const char *));
 
 int
+scsiprint(aux, pnp)
+	void *aux;
+	const char *pnp;
+{
+	struct scsi_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. */
+#ifdef 0
+	if (l->channel != SCSI_CHANNEL_ONLY_ONE)
+		printf(" channel %d", l->channel);
+#endif
+	return (UNCONF);
+}
+
+int
 scsibusmatch(parent, match, aux)
         struct device *parent;
         void *match, *aux;
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 4e00d0b5383..2804581ab98 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.h,v 1.9 1997/01/15 05:50:29 deraadt Exp $	*/
+/*	$OpenBSD: scsiconf.h,v 1.10 1997/01/16 14:23:33 maja Exp $	*/
 /*	$NetBSD: scsiconf.h,v 1.29 1996/03/19 03:07:50 mycroft Exp $	*/
 
 /*
@@ -162,6 +162,8 @@ struct scsi_link {
 	void	*adapter_softc;		/* needed for call to foo_scsi_cmd */
 };
 
+int	scsiprint __P((void *, const char *));
+
 /*
  * This describes matching information for scsi_inqmatch().  The more things
  * match, the higher the configuration priority.