summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cardbus/cardbus_exrom.h8
-rw-r--r--sys/dev/cardbus/cardbusvar.h9
-rw-r--r--sys/dev/cardbus/cardslotvar.h8
-rw-r--r--sys/dev/cardbus/pccardcis.h8
-rw-r--r--sys/dev/cardbus/rbus.h10
5 files changed, 21 insertions, 22 deletions
diff --git a/sys/dev/cardbus/cardbus_exrom.h b/sys/dev/cardbus/cardbus_exrom.h
index 604647b58df..5236dbe1ad8 100644
--- a/sys/dev/cardbus/cardbus_exrom.h
+++ b/sys/dev/cardbus/cardbus_exrom.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_exrom.h,v 1.1 1999/10/28 22:27:00 joda Exp $ */
+/* $NetBSD: cardbus_exrom.h,v 1.2 1999/12/15 12:28:54 kleink Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,8 +35,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __cardbus_exrom_h__
-#define __cardbus_exrom_h__
+#ifndef _DEV_CARDBUS_CARDBUS_EXROM_H_
+#define _DEV_CARDBUS_CARDBUS_EXROM_H_
/* PCI ROM header fields */
#define CARDBUS_EXROM_SIGNATURE 0x00
@@ -69,4 +69,4 @@ int
cardbus_read_exrom __P((bus_space_tag_t, bus_space_handle_t,
struct cardbus_rom_image_head*));
-#endif /* __cardbus_exrom_h__ */
+#endif /* !_DEV_CARDBUS_CARDBUS_EXROM_H_ */
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index ef76e2e1ca7..606d9d21c79 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbusvar.h,v 1.10 1999/12/11 00:29:11 thorpej Exp $ */
+/* $NetBSD: cardbusvar.h,v 1.11 1999/12/15 12:28:54 kleink Exp $ */
/*
* Copyright (c) 1998 and 1999
@@ -32,8 +32,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if !defined SYS_DEV_CARDBUS_CARDBUSVAR_H
-#define SYS_DEV_CARDBUS_CARDBUSVAR_H
+#ifndef _DEV_CARDBUS_CARDBUSVAR_H_
+#define _DEV_CARDBUS_CARDBUSVAR_H_
#include <dev/pci/pcivar.h> /* for pcitag_t */
@@ -436,8 +436,7 @@ int cardbus_get_capability __P((cardbus_chipset_tag_t, cardbus_function_tag_t,
#define Cardbus_conf_read(ct, tag, offs) (*(ct)->ct_cf->cardbus_conf_read)((ct)->ct_cf, (tag), (offs))
#define cardbus_conf_read(cc, cf, tag, offs) ((cf)->cardbus_conf_read)((cc), (tag), (offs))
-#define Cardbus_conf_write(ct, tag, offs, val) (*(ct)->ct_cf->cardbus_conf_write)((ct)->ct_cf, (tag), (offs), (val))
-#define cardbus_conf_write(cc, cf, tag, offs, val) ((cf)->cardbus_conf_write)((cc), (tag), (offs), (val))
+#endif /* !_DEV_CARDBUS_CARDBUSVAR_H_ */
#endif /* SYS_DEV_CARDBUS_CARDBUSVAR_H */
diff --git a/sys/dev/cardbus/cardslotvar.h b/sys/dev/cardbus/cardslotvar.h
index f4ecad94b6f..862c9c942ad 100644
--- a/sys/dev/cardbus/cardslotvar.h
+++ b/sys/dev/cardbus/cardslotvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslotvar.h,v 1.3 1999/11/15 06:08:02 haya Exp $ */
+/* $NetBSD: cardslotvar.h,v 1.4 1999/12/15 12:28:55 kleink Exp $ */
/*
* Copyright (c) 1999
@@ -32,8 +32,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if !defined SYS_DEV_CARDBUS_CARDSLOTVAR_H
-#define SYS_DEV_CARDBUS_CARDSLOTVAR_H
+#ifndef _DEV_CARDBUS_CARDSLOTVAR_H_
+#define _DEV_CARDBUS_CARDSLOTVAR_H_
/* require sys/device.h */
/* require sys/queue.h */
@@ -123,4 +123,4 @@ typedef struct cardslot_softc *cardslot_t;
void cardslot_event_throw __P((cardslot_t cs, int ev));
-#endif /* SYS_DEV_CARDBUS_CARDSLOTVAR_H */
+#endif /* !_DEV_CARDBUS_CARDSLOTVAR_H_ */
diff --git a/sys/dev/cardbus/pccardcis.h b/sys/dev/cardbus/pccardcis.h
index 20b04aa9c22..cd74014998f 100644
--- a/sys/dev/cardbus/pccardcis.h
+++ b/sys/dev/cardbus/pccardcis.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pccardcis.h,v 1.2 1999/10/15 06:42:22 haya Exp $ */
+/* $NetBSD: pccardcis.h,v 1.3 1999/12/15 12:28:55 kleink Exp $ */
/*
* Copyright (c) 1997 and 1998
@@ -33,8 +33,8 @@
*/
-#if !defined SYS_DEV_PCCARD_PCCARDCIS_H
-#define SYS_DEV_PCCARD_PCCARDCIS_H 1
+#ifndef _DEV_PCCARD_PCCARDCIS_H_
+#define _DEV_PCCARD_PCCARDCIS_H_
#define CISTPL_NULL 0x00
#define CISTPL_DEVICE 0x01
@@ -89,4 +89,4 @@
#define TPL_FUNCE_LAN_CONN 5 /* connector type (shape) */
-#endif /* SYS_DEV_PCCARD_PCCARDCIS_H */
+#endif /* !_DEV_PCCARD_PCCARDCIS_H_ */
diff --git a/sys/dev/cardbus/rbus.h b/sys/dev/cardbus/rbus.h
index 62a6997e712..75cc9a6cc5f 100644
--- a/sys/dev/cardbus/rbus.h
+++ b/sys/dev/cardbus/rbus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus.h,v 1.2 1999/10/15 06:42:22 haya Exp $ */
+/* $NetBSD: rbus.h,v 1.3 1999/12/15 12:28:55 kleink Exp $ */
/*
* Copyright (c) 1999
* HAYAKAWA Koichi. All rights reserved.
@@ -31,6 +31,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _DEV_CARDBUS_RBUS_H_
+#define _DEV_CARDBUS_RBUS_H_
+
/*
* This file defines rbus (pseudo) class
*
@@ -61,9 +64,6 @@
*/
-#if !defined SYS_DEV_CARDBUS_RBUS_H
-#define SYS_DEV_CARDBUS_RBUS_H
-
/* require sys/extent.h */
/* require machine/bus.h */
@@ -162,4 +162,4 @@ int rbus_delete __P((rbus_tag_t));
*/
#include <machine/rbus_machdep.h>
-#endif /* SYS_DEV_CARDBUS_RBUS_H */
+#endif /* !_DEV_CARDBUS_RBUS_H_ */