Module Name: src
Committed By: jruoho
Date: Fri Mar 5 08:30:48 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_ecvar.h acpi_madt.h acpi_osd.h acpi_pci.h
acpi_slit.h acpi_srat.h acpi_timer.h acpi_wakedev.h acpica.h
acpireg.h acpivar.h fdc_acpireg.h wmi_acpivar.h
Log Message:
Protect all header files against multiple inclusions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/acpi_ecvar.h \
src/sys/dev/acpi/acpi_wakedev.h src/sys/dev/acpi/fdc_acpireg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_madt.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_osd.h \
src/sys/dev/acpi/acpi_pci.h src/sys/dev/acpi/acpi_slit.h \
src/sys/dev/acpi/acpi_srat.h src/sys/dev/acpi/acpi_timer.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpica.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpireg.h \
src/sys/dev/acpi/wmi_acpivar.h
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/acpi/acpivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_ecvar.h
diff -u src/sys/dev/acpi/acpi_ecvar.h:1.1 src/sys/dev/acpi/acpi_ecvar.h:1.2
--- src/sys/dev/acpi/acpi_ecvar.h:1.1 Fri Dec 21 21:22:54 2007
+++ src/sys/dev/acpi/acpi_ecvar.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ecvar.h,v 1.1 2007/12/21 21:22:54 jmcneill Exp $ */
+/* $NetBSD: acpi_ecvar.h,v 1.2 2010/03/05 08:30:48 jruoho Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <[email protected]>.
@@ -29,11 +29,11 @@
* SUCH DAMAGE.
*/
-#ifndef _HAVE_DEV_ACPI_ACPI_ECVAR_H
-#define _HAVE_DEV_ACPI_ACPI_ECVAR_H
+#ifndef _SYS_DEV_ACPI_ACPI_ECVAR_H
+#define _SYS_DEV_ACPI_ACPI_ECVAR_H
ACPI_STATUS acpiec_bus_read(device_t, u_int, ACPI_INTEGER *, int);
ACPI_STATUS acpiec_bus_write(device_t, u_int, ACPI_INTEGER, int);
ACPI_HANDLE acpiec_get_handle(device_t);
-#endif /* !_HAVE_DEV_ACPI_ACPI_ECVAR_H */
+#endif /* !_SYS_DEV_ACPI_ACPI_ECVAR_H */
Index: src/sys/dev/acpi/acpi_wakedev.h
diff -u src/sys/dev/acpi/acpi_wakedev.h:1.1 src/sys/dev/acpi/acpi_wakedev.h:1.2
--- src/sys/dev/acpi/acpi_wakedev.h:1.1 Tue Aug 4 14:20:40 2009
+++ src/sys/dev/acpi/acpi_wakedev.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.h,v 1.1 2009/08/04 14:20:40 jmcneill Exp $ */
+/* $NetBSD: acpi_wakedev.h,v 1.2 2010/03/05 08:30:48 jruoho Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill <[email protected]>
@@ -32,4 +32,4 @@
int acpi_wakedev_scan(struct acpi_softc *);
void acpi_wakedev_commit(struct acpi_softc *);
-#endif /* !_SYS_DEV_ACPI_ACPI_WAKEDEV_H */
+#endif /* !_SYS_DEV_ACPI_ACPI_WAKEDEV_H */
Index: src/sys/dev/acpi/fdc_acpireg.h
diff -u src/sys/dev/acpi/fdc_acpireg.h:1.1 src/sys/dev/acpi/fdc_acpireg.h:1.2
--- src/sys/dev/acpi/fdc_acpireg.h:1.1 Thu Jan 9 00:22:39 2003
+++ src/sys/dev/acpi/fdc_acpireg.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpireg.h,v 1.1 2003/01/09 00:22:39 jmcneill Exp $ */
+/* $NetBSD: fdc_acpireg.h,v 1.2 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <[email protected]>
@@ -25,6 +25,9 @@
* SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_FDC_ACPIREG_H
+#define _SYS_DEV_ACPI_FDC_ACPIREG_H
+
/*
* The ACPI floppy disk interface is similar to the i386 BIOS. Definitions
* from arch/i386/isa/nvram.h
@@ -54,3 +57,5 @@
{ 9, 2, 18, 2, 0xff, 0xdf, 0x2a, 0x50, 40, 720, 2, FDC_250KBPS,
0xf6, 1, "360KB/x" }, /* 320KB in 720KB drive */
};
+
+#endif /* !_SYS_DEV_ACPI_FDC_ACPIREG_H */
Index: src/sys/dev/acpi/acpi_madt.h
diff -u src/sys/dev/acpi/acpi_madt.h:1.7 src/sys/dev/acpi/acpi_madt.h:1.8
--- src/sys/dev/acpi/acpi_madt.h:1.7 Sun Dec 9 20:27:53 2007
+++ src/sys/dev/acpi/acpi_madt.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.h,v 1.7 2007/12/09 20:27:53 jmcneill Exp $ */
+/* $NetBSD: acpi_madt.h,v 1.8 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -35,6 +35,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_ACPI_MADT_H
+#define _SYS_DEV_ACPI_ACPI_MADT_H
+
#define ACPI_PLATFORM_INT_PMI 1
#define ACPI_PLATFORM_INT_INIT 2
#define ACPI_PLATFORM_INT_CERR 3
@@ -42,3 +45,5 @@
ACPI_STATUS acpi_madt_map(void);
void acpi_madt_unmap(void);
void acpi_madt_walk(ACPI_STATUS (*)(ACPI_SUBTABLE_HEADER *, void *), void *);
+
+#endif /* !_SYS_DEV_ACPI_ACPI_MADT_H */
Index: src/sys/dev/acpi/acpi_osd.h
diff -u src/sys/dev/acpi/acpi_osd.h:1.2 src/sys/dev/acpi/acpi_osd.h:1.3
--- src/sys/dev/acpi/acpi_osd.h:1.2 Sun Aug 23 15:16:16 2009
+++ src/sys/dev/acpi/acpi_osd.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_osd.h,v 1.2 2009/08/23 15:16:16 jmcneill Exp $ */
+/* $NetBSD: acpi_osd.h,v 1.3 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -35,6 +35,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_ACPI_OSD_H
+#define _SYS_DEV_ACPI_ACPI_OSD_H
+
/*
* Operating System Dependent code for ACPI. This is an internal
* header for the ACPICA Osd component.
@@ -45,3 +48,5 @@
/* Osd/OsdSchedule.c */
void acpi_osd_sched_init(void);
+
+#endif /* !_SYS_DEV_ACPI_ACPI_OSD_H */
Index: src/sys/dev/acpi/acpi_pci.h
diff -u src/sys/dev/acpi/acpi_pci.h:1.2 src/sys/dev/acpi/acpi_pci.h:1.3
--- src/sys/dev/acpi/acpi_pci.h:1.2 Fri Dec 4 10:42:39 2009
+++ src/sys/dev/acpi/acpi_pci.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci.h,v 1.2 2009/12/04 10:42:39 njoly Exp $ */
+/* $NetBSD: acpi_pci.h,v 1.3 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef _SYS_DEV_ACPI_ACPI_PCI_H
#define _SYS_DEV_ACPI_ACPI_PCI_H
-int acpi_pcidev_scan(struct acpi_softc *);
-ACPI_STATUS acpi_pcidev_find(u_int, u_int, u_int, u_int, ACPI_HANDLE *);
+int acpi_pcidev_scan(struct acpi_softc *);
+ACPI_STATUS acpi_pcidev_find(u_int, u_int, u_int, u_int, ACPI_HANDLE *);
-#endif /* _SYS_DEV_ACPI_ACPI_PCI_H */
+#endif /* !_SYS_DEV_ACPI_ACPI_PCI_H */
Index: src/sys/dev/acpi/acpi_slit.h
diff -u src/sys/dev/acpi/acpi_slit.h:1.2 src/sys/dev/acpi/acpi_slit.h:1.3
--- src/sys/dev/acpi/acpi_slit.h:1.2 Fri Dec 4 10:42:39 2009
+++ src/sys/dev/acpi/acpi_slit.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_slit.h,v 1.2 2009/12/04 10:42:39 njoly Exp $ */
+/* $NetBSD: acpi_slit.h,v 1.3 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,8 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ACPI_SLIT_H
-#define ACPI_SLIT_H
+#ifndef _SYS_DEV_ACPI_ACPI_SLIT_H
+#define _SYS_DEV_ACPI_ACPI_SLIT_H
/* Returns true if ACPI SLIT table is available
* If table does not exist, all functions below
@@ -51,4 +51,4 @@
/* Get distance between cpu1 and cpu2 */
uint32_t acpislit_distance(uint32_t, uint32_t);
-#endif /* ACPI_SLIT_H */
+#endif /* !_SYS_DEV_ACPI_ACPI_SLIT_H */
Index: src/sys/dev/acpi/acpi_srat.h
diff -u src/sys/dev/acpi/acpi_srat.h:1.2 src/sys/dev/acpi/acpi_srat.h:1.3
--- src/sys/dev/acpi/acpi_srat.h:1.2 Fri Dec 4 10:42:39 2009
+++ src/sys/dev/acpi/acpi_srat.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_srat.h,v 1.2 2009/12/04 10:42:39 njoly Exp $ */
+/* $NetBSD: acpi_srat.h,v 1.3 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,8 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ACPI_SRAT_H
-#define ACPI_SRAT_H
+#ifndef _SYS_DEV_ACPI_ACPI_SRAT_H
+#define _SYS_DEV_ACPI_ACPI_SRAT_H
typedef uint32_t acpisrat_nodeid_t;
@@ -95,4 +95,4 @@
void acpisrat_cpu(acpisrat_nodeid_t, uint32_t cpunum, struct acpisrat_cpu *);
void acpisrat_mem(acpisrat_nodeid_t, uint32_t memrange, struct acpisrat_mem *);
-#endif /* ACPI_SRAT_H */
+#endif /* !_SYS_DEV_ACPI_ACPI_SRAT_H */
Index: src/sys/dev/acpi/acpi_timer.h
diff -u src/sys/dev/acpi/acpi_timer.h:1.2 src/sys/dev/acpi/acpi_timer.h:1.3
--- src/sys/dev/acpi/acpi_timer.h:1.2 Wed Apr 8 00:15:45 2009
+++ src/sys/dev/acpi/acpi_timer.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,9 @@
-/* $NetBSD: acpi_timer.h,v 1.2 2009/04/08 00:15:45 dyoung Exp $ */
+/* $NetBSD: acpi_timer.h,v 1.3 2010/03/05 08:30:48 jruoho Exp $ */
-int acpitimer_init(void);
-int acpitimer_detach(void);
+#ifndef _SYS_DEV_ACPI_ACPI_TIMER_H
+#define _SYS_DEV_ACPI_ACPI_TIMER_H
+
+int acpitimer_init(void);
+int acpitimer_detach(void);
+
+#endif /* !_SYS_DEV_ACPI_ACPI_TIMER_H */
Index: src/sys/dev/acpi/acpica.h
diff -u src/sys/dev/acpi/acpica.h:1.3 src/sys/dev/acpi/acpica.h:1.4
--- src/sys/dev/acpi/acpica.h:1.3 Tue Aug 18 16:41:02 2009
+++ src/sys/dev/acpi/acpica.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpica.h,v 1.3 2009/08/18 16:41:02 jmcneill Exp $ */
+/* $NetBSD: acpica.h,v 1.4 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -35,6 +35,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_ACPICA_H
+#define _SYS_DEV_ACPI_ACPICA_H
+
/*
* Header file glue for ACPICA -- include this to get the ACPICA
* headers.
@@ -42,3 +45,5 @@
#include <external/intel-public/acpica/dist/include/acpi.h>
#include <external/intel-public/acpica/dist/include/accommon.h>
+
+#endif /* !_SYS_DEV_ACPI_ACPICA_H */
Index: src/sys/dev/acpi/acpireg.h
diff -u src/sys/dev/acpi/acpireg.h:1.6 src/sys/dev/acpi/acpireg.h:1.7
--- src/sys/dev/acpi/acpireg.h:1.6 Wed Sep 16 10:47:54 2009
+++ src/sys/dev/acpi/acpireg.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpireg.h,v 1.6 2009/09/16 10:47:54 mlelstv Exp $ */
+/* $NetBSD: acpireg.h,v 1.7 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -35,6 +35,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_ACPIREG_H
+#define _SYS_DEV_ACPI_ACPIREG_H
+
/*
* This file defines various ACPI event messages, etc.
*/
@@ -320,3 +323,5 @@
#define ACPI_LID_COMPONENT 0x00200000
#define ACPI_RESOURCE_COMPONENT 0x00400000
#define ACPI_TZ_COMPONENT 0x00800000
+
+#endif /* !_SYS_DEV_ACPI_ACPIREG_H */
Index: src/sys/dev/acpi/wmi_acpivar.h
diff -u src/sys/dev/acpi/wmi_acpivar.h:1.6 src/sys/dev/acpi/wmi_acpivar.h:1.7
--- src/sys/dev/acpi/wmi_acpivar.h:1.6 Mon Jan 4 10:06:53 2010
+++ src/sys/dev/acpi/wmi_acpivar.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpivar.h,v 1.6 2010/01/04 10:06:53 jruoho Exp $ */
+/* $NetBSD: wmi_acpivar.h,v 1.7 2010/03/05 08:30:48 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen <[email protected]>
@@ -26,11 +26,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef WMI_ACPIVAR_H
-#define WMI_ACPIVAR_H
+
+#ifndef _SYS_DEV_ACPI_WMI_ACPIVAR_H
+#define _SYS_DEV_ACPI_WMI_ACPIVAR_H
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpivar.h,v 1.6 2010/01/04 10:06:53 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpivar.h,v 1.7 2010/03/05 08:30:48 jruoho Exp $");
ACPI_STATUS acpi_wmi_event_register(device_t, ACPI_NOTIFY_HANDLER);
ACPI_STATUS acpi_wmi_event_get(device_t, uint32_t, ACPI_BUFFER *);
@@ -42,4 +43,4 @@
ACPI_STATUS acpi_wmi_method(device_t, const char *, uint8_t,
uint32_t, ACPI_BUFFER *, ACPI_BUFFER *);
-#endif /* WMI_ACPIVAR_H */
+#endif /* !_SYS_DEV_ACPI_WMI_ACPIVAR_H */
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.40 src/sys/dev/acpi/acpivar.h:1.41
--- src/sys/dev/acpi/acpivar.h:1.40 Sun Jan 31 11:26:20 2010
+++ src/sys/dev/acpi/acpivar.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.40 2010/01/31 11:26:20 jruoho Exp $ */
+/* $NetBSD: acpivar.h,v 1.41 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -35,6 +35,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_ACPIVAR_H
+#define _SYS_DEV_ACPI_ACPIVAR_H
+
/*
* This file defines the ACPI interface provided to the rest of the
* kernel, as well as the autoconfiguration structures for ACPI
@@ -335,3 +338,5 @@
#ifdef ACPI_DEBUG
void acpi_debug_init(void);
#endif
+
+#endif /* !_SYS_DEV_ACPI_ACPIVAR_H */
