Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/scsipi Remove duplicate struct scsipi_start_stop.



details:   https://anonhg.NetBSD.org/src/rev/59a853164aca
branches:  trunk
changeset: 517806:59a853164aca
user:      soren <soren%NetBSD.org@localhost>
date:      Mon Nov 19 17:18:08 2001 +0000

description:
Remove duplicate struct scsipi_start_stop.

diffstat:

 sys/dev/scsipi/scsi_scanner.h |  13 +------------
 sys/dev/scsipi/scsipi_all.h   |  14 +++++++++++++-
 sys/dev/scsipi/scsipi_disk.h  |  15 +--------------
 3 files changed, 15 insertions(+), 27 deletions(-)

diffs (84 lines):

diff -r 319f20351be9 -r 59a853164aca sys/dev/scsipi/scsi_scanner.h
--- a/sys/dev/scsipi/scsi_scanner.h     Mon Nov 19 16:54:20 2001 +0000
+++ b/sys/dev/scsipi/scsi_scanner.h     Mon Nov 19 17:18:08 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsi_scanner.h,v 1.6 1998/02/13 08:28:38 enami Exp $   */
+/*     $NetBSD: scsi_scanner.h,v 1.7 2001/11/19 17:18:08 soren Exp $   */
 
 /*
  * Copyright (c) 1995 Kenneth Stailey.  All rights reserved.
@@ -53,17 +53,6 @@
        u_int8_t control;
 };
 
-struct scsipi_start_stop {
-       u_int8_t opcode;
-       u_int8_t byte2;
-       u_int8_t unused[2];
-       u_int8_t how;
-#define        SSS_STOP                0x00
-#define        SSS_START               0x01
-#define        SSS_LOEJ                0x02
-       u_int8_t control;
-};
-
 struct scsi_set_window {
 #define SET_WINDOW             0x24 /* set params of image area and windows */
 #define GET_WINDOW             0x25
diff -r 319f20351be9 -r 59a853164aca sys/dev/scsipi/scsipi_all.h
--- a/sys/dev/scsipi/scsipi_all.h       Mon Nov 19 16:54:20 2001 +0000
+++ b/sys/dev/scsipi/scsipi_all.h       Mon Nov 19 17:18:08 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_all.h,v 1.21 2001/09/02 22:06:16 thorpej Exp $  */
+/*     $NetBSD: scsipi_all.h,v 1.22 2001/11/19 17:18:09 soren Exp $    */
 
 /*
  * SCSI and SCSI-like general interface description
@@ -142,6 +142,18 @@
        u_int8_t control;
 } __attribute__((packed));
 
+#define START_STOP             0x1b
+struct scsipi_start_stop {
+       u_int8_t opcode;
+       u_int8_t byte2;
+       u_int8_t unused[2];
+       u_int8_t how;
+#define SSS_STOP               0x00
+#define SSS_START              0x01
+#define SSS_LOEJ               0x02
+       u_int8_t control;
+};
+
 #define        PREVENT_ALLOW           0x1e
 struct scsipi_prevent {
        u_int8_t opcode;
diff -r 319f20351be9 -r 59a853164aca sys/dev/scsipi/scsipi_disk.h
--- a/sys/dev/scsipi/scsipi_disk.h      Mon Nov 19 16:54:20 2001 +0000
+++ b/sys/dev/scsipi/scsipi_disk.h      Mon Nov 19 17:18:08 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_disk.h,v 1.6 2001/09/02 20:17:04 thorpej Exp $  */
+/*     $NetBSD: scsipi_disk.h,v 1.7 2001/11/19 17:18:09 soren Exp $    */
 
 /*
  * SCSI and SCSI-like interfaces description
@@ -76,19 +76,6 @@
        u_int8_t control;
 };
 
-#define START_STOP             0x1b
-struct scsipi_start_stop {
-       u_int8_t opcode;
-       u_int8_t byte2;
-       u_int8_t unused[2];
-       u_int8_t how;
-#define        SSS_STOP                0x00
-#define        SSS_START               0x01
-#define        SSS_LOEJ                0x02
-       u_int8_t control;
-};
-
-
 /* DATAs definitions for the above commands */
 
 struct scsipi_read_cap_data {



Home | Main Index | Thread Index | Old Index