diff options
| author | amurai <amurai@FreeBSD.org> | 1995-06-14 12:28:32 +0000 |
|---|---|---|
| committer | amurai <amurai@FreeBSD.org> | 1995-06-14 12:28:32 +0000 |
| commit | 32d43dca1c6ceaecf06c22cd39a62a4502c0a0e9 (patch) | |
| tree | f45707e735fddb41b751831bec208c69e5f05937 /sys/scsi | |
| parent | 909b527c19133d6ced3b877bb3277396b00696ae (diff) | |
| download | FreeBSD-src-32d43dca1c6ceaecf06c22cd39a62a4502c0a0e9.zip FreeBSD-src-32d43dca1c6ceaecf06c22cd39a62a4502c0a0e9.tar.gz | |
Bestmatch check for cd-drive always faild due to additional space
on manufacture and other items. So it's never probe as MORE_LUNS
after frist SONY entry....
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/scsiconf.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index d1771f8..b5d670b 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -16,7 +16,7 @@ * * New configuration setup: dufault@hda.com * - * $Id: scsiconf.c,v 1.29 1995/05/03 18:09:13 dufault Exp $ + * $Id: scsiconf.c,v 1.30 1995/05/30 08:13:45 rgrimes Exp $ */ #include <sys/types.h> @@ -261,13 +261,21 @@ static struct scsidevs knowndevs[] = #if NCD > 0 #ifndef UKTEST /* make cdroms unrecognised to test the uk driver */ { - T_READONLY, T_REMOV, "SONY", "CD-ROM CDU-8012", "3.1a", + T_READONLY, T_REMOV, "SONY", "CD-ROM CDU-8012", "3.1a", "cd", SC_ONE_LU }, { T_READONLY, T_REMOV, "PIONEER", "CD-ROM DRM-600", "*", "cd", SC_MORE_LUS }, + { + T_READONLY, T_REMOV, "PIONEER", "CD-ROM DRM-602X" ,"*", + "cd", SC_MORE_LUS + }, + { + T_READONLY, T_REMOV, "CHINON", "CD-ROM CDS-535","*", + "cd", SC_ONE_LU + }, #endif #endif /* NCD */ { @@ -301,13 +309,21 @@ static struct scsidevs knowndevs[] = #if NCD > 0 #ifndef UKTEST /* make cdroms unrecognised to test the uk driver */ { - T_READONLY, T_REMOV, "SONY ", "CD-ROM CDU-8012 " + T_READONLY, T_REMOV, "SONY", "CD-ROM CDU-8012" ,"3.1a", "cd", SC_ONE_LU }, { - T_READONLY, T_REMOV, "PIONEER ", "CD-ROM DRM-600 " + T_READONLY, T_REMOV, "PIONEER", "CD-ROM DRM-600" + ,"any", "cd", SC_MORE_LUS + }, + { + T_READONLY, T_REMOV, "PIONEER", "CD-ROM DRM-602X" ,"any", "cd", SC_MORE_LUS }, + { + T_READONLY, T_REMOV, "CHINON", "CD-ROM CDS-535" + ,"any", "cd", SC_ONE_LU + }, #endif #endif /* NCD */ { @@ -1251,7 +1267,7 @@ scsi_selectdev(qualifier, type, remov, manu, model, rev) bestmatch = thisentry; } if (thisentry->flags & SC_SHOWME) - printf("\n%s-\n%s-", thisentry->manufacturer, manu); + printf("'%s'-'%s'\n", thisentry->manufacturer, manu); if (strcmp(thisentry->manufacturer, manu)) { continue; } @@ -1260,7 +1276,7 @@ scsi_selectdev(qualifier, type, remov, manu, model, rev) bestmatch = thisentry; } if (thisentry->flags & SC_SHOWME) - printf("\n%s-\n%s-", thisentry->model, model); + printf("'%s'-'%s'\n", thisentry->model, model); if (strcmp(thisentry->model, model)) { continue; } @@ -1269,7 +1285,7 @@ scsi_selectdev(qualifier, type, remov, manu, model, rev) bestmatch = thisentry; } if (thisentry->flags & SC_SHOWME) - printf("\n%s-\n%s-", thisentry->version, rev); + printf("'%s'-'%s'\n", thisentry->version, rev); if (strcmp(thisentry->version, rev)) { continue; } |
