From 7fa0819ecf076c283c942d4af5e9bcfaf8c4bd49 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 8 Nov 2010 20:55:24 +0000 Subject: Add #include guards to all Super I/O header files (trivial). Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6049 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/superio/nsc/pc8374/chip.h | 5 +++++ src/superio/nsc/pc8374/pc8374.h | 7 ++++++- src/superio/nsc/pc87309/chip.h | 5 +++++ src/superio/nsc/pc87309/pc87309.h | 6 +++++- src/superio/nsc/pc87351/chip.h | 5 +++++ src/superio/nsc/pc87351/pc87351.h | 5 +++++ src/superio/nsc/pc87360/chip.h | 5 +++++ src/superio/nsc/pc87360/pc87360.h | 5 +++++ src/superio/nsc/pc87366/chip.h | 5 +++++ src/superio/nsc/pc87366/pc87366.h | 7 ++++++- src/superio/nsc/pc87417/chip.h | 5 +++++ src/superio/nsc/pc87417/pc87417.h | 4 ++++ src/superio/nsc/pc87427/chip.h | 5 +++++ src/superio/nsc/pc87427/pc87427.h | 5 ++++- src/superio/nsc/pc97307/chip.h | 6 +++--- src/superio/nsc/pc97307/pc97307.h | 4 ++++ src/superio/nsc/pc97317/chip.h | 6 +++--- src/superio/nsc/pc97317/pc97317.h | 5 +++++ 18 files changed, 85 insertions(+), 10 deletions(-) (limited to 'src/superio/nsc') diff --git a/src/superio/nsc/pc8374/chip.h b/src/superio/nsc/pc8374/chip.h index 2ef9f70ddc..9e5e8dda85 100644 --- a/src/superio/nsc/pc8374/chip.h +++ b/src/superio/nsc/pc8374/chip.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC8374_CHIP_H +#define SUPERIO_NSC_PC8374_CHIP_H + struct chip_operations; extern struct chip_operations superio_nsc_pc8374_ops; @@ -29,3 +32,5 @@ struct superio_nsc_pc8374_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/nsc/pc8374/pc8374.h b/src/superio/nsc/pc8374/pc8374.h index 71162d6156..1b1594d042 100644 --- a/src/superio/nsc/pc8374/pc8374.h +++ b/src/superio/nsc/pc8374/pc8374.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC8374_PC8374_H +#define SUPERIO_NSC_PC8374_PC8374_H + #define PC8374_FDC 0x00 /* Floppy */ #define PC8374_PP 0x01 /* Parallel port */ #define PC8374_SP2 0x02 /* Com2 */ @@ -27,4 +30,6 @@ #define PC8374_KBCM 0x05 /* Mouse */ #define PC8374_KBCK 0x06 /* Keyboard */ #define PC8374_GPIO 0x07 -#define PC8374_HM 0x08 +#define PC8374_HM 0x08 + +#endif diff --git a/src/superio/nsc/pc87309/chip.h b/src/superio/nsc/pc87309/chip.h index 83b4bfc3a3..fd4c0cc9c6 100644 --- a/src/superio/nsc/pc87309/chip.h +++ b/src/superio/nsc/pc87309/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87309_CHIP_H +#define SUPERIO_NSC_PC87309_CHIP_H + #include #include @@ -27,3 +30,5 @@ struct superio_nsc_pc87309_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/nsc/pc87309/pc87309.h b/src/superio/nsc/pc87309/pc87309.h index 957e274518..6968d676ca 100644 --- a/src/superio/nsc/pc87309/pc87309.h +++ b/src/superio/nsc/pc87309/pc87309.h @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87309_PC87309_H +#define SUPERIO_NSC_PC87309_PC87309_H + /* Datasheet: PC87309 SuperI/O Plug and Play Compatible Chip. */ -/* Status: Pre-RAM serial output is tested and works. The rest is untested. */ #define PC87309_FDC 0x00 /* Floppy */ #define PC87309_PP 0x01 /* Parallel port */ @@ -28,3 +30,5 @@ #define PC87309_PM 0x04 /* Power management */ #define PC87309_KBCM 0x05 /* Mouse */ #define PC87309_KBCK 0x06 /* Keyboard */ + +#endif diff --git a/src/superio/nsc/pc87351/chip.h b/src/superio/nsc/pc87351/chip.h index d62b1b3855..44af196c64 100644 --- a/src/superio/nsc/pc87351/chip.h +++ b/src/superio/nsc/pc87351/chip.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87351_CHIP_H +#define SUPERIO_NSC_PC87351_CHIP_H + struct chip_operations; extern struct chip_operations superio_nsc_pc87351_ops; @@ -29,3 +32,5 @@ struct superio_nsc_pc87351_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/nsc/pc87351/pc87351.h b/src/superio/nsc/pc87351/pc87351.h index f3e0fde112..fcf6090e5c 100644 --- a/src/superio/nsc/pc87351/pc87351.h +++ b/src/superio/nsc/pc87351/pc87351.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87351_PC87351_H +#define SUPERIO_NSC_PC87351_PC87351_H + #define PC87351_FDC 0x00 /* Floppy */ #define PC87351_PP 0x01 /* Parallel port */ #define PC87351_SP2 0x02 /* Com2 */ @@ -28,3 +31,5 @@ #define PC87351_KBCK 0x06 /* Keyboard */ #define PC87351_GPIO 0x07 /* General purpose IO */ #define PC87351_FSD 0x08 /* Fan speed device */ + +#endif diff --git a/src/superio/nsc/pc87360/chip.h b/src/superio/nsc/pc87360/chip.h index f3a29ceda3..57bc26ac66 100644 --- a/src/superio/nsc/pc87360/chip.h +++ b/src/superio/nsc/pc87360/chip.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87360_CHIP_H +#define SUPERIO_NSC_PC87360_CHIP_H + struct chip_operations; extern struct chip_operations superio_nsc_pc87360_ops; @@ -29,3 +32,5 @@ struct superio_nsc_pc87360_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/nsc/pc87360/pc87360.h b/src/superio/nsc/pc87360/pc87360.h index e2ee823b75..f8174cf13b 100644 --- a/src/superio/nsc/pc87360/pc87360.h +++ b/src/superio/nsc/pc87360/pc87360.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87360_PC87360_H +#define SUPERIO_NSC_PC87360_PC87360_H + #define PC87360_FDC 0x00 /* Floppy */ #define PC87360_PP 0x01 /* Parallel port */ #define PC87360_SP2 0x02 /* Com2 */ @@ -30,3 +33,5 @@ #define PC87360_ACB 0x08 #define PC87360_FSCM 0x09 #define PC87360_WDT 0x0A + +#endif diff --git a/src/superio/nsc/pc87366/chip.h b/src/superio/nsc/pc87366/chip.h index 31e30ff351..ec37a3d93e 100644 --- a/src/superio/nsc/pc87366/chip.h +++ b/src/superio/nsc/pc87366/chip.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87366_CHIP_H +#define SUPERIO_NSC_PC87366_CHIP_H + extern struct chip_operations superio_nsc_pc87366_ops; #include @@ -28,3 +31,5 @@ struct superio_nsc_pc87366_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/nsc/pc87366/pc87366.h b/src/superio/nsc/pc87366/pc87366.h index 3ded643ff9..8095aec0ee 100644 --- a/src/superio/nsc/pc87366/pc87366.h +++ b/src/superio/nsc/pc87366/pc87366.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87366_PC87366_H +#define SUPERIO_NSC_PC87366_PC87366_H + #define PC87366_FDC 0x00 /* Floppy */ #define PC87366_PP 0x01 /* Parallel port */ #define PC87366_SP2 0x02 /* Com2 */ @@ -31,6 +34,8 @@ #define PC87366_FSCM 0x09 #define PC87366_WDT 0x0A #define PC87366_GMP 0x0b -#define PC87366_MIDI 0x0C +#define PC87366_MIDI 0x0C #define PC87366_VLM 0x0D #define PC87366_TMS 0x0E + +#endif diff --git a/src/superio/nsc/pc87417/chip.h b/src/superio/nsc/pc87417/chip.h index f2bc6f8da5..1b661ef8af 100644 --- a/src/superio/nsc/pc87417/chip.h +++ b/src/superio/nsc/pc87417/chip.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87417_CHIP_H +#define SUPERIO_NSC_PC87417_CHIP_H + extern struct chip_operations superio_nsc_pc87417_ops; #include @@ -29,3 +32,5 @@ struct superio_nsc_pc87417_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/nsc/pc87417/pc87417.h b/src/superio/nsc/pc87417/pc87417.h index bc65eef554..c2051f6a75 100644 --- a/src/superio/nsc/pc87417/pc87417.h +++ b/src/superio/nsc/pc87417/pc87417.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87417_PC87417_H +#define SUPERIO_NSC_PC87417_PC87417_H + #define PC87417_FDC 0x00 /* Floppy */ #define PC87417_PP 0x01 /* Parallel Port */ #define PC87417_SP2 0x02 /* Com2 */ @@ -116,3 +119,4 @@ void pc87417_enable_serial(device_t dev, unsigned iobase); void pc87417_enable_dev(device_t dev); #endif +#endif diff --git a/src/superio/nsc/pc87427/chip.h b/src/superio/nsc/pc87427/chip.h index bc6afcdffc..531e2df58e 100644 --- a/src/superio/nsc/pc87427/chip.h +++ b/src/superio/nsc/pc87427/chip.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC87427_CHIP_H +#define SUPERIO_NSC_PC87427_CHIP_H + extern struct chip_operations superio_nsc_pc87427_ops; #include @@ -28,3 +31,5 @@ struct superio_nsc_pc87427_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/nsc/pc87427/pc87427.h b/src/superio/nsc/pc87427/pc87427.h index 304c9f7f9c..55330354b5 100644 --- a/src/superio/nsc/pc87427/pc87427.h +++ b/src/superio/nsc/pc87427/pc87427.h @@ -1,3 +1,6 @@ +#ifndef SUPERIO_NSC_PC87427_PC87427_H +#define SUPERIO_NSC_PC87427_PC87427_H + #define PC87427_FDC 0x00 /* Floppy */ #define PC87427_SP2 0x02 /* Com2 */ #define PC87427_SP1 0x03 /* Com1 */ @@ -91,4 +94,4 @@ #define PC87427_XSCNF 0x15 #define PC87427_XWBCNF 0x16 - +#endif diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h index efc5bb8994..43e8044ea5 100644 --- a/src/superio/nsc/pc97307/chip.h +++ b/src/superio/nsc/pc97307/chip.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _SUPERIO_NSC_PC97307 -#define _SUPERIO_NSC_PC97307 +#ifndef SUPERIO_NSC_PC97307_CHIP_H +#define SUPERIO_NSC_PC97307_CHIP_H #ifndef PNP_INDEX_REG #define PNP_INDEX_REG 0x15C @@ -37,4 +37,4 @@ struct superio_nsc_pc97307_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; -#endif /* _SUPERIO_NSC_PC97307 */ +#endif diff --git a/src/superio/nsc/pc97307/pc97307.h b/src/superio/nsc/pc97307/pc97307.h index e917d9ce4f..1e15281a00 100644 --- a/src/superio/nsc/pc97307/pc97307.h +++ b/src/superio/nsc/pc97307/pc97307.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC97307_PC97307_H +#define SUPERIO_NSC_PC97307_PC97307_H + #define PC97307_KBCK 0x00 /* Keyboard */ #define PC97307_KBCM 0x01 /* Mouse */ #define PC97307_RTC 0x02 /* Real-Time Clock */ @@ -28,3 +31,4 @@ #define PC97307_GPIO 0x07 #define PC97307_PM 0x08 /* Power Management */ +#endif diff --git a/src/superio/nsc/pc97317/chip.h b/src/superio/nsc/pc97317/chip.h index 8496282482..798561ba36 100644 --- a/src/superio/nsc/pc97317/chip.h +++ b/src/superio/nsc/pc97317/chip.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _SUPERIO_NSC_PC97317 -#define _SUPERIO_NSC_PC97317 +#ifndef SUPERIO_NSC_PC97317_CHIP_H +#define SUPERIO_NSC_PC97317_CHIP_H #ifndef PNP_INDEX_REG #define PNP_INDEX_REG 0x15C @@ -38,4 +38,4 @@ struct superio_nsc_pc97317_config { struct pc_keyboard keyboard; }; -#endif /* _SUPERIO_NSC_PC97317 */ +#endif diff --git a/src/superio/nsc/pc97317/pc97317.h b/src/superio/nsc/pc97317/pc97317.h index 29339f119c..d395367ab9 100644 --- a/src/superio/nsc/pc97317/pc97317.h +++ b/src/superio/nsc/pc97317/pc97317.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_NSC_PC97317_PC97317_H +#define SUPERIO_NSC_PC97317_PC97317_H + #define PC97317_KBCK 0x00 /* Keyboard */ #define PC97317_KBCM 0x01 /* Mouse */ #define PC97317_RTC 0x02 /* Real-Time Clock */ @@ -27,3 +30,5 @@ #define PC97317_SP1 0x06 /* Com1 */ #define PC97317_GPIO 0x07 #define PC97317_PM 0x08 /* Power Management */ + +#endif -- cgit v1.2.3