Made all header files idempotent and moved incorrect common data from

headers into a related source file.

6 files changed, 30 insertions, 7 deletions

diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h
index 3f1c348..8de19b0 100644
--- a/sys/scsi/scsi_all.h
+++ b/sys/scsi/scsi_all.h
@@ -18,9 +18,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id$
+ *	$Id: scsi_all.h,v 1.4 1993/08/21 20:01:51 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSI_ALL_H_
+#define _SCSI_SCSI_ALL_H_ 1
+
 /*
  * SCSI command format
  */
@@ -321,3 +324,4 @@ struct scsi_mode_header_big
 #define	SCSI_CHECK		0x02
 #define	SCSI_BUSY		0x08	
 #define SCSI_INTERM		0x10
+#endif /* _SCSI_SCSI_ALL_H_ */
diff --git a/sys/scsi/scsi_cd.h b/sys/scsi/scsi_cd.h
index eb9bfac..e9e80de 100644
--- a/sys/scsi/scsi_cd.h
+++ b/sys/scsi/scsi_cd.h
@@ -14,9 +14,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id$
+ *	$Id: scsi_cd.h,v 1.4 1993/08/21 20:01:52 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSI_CD_H_
+#define _SCSI_SCSI_CD_H_ 1
+
 /*
  *	Define two bits always in the same place in byte 2 (flag byte)
  */
@@ -139,7 +142,6 @@ struct scsi_read_toc
 	u_char	data_len[2];
 	u_char	control;
 };
-;
 
 struct scsi_read_cd_capacity
 {
@@ -224,3 +226,4 @@ struct cd_mode_data
 	union cd_pages page;
 };
 
+#endif /* _SCSI_SCSI_CD_H_ */
diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h
index 4cadd32..dda22ee 100644
--- a/sys/scsi/scsi_changer.h
+++ b/sys/scsi/scsi_changer.h
@@ -19,9 +19,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id$
+ *	$Id: scsi_changer.h,v 1.4 1993/08/21 20:01:53 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSI_CHANGER_H_
+#define _SCSI_SCSI_CHANGER_H_ 1
+
 /*
  * SCSI command format
  */
@@ -93,3 +96,4 @@ struct element_status_page
 	u_char byte_count_of_descriptor_data[3];
 };
 
+#endif /* _SCSI_SCSI_CHANGER_H_ */
diff --git a/sys/scsi/scsi_disk.h b/sys/scsi/scsi_disk.h
index a4eebf5..e9cb724 100644
--- a/sys/scsi/scsi_disk.h
+++ b/sys/scsi/scsi_disk.h
@@ -46,9 +46,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id$
+ *	$Id: scsi_disk.h,v 1.4 1993/08/21 20:01:54 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSI_DISK_H_
+#define _SCSI_SCSI_DISK_H_ 1
+
 /*
  * SCSI command format
  */
@@ -211,3 +214,4 @@ union	disk_pages /* this is the structure copied from osf */
 	   u_char reserved3;
     	} rigid_geometry;
 } ;
+#endif /* _SCSI_SCSI_DISK_H_ */
diff --git a/sys/scsi/scsi_tape.h b/sys/scsi/scsi_tape.h
index eb46092..103e116 100644
--- a/sys/scsi/scsi_tape.h
+++ b/sys/scsi/scsi_tape.h
@@ -21,10 +21,13 @@
 /*
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_tape.h,v 1.8 93/08/31 21:40:16 julian Exp Locker: julian $
+ *	$Id: scsi_tape.h,v 1.6 1993/09/05 15:42:20 rgrimes Exp $
  */
 
 
+#ifndef _SCSI_SCSI_TAPE_H_
+#define _SCSI_SCSI_TAPE_H_ 1
+
 
 /*
  * SCSI command formats
@@ -200,3 +203,4 @@ struct	blk_desc_cipher
 #define DAT-1		0x13
 
 
+#endif /* _SCSI_SCSI_TAPE_H_ */
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index b0b45ef..5738de5 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -14,9 +14,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsiconf.h,v 1.3 93/08/26 21:09:43 julian Exp Locker: julian $
+ *	$Id: scsiconf.h,v 1.5 1993/08/28 03:08:54 rgrimes Exp $
  */
 
+#ifndef _SCSI_SCSICONF_H_
+#define _SCSI_SCSICONF_H_ 1
+
 /***********************************************\
 * these calls are called by the high-end	*
 * drivers to get services from whatever low-end	*
@@ -123,3 +126,4 @@ struct scsi_xfer
 #define XS_SWTIMEOUT	0x04	/* The Timeout reported was caught by SW  */
 #define XS_BUSY		0x08	/* The device busy, try again later?	  */
 
+#endif /* _SCSI_SCSICONF_H_ */