summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2003-01-06 21:02:18 +0000
committermatt <matt@NetBSD.org>2003-01-06 21:02:18 +0000
commit5d09a84558b6a03aed1e30491f86cf2e980c104e (patch)
tree588307124db80af229cb1f7c04c17c79fefc3cbe /sys/dev
parent1035faff1d69d2b2b87d1edb2ef3c0b0be73af7a (diff)
Add multiple inclusion protection.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/bi/bivar.h7
-rw-r--r--sys/dev/clock_subr.h7
-rw-r--r--sys/dev/dec/dzkbdvar.h7
-rw-r--r--sys/dev/dec/dzreg.h7
-rw-r--r--sys/dev/dec/dzvar.h7
-rw-r--r--sys/dev/ic/ncr53c9xvar.h7
-rw-r--r--sys/dev/ic/sgecreg.h5
-rw-r--r--sys/dev/ic/sgecvar.h7
-rw-r--r--sys/dev/scsipi/scsi_all.h7
-rw-r--r--sys/dev/scsipi/scsi_disk.h6
-rw-r--r--sys/dev/scsipi/scsiconf.h7
-rw-r--r--sys/dev/scsipi/scsipi_base.h7
-rw-r--r--sys/dev/scsipi/scsipi_disk.h7
-rw-r--r--sys/dev/scsipi/sdvar.h7
14 files changed, 80 insertions, 15 deletions
diff --git a/sys/dev/bi/bivar.h b/sys/dev/bi/bivar.h
index f2e916c0949..315a25c4375 100644
--- a/sys/dev/bi/bivar.h
+++ b/sys/dev/bi/bivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bivar.h,v 1.8 2000/07/26 12:41:40 ragge Exp $ */
+/* $NetBSD: bivar.h,v 1.9 2003/01/06 21:05:37 matt Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -29,7 +29,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+#ifndef _DEV_BI_BIVAR_H_
+#define _DEV_BI_BIVAR_H_
/*
@@ -78,3 +79,5 @@ struct bi_list {
/* Prototype */
void bi_attach (struct bi_softc *);
void bi_intr_establish (void *, int, void (*)(void *), void *, struct evcnt *);
+
+#endif /* _DEV_BI_BIVAR_H_ */
diff --git a/sys/dev/clock_subr.h b/sys/dev/clock_subr.h
index 71c7d388d9c..9f9ceb827a3 100644
--- a/sys/dev/clock_subr.h
+++ b/sys/dev/clock_subr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_subr.h,v 1.7 2000/10/03 13:41:07 tsutsui Exp $ */
+/* $NetBSD: clock_subr.h,v 1.8 2003/01/06 21:05:37 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -36,6 +36,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _DEV_CLOCK_SUBR_H_
+#define _DEV_CLOCK_SUBR_H_
+
/*
* "POSIX time" to/from "YY/MM/DD/hh/mm/ss"
*/
@@ -96,3 +99,5 @@ typedef struct todr_chip_handle *todr_chip_handle_t;
#define todr_setcal(ct, v) ((*(ct)->todr_settime)(ct, v))
#define todr_wenable(ct, v) if ((ct)->todr_setwen) \
((*(ct)->todr_setwen)(ct, v))
+
+#endif /* _DEV_CLOCK_SUBR_H_ */
diff --git a/sys/dev/dec/dzkbdvar.h b/sys/dev/dec/dzkbdvar.h
index 7cd5a17500a..b7b57acdaad 100644
--- a/sys/dev/dec/dzkbdvar.h
+++ b/sys/dev/dec/dzkbdvar.h
@@ -1,4 +1,7 @@
-/* $NetBSD: dzkbdvar.h,v 1.2 2001/03/06 07:40:52 matt Exp $ */
+/* $NetBSD: dzkbdvar.h,v 1.3 2003/01/06 21:05:37 matt Exp $ */
+
+#ifndef _DEV_DEC_DZKBDVAR_H_
+#define _DEV_DEC_DZKBDVAR_H_
struct dzkm_attach_args {
int daa_line; /* Line to search */
@@ -15,3 +18,5 @@ void dzsetlpr(struct dz_linestate *, int);
/* Exported functions */
int dzkbd_cnattach(struct dz_linestate *);
+
+#endif /* _DEV_DEC_DZKBDVAR_H_ */
diff --git a/sys/dev/dec/dzreg.h b/sys/dev/dec/dzreg.h
index 8672256edd1..b4e8676529a 100644
--- a/sys/dev/dec/dzreg.h
+++ b/sys/dev/dec/dzreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dzreg.h,v 1.1 2002/02/25 14:58:08 ad Exp $ */
+/* $NetBSD: dzreg.h,v 1.2 2003/01/06 21:05:37 matt Exp $ */
/*
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
*
@@ -22,6 +22,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _DEV_DEC_DZREG_H
+#define _DEV_DEC_DZREG_H
+
union w_b
{
u_short word;
@@ -142,3 +145,5 @@ struct dz_regs {
#define DZ_LPR_8_BIT_CHAR 0000030
#define DZ_LPR_CHANNEL_MASK 0000007
+
+#endif /* _DEV_DEC_DZREG_H */
diff --git a/sys/dev/dec/dzvar.h b/sys/dev/dec/dzvar.h
index c65b262a817..c909cf6f9e8 100644
--- a/sys/dev/dec/dzvar.h
+++ b/sys/dev/dec/dzvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dzvar.h,v 1.4 2002/09/24 06:19:12 ad Exp $ */
+/* $NetBSD: dzvar.h,v 1.5 2003/01/06 21:05:38 matt Exp $ */
/*
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
* Copyright (c) 1992, 1993
@@ -36,6 +36,9 @@
* SUCH DAMAGE.
*/
+#ifndef _DEV_DEC_DZVAR_H_
+#define _DEV_DEC_DZVAR_H_
+
/* A DZ-11 has 8 ports while a DZV/DZQ-11 has only 4. */
#define NDZLINE 8
@@ -77,3 +80,5 @@ void dzattach(struct dz_softc *, struct evcnt *, int);
void dzrint(void *);
void dzxint(void *);
void dzreset(struct device *);
+
+#endif /* _DEV_DEC_DZVAR_H_ */
diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h
index 473f66a9782..182391b39dd 100644
--- a/sys/dev/ic/ncr53c9xvar.h
+++ b/sys/dev/ic/ncr53c9xvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9xvar.h,v 1.39 2002/10/22 17:58:45 petrov Exp $ */
+/* $NetBSD: ncr53c9xvar.h,v 1.40 2003/01/06 21:05:38 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,6 +37,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _DEV_IC_NCR53C9XVAR_H_
+#define _DEV_IC_NCR53C9XVAR_H_
+
/*
* Copyright (c) 1994 Peter Galbavy. All rights reserved.
*
@@ -443,3 +446,5 @@ void ncr53c9x_scsipi_request __P((struct scsipi_channel *chan,
void ncr53c9x_reset __P((struct ncr53c9x_softc *));
int ncr53c9x_intr __P((void *));
void ncr53c9x_init __P((struct ncr53c9x_softc *, int));
+
+#endif /* _DEV_IC_NCR53C9XVAR_H_ */
diff --git a/sys/dev/ic/sgecreg.h b/sys/dev/ic/sgecreg.h
index eab5a3f82c7..f4fd0f16155 100644
--- a/sys/dev/ic/sgecreg.h
+++ b/sys/dev/ic/sgecreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sgecreg.h,v 1.1 1999/08/08 11:41:29 ragge Exp $ */
+/* $NetBSD: sgecreg.h,v 1.2 2003/01/06 21:05:38 matt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -36,6 +36,8 @@
*
*/
+#ifndef _DEV_IC_SGECREG_H_
+#define _DEV_IC_SGECREG_H_
/* Driver for SGEC (second generation Ethernet controller) chip, type DC-541,
found on the KA670 (and prob ably other) CPU.
@@ -239,3 +241,4 @@ struct ze_tdes {
#define ZE_TDES1_IC 0x0100 /* interrupt on completion */
#define ZE_TDES1_VT 0x0080 /* virtual(1)/phys PTE address */
+#endif /* _DEV_IC_SGECREG_H_ */
diff --git a/sys/dev/ic/sgecvar.h b/sys/dev/ic/sgecvar.h
index 89091aea78e..f2a316d2a4b 100644
--- a/sys/dev/ic/sgecvar.h
+++ b/sys/dev/ic/sgecvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sgecvar.h,v 1.2 2000/06/04 02:14:14 matt Exp $ */
+/* $NetBSD: sgecvar.h,v 1.3 2003/01/06 21:05:38 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -29,6 +29,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _DEV_IC_SGECVAR_H_
+#define _DEV_IC_SGECVAR_H_
+
#define RXDESCS 30 /* # of receive descriptors */
#define TXDESCS 60 /* # transmit descs */
@@ -67,3 +70,5 @@ struct ze_softc {
void sgec_attach __P((struct ze_softc *));
int sgec_intr __P((struct ze_softc *));
+
+#endif /* _DEV_IC_SGECVAR_H_ */
diff --git a/sys/dev/scsipi/scsi_all.h b/sys/dev/scsipi/scsi_all.h
index 4e0bb4e1dec..435291b92ee 100644
--- a/sys/dev/scsipi/scsi_all.h
+++ b/sys/dev/scsipi/scsi_all.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_all.h,v 1.18 2001/05/14 20:35:28 bouyer Exp $ */
+/* $NetBSD: scsi_all.h,v 1.19 2003/01/06 21:02:18 matt Exp $ */
/*
* SCSI-specific interface description.
@@ -21,6 +21,9 @@
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
+#ifndef _DEV_SCSIPI_SCSI_ALL_H_
+#define _DEV_SCSIPI_SCSI_ALL_H_
+
/*
* SCSI command format
*/
@@ -114,3 +117,5 @@ struct scsi_blk_desc {
#define SCSI_TERMINATED 0x22
#define SCSI_QUEUE_FULL 0x28
#define SCSI_ACA_ACTIVE 0x30
+
+#endif /* _DEV_SCSIPI_SCSI_ALL_H_ */
diff --git a/sys/dev/scsipi/scsi_disk.h b/sys/dev/scsipi/scsi_disk.h
index 47b95d81358..4987f7849bf 100644
--- a/sys/dev/scsipi/scsi_disk.h
+++ b/sys/dev/scsipi/scsi_disk.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_disk.h,v 1.21 2002/07/24 23:45:03 mjacob Exp $ */
+/* $NetBSD: scsi_disk.h,v 1.22 2003/01/06 21:02:18 matt Exp $ */
/*
* SCSI-specific interface description
@@ -52,6 +52,8 @@
/*
* SCSI command format
*/
+#ifndef _DEV_SCSIPI_SCSI_DISK_H_
+#define _DEV_SCSIPI_SCSI_DISK_H_
/*
* XXX Is this also used by ATAPI?
@@ -298,3 +300,5 @@ union scsi_disk_pages {
u_int8_t non_cache_segment_size[2];
} caching_params;
};
+
+#endif /* _DEV_SCSIPI_SCSI_DISK_H_ */
diff --git a/sys/dev/scsipi/scsiconf.h b/sys/dev/scsipi/scsiconf.h
index 77b5c418fa0..98e6b3edf2b 100644
--- a/sys/dev/scsipi/scsiconf.h
+++ b/sys/dev/scsipi/scsiconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.h,v 1.49 2001/04/25 17:53:39 bouyer Exp $ */
+/* $NetBSD: scsiconf.h,v 1.50 2003/01/06 21:02:18 matt Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -54,6 +54,9 @@
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
+#ifndef _DEV_SCSIPI_SCSICONF_H_
+#define _DEV_SCSIPI_SCSICONF_H_
+
#include <dev/scsipi/scsipiconf.h>
int scsiprint __P((void *, const char *));
@@ -75,3 +78,5 @@ void scsi_print_addr __P((struct scsipi_periph *));
int scsi_probe_bus __P((struct scsibus_softc *, int, int));
int scsi_scsipi_cmd __P((struct scsipi_periph *, struct scsipi_generic *,
int, void *, size_t, int, int, struct buf *, int));
+
+#endif /* _DEV_SCSIPI_SCSICONF_H_ */
diff --git a/sys/dev/scsipi/scsipi_base.h b/sys/dev/scsipi/scsipi_base.h
index cbbefab79d6..62c1f04d88a 100644
--- a/sys/dev/scsipi/scsipi_base.h
+++ b/sys/dev/scsipi/scsipi_base.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.h,v 1.12 2001/07/18 18:25:41 thorpej Exp $ */
+/* $NetBSD: scsipi_base.h,v 1.13 2003/01/06 21:02:18 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,6 +36,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _DEV_SCSIPI_SCSIPI_BASE_H_
+#define _DEV_SCSIPI_SCSIPI_BASE_H_
+
struct scsipi_xfer *scsipi_get_xs __P((struct scsipi_periph *, int));
void scsipi_put_xs __P((struct scsipi_xfer *));
@@ -81,3 +84,5 @@ scsipi_make_xs(periph, scsipi_cmd, cmdlen, data_addr, datalen,
return (xs);
}
+
+#endif /* _DEV_SCSIPI_SCSIPI_BASE_H_ */
diff --git a/sys/dev/scsipi/scsipi_disk.h b/sys/dev/scsipi/scsipi_disk.h
index d272b473832..ec17cfe79f5 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.7 2001/11/19 17:18:09 soren Exp $ */
+/* $NetBSD: scsipi_disk.h,v 1.8 2003/01/06 21:02:18 matt Exp $ */
/*
* SCSI and SCSI-like interfaces description
@@ -49,6 +49,9 @@
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
+#ifndef _DEV_SCSIPI_SCSIPI_DISK_H_
+#define _DEV_SCSIPI_SCSIPI_DISK_H_
+
/*
* SCSI command format
*/
@@ -82,3 +85,5 @@ struct scsipi_read_cap_data {
u_int8_t addr[4];
u_int8_t length[4];
};
+
+#endif /* _DEV_SCSIPI_SCSIPI_DISK_H_ */
diff --git a/sys/dev/scsipi/sdvar.h b/sys/dev/scsipi/sdvar.h
index ec6aece4b2c..7ac48ee6fd1 100644
--- a/sys/dev/scsipi/sdvar.h
+++ b/sys/dev/scsipi/sdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sdvar.h,v 1.17 2002/07/16 18:03:18 hannken Exp $ */
+/* $NetBSD: sdvar.h,v 1.18 2003/01/06 21:02:18 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -53,6 +53,9 @@
* Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
*/
+#ifndef _DEV_SCSIPI_SDVAR_H_
+#define _DEV_SCSIPI_SDVAR_H_
+
#include "opt_scsi.h"
#include "rnd.h"
#if NRND > 0
@@ -120,3 +123,5 @@ void sdattach __P((struct device *, struct sd_softc *, struct scsipi_periph *,
const struct sd_ops *));
int sdactivate __P((struct device *, enum devact));
int sddetach __P((struct device *, int));
+
+#endif /* _DEV_SCSIPI_SDVAR_H_ */