[src/trunk]: src/sys/dev/scsipi Centralize the definition of the page code ma...

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

details:   https://anonhg.NetBSD.org/src/rev/bb0a8ada2efc
branches:  trunk
changeset: 514432:bb0a8ada2efc
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Sep 02 19:35:20 2001 +0000

description:
Centralize the definition of the page code mask and page-savable bit
in the pages returned by MODE SENSE.

diffstat:

 sys/dev/scsipi/scsi_cd.h      |  4 +---
 sys/dev/scsipi/scsi_changer.h |  8 +-------
 sys/dev/scsipi/scsipi_all.h   |  7 ++++++-
 sys/dev/scsipi/scsipi_cd.h    |  4 +---
 4 files changed, 9 insertions(+), 14 deletions(-)

diffs (80 lines):

diff -r adeac2007dba -r bb0a8ada2efc sys/dev/scsipi/scsi_cd.h
--- a/sys/dev/scsipi/scsi_cd.h  Sun Sep 02 18:56:26 2001 +0000
+++ b/sys/dev/scsipi/scsi_cd.h  Sun Sep 02 19:35:20 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsi_cd.h,v 1.13 2001/05/14 20:35:28 bouyer Exp $      */
+/*     $NetBSD: scsi_cd.h,v 1.14 2001/09/02 19:35:20 thorpej Exp $     */
 
 /*
  * Written by Julian Elischer (julian%tfs.com@localhost)
@@ -35,9 +35,7 @@
 };
 
 /* sense pages */
-#define SCSI_CD_PAGE_CODE    0x3F
 #define SCSI_AUDIO_PAGE  0x0e
-#define SCSI_CD_PAGE_PS  0x80
 
 #define        SCSI_CD_WRITE_PARAMS_PAGE       0x05
 #define        SCSI_CD_WRITE_PARAMS_PAGE_LEN   0x32
diff -r adeac2007dba -r bb0a8ada2efc sys/dev/scsipi/scsi_changer.h
--- a/sys/dev/scsipi/scsi_changer.h     Sun Sep 02 18:56:26 2001 +0000
+++ b/sys/dev/scsipi/scsi_changer.h     Sun Sep 02 19:35:20 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsi_changer.h,v 1.15 2001/06/24 10:18:13 wiz Exp $    */
+/*     $NetBSD: scsi_changer.h,v 1.16 2001/09/02 19:35:20 thorpej Exp $        */
 
 /*
  * Copyright (c) 1996, 1999 Jason R. Thorpe <thorpej%and.com@localhost>
@@ -302,12 +302,6 @@
 #define ELEMENT_TYPE_DT                0x04
 
 /*
- * XXX The following definitions should be common to all SCSI device types.
- */
-#define PGCODE_MASK    0x3f    /* valid page number bits in pg_code */
-#define PGCODE_PS      0x80    /* indicates page is savable */
-
-/*
  * Device capabilities page.
  *
  * This page defines characteristics of the element types in the
diff -r adeac2007dba -r bb0a8ada2efc sys/dev/scsipi/scsipi_all.h
--- a/sys/dev/scsipi/scsipi_all.h       Sun Sep 02 18:56:26 2001 +0000
+++ b/sys/dev/scsipi/scsipi_all.h       Sun Sep 02 19:35:20 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_all.h,v 1.19 2001/05/22 15:14:24 bouyer Exp $   */
+/*     $NetBSD: scsipi_all.h,v 1.20 2001/09/02 19:35:21 thorpej Exp $  */
 
 /*
  * SCSI and SCSI-like general interface description
@@ -311,5 +311,10 @@
        u_int8_t blk_desc_len[2];       /* unused on ATAPI */
 } __attribute__((packed));
 
+/*
+ * Bits present in the page code octet of the returned mode page.
+ */
+#define        PGCODE_MASK     0x3f            /* page code */
+#define        PGCODE_PS       0x80            /* page is savable */
 
 #endif /* _DEV_SCSIPI_SCSIPI_ALL_H_ */
diff -r adeac2007dba -r bb0a8ada2efc sys/dev/scsipi/scsipi_cd.h
--- a/sys/dev/scsipi/scsipi_cd.h        Sun Sep 02 18:56:26 2001 +0000
+++ b/sys/dev/scsipi/scsipi_cd.h        Sun Sep 02 19:35:20 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_cd.h,v 1.5 1998/02/13 08:28:51 enami Exp $      */
+/*     $NetBSD: scsipi_cd.h,v 1.6 2001/09/02 19:35:21 thorpej Exp $    */
 
 /*
  * Written by Julian Elischer (julian%tfs.com@localhost)
@@ -113,9 +113,7 @@
 /* mod pages common to scsi and atapi */
 struct cd_audio_page {
        u_int8_t page_code;
-#define                CD_PAGE_CODE    0x3F
 #define                AUDIO_PAGE      0x0e
-#define                CD_PAGE_PS      0x80
        u_int8_t param_len;
        u_int8_t flags;
 #define                CD_PA_SOTC      0x02