Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout previous change, and rather, remove all protection but the one

Browse Source 
actually currently required.  Suggested by Charles M. Hannum.
This commit is contained in:
enami 1998-02-13 08:28:16 +00:00
parent dea45865d2
commit d0ad49a001
21 changed files with 21 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/scsipi/atapi_all.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: atapi_all.h,v 1.2 1998/02/13 04:19:13 enami Exp $ */
/* $NetBSD: atapi_all.h,v 1.3 1998/02/13 08:28:16 enami Exp $ */
/*
* Copyright (c) 1996 Manuel Bouyer. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_ATAPI_ALL_H_
#define _DEV_SCSIPI_ATAPI_ALL_H_
#define ATAPI_MODE_SELECT 0x55
struct atapi_mode_select {
u_int8_t opcode;
@ -70,5 +67,3 @@ struct atapi_mode_header {
#define MDT_FMT_ERROR 0x72
u_int8_t reserved[5];
};
#endif /* _DEV_SCSIPI_ATAPI_ALL_H_ */

7
sys/dev/scsipi/atapi_cd.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: atapi_cd.h,v 1.6 1998/02/13 04:19:14 enami Exp $ */
/* $NetBSD: atapi_cd.h,v 1.7 1998/02/13 08:28:19 enami Exp $ */
/*
* Copyright (c) 1996 Manuel Bouyer. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_ATAPI_CD_H_
#define _DEV_SCSIPI_ATAPI_CD_H_
struct atapi_cdrom_page {
u_int8_t page;
u_int8_t length;
@ -112,5 +109,3 @@ struct atapi_cd_mode_data {
(sizeof(struct atapi_mode_header) + sizeof(struct atapi_cdrom_page))
#define CAPPAGESIZE \
(sizeof(struct atapi_mode_header) + sizeof(struct atapi_cap_page))
#endif /* _DEV_SCSIPI_ATAPI_CD_H_ */

7
sys/dev/scsipi/atapi_disk.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: atapi_disk.h,v 1.2 1998/02/13 04:19:15 enami Exp $ */
/* $NetBSD: atapi_disk.h,v 1.3 1998/02/13 08:28:21 enami Exp $ */
/*
* Copyright 1998
@ -33,9 +33,6 @@
* even if advised of the possibility of such damage.
*/
#ifndef _DEV_SCSIPI_ATAPI_DISK_H_
#define _DEV_SCSIPI_ATAPI_DISK_H_
/*
* Definitions of commands and structures specific to ATAPI disks.
*
@ -101,5 +98,3 @@ struct atapi_sd_mode_data {
#define FLEXGEOMETRYPAGESIZE \
(sizeof(struct atapi_mode_header) + sizeof(struct atapi_flex_geometry_page))
#endif /* _DEV_SCSIPI_ATAPI_DISK_H_ */

7
sys/dev/scsipi/atapiconf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: atapiconf.h,v 1.5 1998/02/13 04:19:16 enami Exp $ */
/* $NetBSD: atapiconf.h,v 1.6 1998/02/13 08:28:23 enami Exp $ */
/*
* Copyright (c) 1996 Manuel Bouyer. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_ATAPICONF_H_
#define _DEV_SCSIPI_ATAPICONF_H_
#include <dev/scsipi/scsipiconf.h>
struct atapi_identify {
@ -140,5 +137,3 @@ int atapi_mode_select __P((struct scsipi_link *,
struct atapi_mode_header *, int, int, int, int));
int atapi_mode_sense __P((struct scsipi_link *, int,
struct atapi_mode_header *, int, int, int, int));
#endif /* _DEV_SCSIPI_ATAPICONF_H_ */

7
sys/dev/scsipi/cdvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cdvar.h,v 1.6 1998/02/13 04:19:17 enami Exp $ */
/* $NetBSD: cdvar.h,v 1.7 1998/02/13 08:28:25 enami Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_CDVAR_H_
#define _DEV_SCSIPI_CDVAR_H_
#define CDRETRIES 1
struct cd_ops;
@ -70,5 +67,3 @@ struct cd_ops {
void cdattach __P((struct device *, struct cd_softc *, struct scsipi_link *,
const struct cd_ops *));
#endif /* _DEV_SCSIPI_CDVAR_H_ */

7
sys/dev/scsipi/scsi_all.h
View File

@ -1,12 +1,9 @@
/* $NetBSD: scsi_all.h,v 1.13 1998/02/13 04:19:18 enami Exp $ */
/* $NetBSD: scsi_all.h,v 1.14 1998/02/13 08:28:28 enami Exp $ */
/*
* SCSI-specific insterface description.
*/
#ifndef _DEV_SCSIPI_SCSI_ALL_H_
#define _DEV_SCSIPI_SCSI_ALL_H_
/*
* Largely written by Julian Elischer (julian@tfs.com)
* for TRW Financial Systems.
@ -176,5 +173,3 @@ struct scsi_mode_header_big {
#define SCSI_BUSY 0x08
#define SCSI_INTERM 0x10
#define SCSI_QUEUE_FULL 0x28
#endif /* _DEV_SCSIPI_SCSI_ALL_H_ */

7
sys/dev/scsipi/scsi_cd.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_cd.h,v 1.11 1998/02/13 04:19:19 enami Exp $ */
/* $NetBSD: scsi_cd.h,v 1.12 1998/02/13 08:28:30 enami Exp $ */
/*
* Written by Julian Elischer (julian@tfs.com)
@ -17,9 +17,6 @@
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
#ifndef _DEV_SCSIPI_SCSI_CD_H_
#define _DEV_SCSIPI_SCSI_CD_H_
/*
* SCSI specific command format
*/
@ -88,5 +85,3 @@ struct scsi_cd_mode_data {
#define AUDIOPAGESIZE \
(sizeof(struct scsi_mode_header) + sizeof(struct scsi_blk_desc) \
+ sizeof(struct cd_audio_page))
#endif /* _DEV_SCSIPI_SCSI_CD_H_ */

7
sys/dev/scsipi/scsi_changer.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_changer.h,v 1.10 1998/02/13 04:19:21 enami Exp $ */
/* $NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
@ -36,9 +36,6 @@
* SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_SCSI_CHANGER_H_
#define _DEV_SCSIPI_SCSI_CHANGER_H_
/*
* SCSI changer interface description
*/
@ -396,5 +393,3 @@ struct page_transport_geometry_parameters {
/* Member number in transport element set. */
u_int8_t member;
};
#endif /* _DEV_SCSIPI_SCSI_CHANGER_H_ */

7
sys/dev/scsipi/scsi_ctron_ether.h
View File

@ -1,12 +1,9 @@
/* $NetBSD: scsi_ctron_ether.h,v 1.5 1998/02/13 04:19:22 enami Exp $ */
/* $NetBSD: scsi_ctron_ether.h,v 1.6 1998/02/13 08:28:34 enami Exp $ */
/*
* SCSI interface description
*/
#ifndef _DEV_SCSIPI_SCSI_CTRON_ETHER_H_
#define _DEV_SCSIPI_SCSI_CTRON_ETHER_H_
/*
* SCSI command format
@ -104,5 +101,3 @@ enum scsi_ctron_ether_media {
CMEDIA_SECONDARY=1, /* coax */
CMEDIA_AUTOSENSE=2 /* set_media command only */
};
#endif /* _DEV_SCSIPI_SCSI_CTRON_ETHER_H_ */

7
sys/dev/scsipi/scsi_disk.h
View File

@ -1,12 +1,9 @@
/* $NetBSD: scsi_disk.h,v 1.14 1998/02/13 04:19:23 enami Exp $ */
/* $NetBSD: scsi_disk.h,v 1.15 1998/02/13 08:28:36 enami Exp $ */
/*
* SCSI-specific interface description
*/
#ifndef _DEV_SCSIPI_SCSI_DISK_H_
#define _DEV_SCSIPI_SCSI_DISK_H_
/*
* Some lines of this file come from a file of the name "scsi.h"
* distributed by OSF as part of mach2.5,
@ -174,5 +171,3 @@ union scsi_disk_pages {
u_int8_t reserved4;
} flex_geometry;
};
#endif /* _DEV_SCSIPI_SCSI_DISK_H_ */

7
sys/dev/scsipi/scsi_scanner.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_scanner.h,v 1.5 1998/02/13 04:19:24 enami Exp $ */
/* $NetBSD: scsi_scanner.h,v 1.6 1998/02/13 08:28:38 enami Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@ -30,9 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_SCSI_SCANNER_H_
#define _DEV_SCSIPI_SCSI_SCANNER_H_
/*
* SCSI scanner interface description
*/
@ -112,5 +109,3 @@ struct scsi_window_data {
#define MUSTEK_SET_WINDOW 0x04 /* set image area and windows */
#define MUSTEK_ADF 0x10 /* ADF and backtracking selection */
#define MUSTEK_LUT 0x55 /* look up table download */
#endif /* _DEV_SCSIPI_SCSI_SCANNER_H_ */

7
sys/dev/scsipi/scsi_tape.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_tape.h,v 1.13 1998/02/13 04:19:26 enami Exp $ */
/* $NetBSD: scsi_tape.h,v 1.14 1998/02/13 08:28:43 enami Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_SCSI_TAPE_H_
#define _DEV_SCSIPI_SCSI_TAPE_H_
/*
* Originally written by Julian Elischer (julian@tfs.com)
* for TRW Financial Systems.
@ -275,5 +272,3 @@ struct scsi_tape_read_position {
#define DDS 0x13
#define DAT_1 0x13
#define QIC_3095 0x45
#endif /* _DEV_SCSIPI_SCSI_TAPE_H_ */

7
sys/dev/scsipi/scsiconf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsiconf.h,v 1.40 1998/02/13 04:19:27 enami Exp $ */
/* $NetBSD: scsiconf.h,v 1.41 1998/02/13 08:28:45 enami Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles Hannum. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_SCSICONF_H_
#define _DEV_SCSIPI_SCSICONF_H_
/*
* Originally written by Julian Elischer (julian@tfs.com)
* for TRW Financial Systems for use under the MACH(2.5) operating system.
@ -88,5 +85,3 @@ int scsi_probe_busses __P((int, int, int));
int scsi_scsipi_cmd __P((struct scsipi_link *, struct scsipi_generic *,
int cmdlen, u_char *data_addr, int datalen, int retries,
int timeout, struct buf *bp, int flags));
#endif /* _DEV_SCSIPI_SCSICONF_H_ */

7
sys/dev/scsipi/scsipi_all.h
View File

@ -1,12 +1,9 @@
/* $NetBSD: scsipi_all.h,v 1.6 1998/02/13 04:19:28 enami Exp $ */
/* $NetBSD: scsipi_all.h,v 1.7 1998/02/13 08:28:47 enami Exp $ */
/*
* SCSI and SCSI-like general interface description
*/
#ifndef _DEV_SCSIPI_SCSIPI_ALL_H_
#define _DEV_SCSIPI_SCSIPI_ALL_H_
/*
* Largely written by Julian Elischer (julian@tfs.com)
* for TRW Financial Systems.
@ -162,5 +159,3 @@ struct scsipi_inquiry_data {
char revision[4];
u_int8_t extra[8];
};
#endif /* _DEV_SCSIPI_SCSIPI_ALL_H_ */

7
sys/dev/scsipi/scsipi_base.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsipi_base.h,v 1.6 1998/02/13 04:19:29 enami Exp $ */
/* $NetBSD: scsipi_base.h,v 1.7 1998/02/13 08:28:49 enami Exp $ */
/*
* Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_SCSIPI_BASE_H_
#define _DEV_SCSIPI_SCSIPI_BASE_H_
/*
* Originally written by Julian Elischer (julian@dialix.oz.au)
*/
@ -84,5 +81,3 @@ scsipi_make_xs(sc_link, scsipi_cmd, cmdlen, data_addr, datalen,
return (xs);
}
#endif /* _DEV_SCSIPI_SCSIPI_BASE_H_ */

7
sys/dev/scsipi/scsipi_cd.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsipi_cd.h,v 1.4 1998/02/13 04:19:30 enami Exp $ */
/* $NetBSD: scsipi_cd.h,v 1.5 1998/02/13 08:28:51 enami Exp $ */
/*
* Written by Julian Elischer (julian@tfs.com)
@ -17,9 +17,6 @@
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
#ifndef _DEV_SCSIPI_SCSIPI_CD_H_
#define _DEV_SCSIPI_SCSIPI_CD_H_
/*
* Define two bits always in the same place in byte 2 (flag byte)
*/
@ -144,5 +141,3 @@ struct cd_audio_page {
#define LEFT_PORT 0
#define RIGHT_PORT 1
};
#endif /* _DEV_SCSIPI_SCSIPI_CD_H_ */

7
sys/dev/scsipi/scsipi_debug.h
View File

@ -1,12 +1,9 @@
/* $NetBSD: scsipi_debug.h,v 1.11 1998/02/13 04:19:31 enami Exp $ */
/* $NetBSD: scsipi_debug.h,v 1.12 1998/02/13 08:28:53 enami Exp $ */
/*
* Written by Julian Elischer (julian@tfs.com)
*/
#ifndef _DEV_SCSIPI_SCSIPI_DEBUG_H_
#define _DEV_SCSIPI_SCSIPI_DEBUG_H_
/*
* These are the new debug bits. (Sat Oct 2 12:46:46 WST 1993)
* the following DEBUG bits are defined to exist in the flags word of
@ -46,5 +43,3 @@ do { \
#define SC_DEBUG(A,B,C)
#define SC_DEBUGN(A,B,C)
#endif
#endif /* _DEV_SCSIPI_SCSIPI_DEBUG_H_ */

7
sys/dev/scsipi/scsipi_disk.h
View File

@ -1,12 +1,9 @@
/* $NetBSD: scsipi_disk.h,v 1.4 1998/02/13 04:19:32 enami Exp $ */
/* $NetBSD: scsipi_disk.h,v 1.5 1998/02/13 08:28:55 enami Exp $ */
/*
* SCSI and SCSI-like interfaces description
*/
#ifndef _DEV_SCSIPI_SCSIPI_DISK_H_
#define _DEV_SCSIPI_SCSIPI_DISK_H_
/*
* Some lines of this file come from a file of the name "scsi.h"
* distributed by OSF as part of mach2.5,
@ -96,5 +93,3 @@ struct scsipi_read_cap_data {
u_int8_t addr[4];
u_int8_t length[4];
};
#endif /* _DEV_SCSIPI_SCSIPI_DISK_H_ */

7
sys/dev/scsipi/sdvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: sdvar.h,v 1.2 1998/02/13 04:19:35 enami Exp $ */
/* $NetBSD: sdvar.h,v 1.3 1998/02/13 08:28:57 enami Exp $ */
/*
* Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_SDVAR_H_
#define _DEV_SCSIPI_SDVAR_H_
/*
* Originally written by Julian Elischer (julian@dialix.oz.au)
* for TRW Financial Systems for use under the MACH(2.5) operating system.
@ -91,5 +88,3 @@ struct sd_ops {
void sdattach __P((struct device *, struct sd_softc *, struct scsipi_link *,
const struct sd_ops *));
#endif /* _DEV_SCSIPI_SDVAR_H_ */

7
sys/dev/scsipi/ss_mustek.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ss_mustek.h,v 1.4 1998/02/13 04:19:36 enami Exp $ */
/* $NetBSD: ss_mustek.h,v 1.5 1998/02/13 08:28:59 enami Exp $ */
/*
* Copyright (c) 1995 Joachim Koenig-Baltes. All rights reserved.
@ -29,9 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_SS_MUSTEK_H_
#define _DEV_SCSIPI_SS_MUSTEK_H_
/*
* support for MUSTEK flatbed SCSI scanners MFS-06000CX and MFS-12000CX
* (600 and 1200 dpi horizontally resp), not conforming to the SCSI2 spec.
@ -175,5 +172,3 @@ struct mustek_start_scan_cmd {
u_int8_t mode;
u_int8_t control;
};
#endif /* _DEV_SCSIPI_SS_MUSTEK_H_ */

7
sys/dev/scsipi/ssvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ssvar.h,v 1.4 1998/02/13 04:19:36 enami Exp $ */
/* $NetBSD: ssvar.h,v 1.5 1998/02/13 08:29:00 enami Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@ -30,9 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _DEV_SCSIPI_SSVAR_H_
#define _DEV_SCSIPI_SSVAR_H_
/*
* SCSI scanner interface description
*/
@ -84,5 +81,3 @@ struct ss_softc {
*/
void mustek_attach __P((struct ss_softc *, struct scsipibus_attach_args *));
void scanjet_attach __P((struct ss_softc *, struct scsipibus_attach_args *));
#endif /* _DEV_SCSIPI_SSVAR_H_ */