summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2008-04-24 14:51:13 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2008-04-24 14:51:13 +0000
commita04ad4e37b5d32f5ef17070004eb2a05cf460149 (patch)
tree536c812cb17946189cbf3fce4f825a86fbea4679 /sys
parent5264b88bb1f761642b14a68867ced1c8e3ab97dc (diff)
Say 'ATAPI' rather than 'SCSIn' for ATAPI devices found on (pseudo)
SCSI buses like atapiscsi. This more accurately describes the commands that will be used on the device. ok dlg@
Diffstat (limited to 'sys')
-rw-r--r--sys/scsi/scsiconf.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 39d01bdfc97..5cd909e7789 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.129 2007/11/26 15:40:51 dlg Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.130 2008/04/24 14:51:12 krw Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -681,10 +681,14 @@ scsibusprint(void *aux, const char *pnp)
scsi_strvis(product, inqbuf->product, 16);
scsi_strvis(revision, inqbuf->revision, 4);
- printf(" targ %d lun %d: <%s, %s, %s> SCSI%d %d/%s %s%s",
- target, lun, vendor, product, revision,
- SCSISPC(inqbuf->version), type, dtype,
- removable ? "removable" : "fixed", qtype);
+ printf(" targ %d lun %d: <%s, %s, %s> ", target, lun, vendor, product,
+ revision);
+ if (sa->sa_sc_link->flags & SDEV_ATAPI)
+ printf("ATAPI");
+ else
+ printf("SCSI%d", SCSISPC(inqbuf->version));
+ printf(" %d/%s %s%s", type, dtype, removable ? "removable" : "fixed",
+ qtype);
return (UNCONF);
}