[src/trunk]: src/sys/dev/scsipi Use the AUDIO_PAGE definition common to SCSI ...

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

details:   https://anonhg.NetBSD.org/src/rev/a2f64587d738
branches:  trunk
changeset: 514433:a2f64587d738
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Sep 02 19:53:40 2001 +0000

description:
Use the AUDIO_PAGE definition common to SCSI and ATAPI.

diffstat:

 sys/dev/scsipi/cd_scsi.c |  10 +++++-----
 sys/dev/scsipi/scsi_cd.h |   5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r bb0a8ada2efc -r a2f64587d738 sys/dev/scsipi/cd_scsi.c
--- a/sys/dev/scsipi/cd_scsi.c  Sun Sep 02 19:35:20 2001 +0000
+++ b/sys/dev/scsipi/cd_scsi.c  Sun Sep 02 19:53:40 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd_scsi.c,v 1.20 2001/05/14 20:35:28 bouyer Exp $      */
+/*     $NetBSD: cd_scsi.c,v 1.21 2001/09/02 19:53:40 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -166,7 +166,7 @@
        struct scsi_cd_mode_data data;
        int error;
 
-       if ((error = scsipi_mode_sense(cd->sc_periph, 0, SCSI_AUDIO_PAGE,
+       if ((error = scsipi_mode_sense(cd->sc_periph, 0, AUDIO_PAGE,
            &data.header, AUDIOPAGESIZE, flags | XS_CTL_DATA_ONSTACK,
            CDRETRIES, 20000)) != 0)
                return (error);
@@ -186,7 +186,7 @@
        struct scsi_cd_mode_data data;
        int error;
 
-       if ((error = scsipi_mode_sense(cd->sc_periph, 0, SCSI_AUDIO_PAGE,
+       if ((error = scsipi_mode_sense(cd->sc_periph, 0, AUDIO_PAGE,
            &data.header, AUDIOPAGESIZE, flags | XS_CTL_DATA_ONSTACK,
            CDRETRIES, 20000)) != 0)
                return (error);
@@ -209,7 +209,7 @@
        struct scsi_cd_mode_data data;
        int error;
 
-       if ((error = scsipi_mode_sense(cd->sc_periph, 0, SCSI_AUDIO_PAGE,
+       if ((error = scsipi_mode_sense(cd->sc_periph, 0, AUDIO_PAGE,
            &data.header, AUDIOPAGESIZE,
            flags | XS_CTL_DATA_ONSTACK, CDRETRIES, 20000)) != 0)
                return (error);
@@ -229,7 +229,7 @@
        struct scsi_cd_mode_data data;
        int error;
 
-       if ((error = scsipi_mode_sense(cd->sc_periph, 0, SCSI_AUDIO_PAGE,
+       if ((error = scsipi_mode_sense(cd->sc_periph, 0, AUDIO_PAGE,
            &data.header, AUDIOPAGESIZE,
            flags | XS_CTL_DATA_ONSTACK, CDRETRIES, 20000)) != 0)
                return (error);
diff -r bb0a8ada2efc -r a2f64587d738 sys/dev/scsipi/scsi_cd.h
--- a/sys/dev/scsipi/scsi_cd.h  Sun Sep 02 19:35:20 2001 +0000
+++ b/sys/dev/scsipi/scsi_cd.h  Sun Sep 02 19:53:40 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsi_cd.h,v 1.14 2001/09/02 19:35:20 thorpej Exp $     */
+/*     $NetBSD: scsi_cd.h,v 1.15 2001/09/02 19:53:40 thorpej Exp $     */
 
 /*
  * Written by Julian Elischer (julian%tfs.com@localhost)
@@ -34,9 +34,6 @@
        u_int8_t control;
 };
 
-/* sense pages */
-#define SCSI_AUDIO_PAGE  0x0e
-
 #define        SCSI_CD_WRITE_PARAMS_PAGE       0x05
 #define        SCSI_CD_WRITE_PARAMS_PAGE_LEN   0x32
 struct scsi_cd_write_params_page {