[src/trunk]: src/sys/dev/scsipi ADEV_CDROM -> SDEV_CDROM, for consistency.

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

details:   https://anonhg.NetBSD.org/src/rev/dbc267952733
branches:  trunk
changeset: 486854:dbc267952733
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon May 29 20:13:06 2000 +0000

description:
ADEV_CDROM -> SDEV_CDROM, for consistency.

diffstat:

 sys/dev/scsipi/scsiconf.c   |  10 +++++-----
 sys/dev/scsipi/scsipiconf.h |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r ac1f7c2a4369 -r dbc267952733 sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Mon May 29 20:00:55 2000 +0000
+++ b/sys/dev/scsipi/scsiconf.c Mon May 29 20:13:06 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.143 2000/05/28 07:03:59 gmcgarry Exp $  */
+/*     $NetBSD: scsiconf.c,v 1.144 2000/05/29 20:13:06 bouyer Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -507,9 +507,9 @@
         "EPSON   ", "OMD-5010        ", "3.08"}, SDEV_NOLUNS},
 
        {{T_DIRECT, T_FIXED,
-       "TOSHIBA ", "CD-ROM XM-3401TA", "0283"}, ADEV_CDROM|SDEV_NOLUNS},
+       "TOSHIBA ", "CD-ROM XM-3401TA", "0283"}, SDEV_CDROM|SDEV_NOLUNS},
        {{T_DIRECT, T_FIXED,
-       "TOSHIBA ", "CD-ROM DRIVE:XM", "1971"}, ADEV_CDROM|SDEV_NOLUNS},
+       "TOSHIBA ", "CD-ROM DRIVE:XM", "1971"}, SDEV_CDROM|SDEV_NOLUNS},
        {{T_DIRECT, T_FIXED,
         "ADAPTEC ", "AEC-4412BD",       "1.2A"}, SDEV_NOMODESENSE},
        {{T_DIRECT, T_FIXED,
@@ -773,8 +773,8 @@
                sc_link->quirks |= SDEV_NOLUNS;
        sc_link->scsipi_scsi.scsi_version = inqbuf.version;
 
-       if (sc_link->quirks & ADEV_CDROM) {
-               sc_link->quirks ^= ADEV_CDROM;
+       if (sc_link->quirks & SDEV_CDROM) {
+               sc_link->quirks ^= SDEV_CDROM;
                inqbuf.dev_qual2 |= SID_REMOVABLE;
                sa.sa_inqbuf.type = inqbuf.device = ((inqbuf.device & ~SID_REMOVABLE) | T_CDROM);
                sa.sa_inqbuf.removable = T_REMOV;
diff -r ac1f7c2a4369 -r dbc267952733 sys/dev/scsipi/scsipiconf.h
--- a/sys/dev/scsipi/scsipiconf.h       Mon May 29 20:00:55 2000 +0000
+++ b/sys/dev/scsipi/scsipiconf.h       Mon May 29 20:13:06 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipiconf.h,v 1.40 2000/04/02 17:25:53 augustss Exp $ */
+/*     $NetBSD: scsipiconf.h,v 1.41 2000/05/29 20:13:06 bouyer Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -201,7 +201,7 @@
 #define SDEV_NOMODESENSE       0x0040  /* removable media/optical drives */
 #define SDEV_NOSTARTUNIT       0x0080  /* Do not issue START UNIT requests */
 #define        SDEV_NOSYNCCACHE        0x0100  /* does not grok SYNCHRONIZE CACHE */
-#define ADEV_CDROM             0x0200  /* device is a CD-ROM */
+#define SDEV_CDROM             0x0200  /* device is a CD-ROM */
 #define ADEV_LITTLETOC         0x0400  /* Audio TOC uses wrong byte order */
 #define ADEV_NOCAPACITY                0x0800  /* no READ_CD_CAPACITY command */
 #define ADEV_NOTUR             0x1000  /* no TEST_UNIT_READY command */