diff options
| author | soren <soren@NetBSD.org> | 2001-11-19 17:18:08 +0000 |
|---|---|---|
| committer | soren <soren@NetBSD.org> | 2001-11-19 17:18:08 +0000 |
| commit | eefc3172194f9d4fabbaccbb9cab1ab6f624fac3 (patch) | |
| tree | c3bfb43fb15678541ff1246d554d38e41a4b9787 /sys/dev | |
| parent | 27e3d258cd3bdd758368aa2d21bb297a8e5e4141 (diff) | |
Remove duplicate struct scsipi_start_stop.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/scsipi/scsi_scanner.h | 13 | ||||
| -rw-r--r-- | sys/dev/scsipi/scsipi_all.h | 14 | ||||
| -rw-r--r-- | sys/dev/scsipi/scsipi_disk.h | 15 |
3 files changed, 15 insertions, 27 deletions
diff --git a/sys/dev/scsipi/scsi_scanner.h b/sys/dev/scsipi/scsi_scanner.h index 1d7a02c0a2a..476e6bece83 100644 --- a/sys/dev/scsipi/scsi_scanner.h +++ b/sys/dev/scsipi/scsi_scanner.h @@ -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 @@ struct scsi_rw_scanner { 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 --git a/sys/dev/scsipi/scsipi_all.h b/sys/dev/scsipi/scsipi_all.h index 94630e185a4..47a13631357 100644 --- a/sys/dev/scsipi/scsipi_all.h +++ b/sys/dev/scsipi/scsipi_all.h @@ -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 @@ struct scsipi_inquiry { 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 --git a/sys/dev/scsipi/scsipi_disk.h b/sys/dev/scsipi/scsipi_disk.h index ad14cd2e577..d272b473832 100644 --- a/sys/dev/scsipi/scsipi_disk.h +++ b/sys/dev/scsipi/scsipi_disk.h @@ -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 @@ struct scsipi_read_capacity { 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 { |
