diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-08 20:55:24 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-08 20:55:24 +0000 |
| commit | 7fa0819ecf076c283c942d4af5e9bcfaf8c4bd49 (patch) | |
| tree | 523f6bd8880d1ccd39e97067feafc2bfb625d22e | |
| parent | f648d619c994f856d6ca7d86fe18c532a974d31b (diff) | |
| download | coreboot-7fa0819ecf076c283c942d4af5e9bcfaf8c4bd49.tar.xz | |
Add #include guards to all Super I/O header files (trivial).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6049 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
75 files changed, 348 insertions, 35 deletions
diff --git a/src/superio/fintek/f71805f/chip.h b/src/superio/fintek/f71805f/chip.h index 89d8af620b..3ab1a7c2e2 100644 --- a/src/superio/fintek/f71805f/chip.h +++ b/src/superio/fintek/f71805f/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_FINTEK_F71805F_CHIP_H +#define SUPERIO_FINTEK_F71805F_CHIP_H + #include <device/device.h> #include <uart8250.h> @@ -28,3 +31,5 @@ extern struct chip_operations superio_fintek_f71805f_ops; struct superio_fintek_f71805f_config { struct uart8250 com1, com2; }; + +#endif diff --git a/src/superio/fintek/f71805f/f71805f.h b/src/superio/fintek/f71805f/f71805f.h index 00e284ebb5..932e453c07 100644 --- a/src/superio/fintek/f71805f/f71805f.h +++ b/src/superio/fintek/f71805f/f71805f.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_FINTEK_F71805F_F71805F_H +#define SUPERIO_FINTEK_F71805F_F71805F_H + /* * Datasheet: * - Name: F71805F/FG Super H/W Monitor + LPC IO @@ -34,3 +37,5 @@ #define F71805F_HWM 0x04 /* Hardware monitor */ #define F71805F_GPIO 0x06 /* General Purpose I/O (GPIO) */ #define F71805F_PME 0x0a /* Power Management Events (PME) */ + +#endif diff --git a/src/superio/fintek/f71859/chip.h b/src/superio/fintek/f71859/chip.h index d823c45053..a0de2d5982 100755 --- a/src/superio/fintek/f71859/chip.h +++ b/src/superio/fintek/f71859/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_FINTEK_F71859_CHIP_H +#define SUPERIO_FINTEK_F71859_CHIP_H + #include <device/device.h> #include <uart8250.h> @@ -26,3 +29,5 @@ extern struct chip_operations superio_fintek_f71859_ops; struct superio_fintek_f71859_config { struct uart8250 com1, com2; }; + +#endif diff --git a/src/superio/fintek/f71859/f71859.h b/src/superio/fintek/f71859/f71859.h index 74c108e878..b9aed6e0ff 100755 --- a/src/superio/fintek/f71859/f71859.h +++ b/src/superio/fintek/f71859/f71859.h @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* Logical Device Numbers (LDN). */ +#ifndef SUPERIO_FINTEK_F71859_F71859_H +#define SUPERIO_FINTEK_F71859_F71859_H +/* Logical Device Numbers (LDN). */ #define F71859_SP1 0x03 /* UART1 */ +#endif diff --git a/src/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h index 0fea0a30d1..5ccfa5bd76 100644 --- a/src/superio/fintek/f71863fg/chip.h +++ b/src/superio/fintek/f71863fg/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_FINTEK_F71863FG_CHIP_H +#define SUPERIO_FINTEK_F71863FG_CHIP_H + #include <pc80/keyboard.h> #include <device/device.h> #include <uart8250.h> @@ -28,3 +31,5 @@ struct superio_fintek_f71863fg_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/fintek/f71863fg/f71863fg.h b/src/superio/fintek/f71863fg/f71863fg.h index 487f76854d..a36f71ccdd 100644 --- a/src/superio/fintek/f71863fg/f71863fg.h +++ b/src/superio/fintek/f71863fg/f71863fg.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_FINTEK_F71863FG_F71863FG_H +#define SUPERIO_FINTEK_F71863FG_F71863FG_H + /* Logical Device Numbers (LDN). */ #define F71863FG_FDC 0x00 /* Floppy */ #define F71863FG_SP1 0x01 /* UART1 */ @@ -29,3 +32,5 @@ #define F71863FG_VID 0x07 /* VID */ #define F71863FG_SPI 0x08 /* SPI */ #define F71863FG_PME 0x0a /* Power Management Events (PME) and ACPI */ + +#endif diff --git a/src/superio/fintek/f71889/chip.h b/src/superio/fintek/f71889/chip.h index 50437450a4..b4357b2018 100644 --- a/src/superio/fintek/f71889/chip.h +++ b/src/superio/fintek/f71889/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_FINTEK_F71889_CHIP_H +#define SUPERIO_FINTEK_F71889_CHIP_H + #include <pc80/keyboard.h> #include <device/device.h> #include <uart8250.h> @@ -28,3 +31,5 @@ struct superio_fintek_f71889_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/fintek/f71889/f71889.h b/src/superio/fintek/f71889/f71889.h index f1dde6f203..a7ce3f60ef 100644 --- a/src/superio/fintek/f71889/f71889.h +++ b/src/superio/fintek/f71889/f71889.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_FINTEK_F71889_F71889_H +#define SUPERIO_FINTEK_F71889_F71889_H + /* Logical Device Numbers (LDN). */ #define F71889_FDC 0x00 /* Floppy */ #define F71889_SP1 0x01 /* UART1 */ @@ -30,3 +33,5 @@ #define F71889_SPI 0x08 /* SPI */ #define F71889_PME 0x0a /* Power Management Events (PME) and ACPI */ #define F71889_VREF 0x0b /* Vref */ + +#endif diff --git a/src/superio/intel/i3100/i3100.h b/src/superio/intel/i3100/i3100.h index 5fe8e086e7..f0d6426be0 100644 --- a/src/superio/intel/i3100/i3100.h +++ b/src/superio/intel/i3100/i3100.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_INTEL_I3100_I3100_H +#define SUPERIO_INTEL_I3100_I3100_H + /* * Datasheet: * - Name: Intel 3100 Chipset @@ -27,9 +30,6 @@ * - Order number: 313458-007US */ -#ifndef SUPERIO_INTEL_I3100_I3100_H -#define SUPERIO_INTEL_I3100_I3100_H - /* * The SIW ("Serial I/O and Watchdog Timer") integrated into the i3100 is * very similar to a Super I/O, both in functionality and config mechanism. diff --git a/src/superio/ite/it8661f/it8661f.h b/src/superio/ite/it8661f/it8661f.h index 5934908eee..ecc9473a6e 100644 --- a/src/superio/ite/it8661f/it8661f.h +++ b/src/superio/ite/it8661f/it8661f.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_ITE_IT8661F_IT8661F_H +#define SUPERIO_ITE_IT8661F_IT8661F_H + /* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8661_2.asp */ #define IT8661F_FDC 0x00 /* Floppy */ @@ -26,3 +29,5 @@ #define IT8661F_PP 0x03 /* Parallel port */ #define IT8661F_IR 0x04 /* IR */ #define IT8661F_GPIO 0x05 /* GPIO & Alternate Function Configuration */ + +#endif diff --git a/src/superio/ite/it8671f/it8671f.h b/src/superio/ite/it8671f/it8671f.h index 8c9daab6af..dcf6ac6ad0 100644 --- a/src/superio/ite/it8671f/it8671f.h +++ b/src/superio/ite/it8671f/it8671f.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_ITE_IT8671F_IT8671F_H +#define SUPERIO_ITE_IT8671F_IT8671F_H + /* Datasheet: Not available online, got it from ITE per request. */ #define IT8671F_FDC 0x00 /* Floppy */ @@ -26,3 +29,5 @@ #define IT8671F_PP 0x03 /* Parallel port */ #define IT8671F_KBCK 0x05 /* PS/2 keyboard */ #define IT8671F_KBCM 0x06 /* PS/2 mouse */ + +#endif diff --git a/src/superio/ite/it8673f/it8673f.h b/src/superio/ite/it8673f/it8673f.h index f3b407ce5b..98736f84b2 100644 --- a/src/superio/ite/it8673f/it8673f.h +++ b/src/superio/ite/it8673f/it8673f.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_ITE_IT8673F_IT8673F_H +#define SUPERIO_ITE_IT8673F_IT8673F_H + /* Datasheet: http://www.datasheet4u.com/html/I/T/8/IT8673F_ITE.pdf.html */ #define IT8673F_FDC 0x00 /* Floppy */ @@ -27,3 +30,5 @@ #define IT8673F_FAN 0x04 /* Fan controller */ #define IT8673F_KBCK 0x05 /* PS/2 keyboard */ #define IT8673F_KBCM 0x06 /* PS/2 mouse */ + +#endif diff --git a/src/superio/ite/it8705f/it8705f.h b/src/superio/ite/it8705f/it8705f.h index c2a8e76a32..fd513bc9c4 100644 --- a/src/superio/ite/it8705f/it8705f.h +++ b/src/superio/ite/it8705f/it8705f.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_ITE_IT8705F_IT8705F_H +#define SUPERIO_ITE_IT8705F_IT8705F_H + /* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8705_2.asp */ /* Note: This should also work on an IT8705AF, they're almost the same. */ @@ -31,3 +34,5 @@ #define IT8705F_GAME 0x06 /* GAME port */ #define IT8705F_IR 0x07 /* Consumer IR */ #define IT8705F_MIDI 0x08 /* MIDI port */ + +#endif diff --git a/src/superio/ite/it8712f/it8712f.h b/src/superio/ite/it8712f/it8712f.h index 609f361a66..a8b48e9767 100644 --- a/src/superio/ite/it8712f/it8712f.h +++ b/src/superio/ite/it8712f/it8712f.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_ITE_IT8712F_IT8712F_H +#define SUPERIO_ITE_IT8712F_IT8712F_H + /* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8712_2.asp */ #define IT8712F_FDC 0x00 /* Floppy */ @@ -38,3 +41,5 @@ void it8712f_enable_serial(device_t dev, u16 iobase); void it8712f_24mhz_clkin(void); void it8712f_enable_3vsbsw(void); #endif + +#endif diff --git a/src/superio/ite/it8716f/it8716f.h b/src/superio/ite/it8716f/it8716f.h index 88e44c219d..dde25153c7 100644 --- a/src/superio/ite/it8716f/it8716f.h +++ b/src/superio/ite/it8716f/it8716f.h @@ -18,11 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8716_2.asp */ - #ifndef SUPERIO_ITE_IT8716F_IT8716F_H #define SUPERIO_ITE_IT8716F_IT8716F_H +/* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8716_2.asp */ + +/* Logical device numbers (LDNs). */ #define IT8716F_FDC 0x00 /* Floppy */ #define IT8716F_SP1 0x01 /* Com1 */ #define IT8716F_SP2 0x02 /* Com2 */ diff --git a/src/superio/ite/it8718f/it8718f.h b/src/superio/ite/it8718f/it8718f.h index def5c52951..7bb183b7e0 100644 --- a/src/superio/ite/it8718f/it8718f.h +++ b/src/superio/ite/it8718f/it8718f.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_ITE_IT8718F_IT8718F_H +#define SUPERIO_ITE_IT8718F_IT8718F_H + /* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8718_2.asp */ #define IT8718F_FDC 0x00 /* Floppy */ @@ -36,3 +39,4 @@ void it8718f_disable_reboot(void); void it8718f_enable_serial(device_t dev, u16 iobase); #endif +#endif 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 <pc80/keyboard.h> #include <uart8250.h> @@ -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 <pc80/keyboard.h> @@ -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 <pc80/keyboard.h> @@ -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 <pc80/keyboard.h> @@ -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 diff --git a/src/superio/renesas/m3885x/chip.h b/src/superio/renesas/m3885x/chip.h index b333d1744b..da2336d5df 100644 --- a/src/superio/renesas/m3885x/chip.h +++ b/src/superio/renesas/m3885x/chip.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_RENESAS_M3885X_CHIP_H +#define SUPERIO_RENESAS_M3885X_CHIP_H + #include <device/device.h> #include <pc80/keyboard.h> @@ -26,3 +29,4 @@ struct superio_renesas_m3885x_config { struct pc_keyboard keyboard; }; +#endif diff --git a/src/superio/serverengines/pilot/pilot.h b/src/superio/serverengines/pilot/pilot.h index de9ec9f832..9f48a85960 100644 --- a/src/superio/serverengines/pilot/pilot.h +++ b/src/superio/serverengines/pilot/pilot.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SERVERENGINES_PILOT_PILOT_H +#define SUPERIO_SERVERENGINES_PILOT_PILOT_H + /* PILOT Super I/O is only based on LPC observation done on factory system. */ #define PILOT_LD1 0x01 /* Logical device 1 */ @@ -26,3 +29,5 @@ #define PILOT_LD4 0x04 /* Logical device 4 */ #define PILOT_LD5 0x05 /* Logical device 5 */ #define PILOT_LD7 0x07 /* Logical device 7 */ + +#endif diff --git a/src/superio/smsc/fdc37m60x/chip.h b/src/superio/smsc/fdc37m60x/chip.h index d4da77bf13..eca6422342 100644 --- a/src/superio/smsc/fdc37m60x/chip.h +++ b/src/superio/smsc/fdc37m60x/chip.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _SUPERIO_SMSC_FDC37M60X -#define _SUPERIO_SMSC_FDC37M60X +#ifndef SUPERIO_SMSC_FDC37M60X_CHIP_H +#define SUPERIO_SMSC_FDC37M60X_CHIP_H #include <device/device.h> #include <pc80/keyboard.h> @@ -32,4 +32,4 @@ struct superio_smsc_fdc37m60x_config { struct pc_keyboard keyboard; }; -#endif /* _SUPERIO_SMSC_FDC37M60X */ +#endif diff --git a/src/superio/smsc/fdc37m60x/fdc37m60x.h b/src/superio/smsc/fdc37m60x/fdc37m60x.h index 3424faf903..22c24c73e5 100644 --- a/src/superio/smsc/fdc37m60x/fdc37m60x.h +++ b/src/superio/smsc/fdc37m60x/fdc37m60x.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_FDC37M60X_FDC37M60X_H +#define SUPERIO_SMSC_FDC37M60X_FDC37M60X_H + /* * Datasheet: * - Name: FDC37M60x Enhanced Super I/O Controller with Infrared Support. @@ -36,3 +39,5 @@ #define FDC37M60X_SP2 0x05 /* Com2 */ #define FDC37M60X_KBCK 0x07 /* Keyboard */ #define FDC37M60X_AUX 0x08 /* Auxiliary I/O */ + +#endif diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h index c486a7305a..0d8c18a8cb 100644 --- a/src/superio/smsc/fdc37n972/chip.h +++ b/src/superio/smsc/fdc37n972/chip.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _SUPERIO_SMSC_FDC37N972 -#define _SUPERIO_SMSC_FDC37N972 +#ifndef SUPERIO_SMSC_FDC37N972_CHIP_H +#define SUPERIO_SMSC_FDC37N972_CHIP_H #include <device/device.h> #include <pc80/keyboard.h> @@ -31,5 +31,5 @@ struct superio_smsc_fdc37n972_config { struct pc_keyboard keyboard; }; -#endif /* _SUPERIO_SMSC_FDC37N972 */ +#endif diff --git a/src/superio/smsc/fdc37n972/fdc37n972.h b/src/superio/smsc/fdc37n972/fdc37n972.h index 0825fc9be2..91b3410408 100644 --- a/src/superio/smsc/fdc37n972/fdc37n972.h +++ b/src/superio/smsc/fdc37n972/fdc37n972.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_FDC37N972_FDC37N972_H +#define SUPERIO_SMSC_FDC37N972_FDC37N972_H + #define FDC37N972_FDC 0x00 /* Floppy */ #define FDC37N972_PP 0x03 /* Parallel port */ #define FDC37N972_SP1 0x04 /* Serial port 1 */ @@ -26,3 +29,4 @@ #define FDC37N972_EC 0x08 /* Environmental Controller */ #define FDC37N972_MBX 0x09 /* Mailbox register */ +#endif diff --git a/src/superio/smsc/lpc47b272/chip.h b/src/superio/smsc/lpc47b272/chip.h index 85b4040dfc..b96063c7f7 100644 --- a/src/superio/smsc/lpc47b272/chip.h +++ b/src/superio/smsc/lpc47b272/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47B272_CHIP_H +#define SUPERIO_SMSC_LPC47B272_CHIP_H + struct chip_operations; extern struct chip_operations superio_smsc_lpc47b272_ops; @@ -28,3 +31,5 @@ struct superio_smsc_lpc47b272_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/smsc/lpc47b272/lpc47b272.h b/src/superio/smsc/lpc47b272/lpc47b272.h index 98639de88b..cdd0fa4865 100644 --- a/src/superio/smsc/lpc47b272/lpc47b272.h +++ b/src/superio/smsc/lpc47b272/lpc47b272.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47B272_LPC47B272_H +#define SUPERIO_SMSC_LPC47B272_LPC47B272_H + #define LPC47B272_FDC 0 /* Floppy */ #define LPC47B272_PP 3 /* Parallel Port */ #define LPC47B272_SP1 4 /* Com1 */ @@ -26,3 +29,5 @@ #define LPC47B272_RT 10 /* Runtime reg*/ #define LPC47B272_MAX_CONFIG_REGISTER 0x5F + +#endif diff --git a/src/superio/smsc/lpc47b397/chip.h b/src/superio/smsc/lpc47b397/chip.h index 321fd898f1..b18b6a556f 100644 --- a/src/superio/smsc/lpc47b397/chip.h +++ b/src/superio/smsc/lpc47b397/chip.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47B397_CHIP_H +#define SUPERIO_SMSC_LPC47B397_CHIP_H + struct chip_operations; extern struct chip_operations superio_smsc_lpc47b397_ops; @@ -30,3 +33,5 @@ struct superio_smsc_lpc47b397_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/smsc/lpc47b397/lpc47b397.h b/src/superio/smsc/lpc47b397/lpc47b397.h index 91bad4730c..e9532d9ff4 100644 --- a/src/superio/smsc/lpc47b397/lpc47b397.h +++ b/src/superio/smsc/lpc47b397/lpc47b397.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47B397_LPC47B397_H +#define SUPERIO_SMSC_LPC47B397_LPC47B397_H + #define LPC47B397_FDC 0 /* Floppy */ #define LPC47B397_PP 3 /* Parallel Port */ #define LPC47B397_SP1 4 /* Com1 */ @@ -27,3 +30,5 @@ #define LPC47B397_KBC 7 /* Keyboard & Mouse */ #define LPC47B397_HWM 8 /* HW Monitor */ #define LPC47B397_RT 10 /* Runtime reg*/ + +#endif diff --git a/src/superio/smsc/lpc47m10x/chip.h b/src/superio/smsc/lpc47m10x/chip.h index abd21be926..ace92f1c2f 100644 --- a/src/superio/smsc/lpc47m10x/chip.h +++ b/src/superio/smsc/lpc47m10x/chip.h @@ -22,6 +22,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47M10X_CHIP_H +#define SUPERIO_SMSC_LPC47M10X_CHIP_H + struct chip_operations; extern struct chip_operations superio_smsc_lpc47m10x_ops; @@ -32,3 +35,5 @@ struct superio_smsc_lpc47m10x_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/smsc/lpc47m10x/lpc47m10x.h b/src/superio/smsc/lpc47m10x/lpc47m10x.h index 2fd4ba76b4..604016c0e0 100644 --- a/src/superio/smsc/lpc47m10x/lpc47m10x.h +++ b/src/superio/smsc/lpc47m10x/lpc47m10x.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47M10X_LPC47M10X_H +#define SUPERIO_SMSC_LPC47M10X_LPC47M10X_H + #define LPC47M10X2_FDC 0 /* Floppy */ #define LPC47M10X2_PP 3 /* Parallel Port */ #define LPC47M10X2_SP1 4 /* Com1 */ @@ -30,3 +33,5 @@ #define LPC47M10X2_MPU 10 /* MPE -- who knows -- reg*/ #define LPC47M10X2_MAX_CONFIG_REGISTER 0x5F + +#endif diff --git a/src/superio/smsc/lpc47m15x/chip.h b/src/superio/smsc/lpc47m15x/chip.h index 199ffd694a..a4532bb454 100644 --- a/src/superio/smsc/lpc47m15x/chip.h +++ b/src/superio/smsc/lpc47m15x/chip.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47M15X_CHIP_H +#define SUPERIO_SMSC_LPC47M15X_CHIP_H + struct chip_operations; extern struct chip_operations superio_smsc_lpc47m15x_ops; @@ -27,3 +30,5 @@ struct superio_smsc_lpc47m15x_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/smsc/lpc47m15x/lpc47m15x.h b/src/superio/smsc/lpc47m15x/lpc47m15x.h index e469e615e5..5f62466511 100644 --- a/src/superio/smsc/lpc47m15x/lpc47m15x.h +++ b/src/superio/smsc/lpc47m15x/lpc47m15x.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47M15X_LPC47M15X_H +#define SUPERIO_SMSC_LPC47M15X_LPC47M15X_H + #define LPC47M15X_FDC 0 /* Floppy */ #define LPC47M15X_PP 3 /* Parallel Port */ #define LPC47M15X_SP1 4 /* Com1 */ @@ -27,3 +30,5 @@ #define LPC47M15X_MPU 11 /* MPE -- who knows -- reg*/ #define LPC47M15X2_MAX_CONFIG_REGISTER 0x5F + +#endif diff --git a/src/superio/smsc/lpc47n217/chip.h b/src/superio/smsc/lpc47n217/chip.h index 4369c263bd..0eda25f6b1 100644 --- a/src/superio/smsc/lpc47n217/chip.h +++ b/src/superio/smsc/lpc47n217/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47N217_CHIP_H +#define SUPERIO_SMSC_LPC47N217_CHIP_H + struct chip_operations; extern struct chip_operations superio_smsc_lpc47n217_ops; @@ -26,3 +29,5 @@ extern struct chip_operations superio_smsc_lpc47n217_ops; struct superio_smsc_lpc47n217_config { struct uart8250 com1, com2; }; + +#endif diff --git a/src/superio/smsc/lpc47n217/lpc47n217.h b/src/superio/smsc/lpc47n217/lpc47n217.h index 3795821129..e0ee010c35 100644 --- a/src/superio/smsc/lpc47n217/lpc47n217.h +++ b/src/superio/smsc/lpc47n217/lpc47n217.h @@ -18,12 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* These are arbitrary, but must match declarations in the mainboard config file. - * Values chosen to match SMSC 47B37x. - */ +#ifndef SUPERIO_SMSC_LPC47N217_LPC47N217_H +#define SUPERIO_SMSC_LPC47N217_LPC47N217_H +/* + * These are arbitrary, but must match declarations in the mainboard + * devicetree.cb file. Values chosen to match SMSC LPC47B37x. + */ #define LPC47N217_PP 3 /* Parallel Port */ #define LPC47N217_SP1 4 /* Com1 */ #define LPC47N217_SP2 5 /* Com2 */ #define LPC47N217_MAX_CONFIG_REGISTER 0x39 + +#endif diff --git a/src/superio/smsc/lpc47n227/chip.h b/src/superio/smsc/lpc47n227/chip.h index ef1030751e..b2d0a9218f 100644 --- a/src/superio/smsc/lpc47n227/chip.h +++ b/src/superio/smsc/lpc47n227/chip.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47N227_CHIP_H +#define SUPERIO_SMSC_LPC47N227_CHIP_H + #include <device/device.h> #include <pc80/keyboard.h> #include <uart8250.h> @@ -27,3 +30,5 @@ struct superio_smsc_lpc47n227_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/smsc/lpc47n227/lpc47n227.h b/src/superio/smsc/lpc47n227/lpc47n227.h index 769b5beadb..99097a497f 100644 --- a/src/superio/smsc/lpc47n227/lpc47n227.h +++ b/src/superio/smsc/lpc47n227/lpc47n227.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_LPC47N227_LPC47N227_H +#define SUPERIO_SMSC_LPC47N227_LPC47N227_H + /* * Since the LPC47N227 does not have logical devices but a flat configuration * space, these are arbitrary, but must match declarations in the mainboard @@ -28,3 +31,5 @@ #define LPC47N227_KBDC 5 /* Keyboard */ #define LPC47N227_MAX_CONFIG_REGISTER 0x39 + +#endif diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h index 7d5c4136f5..43ad168223 100644 --- a/src/superio/smsc/sio10n268/chip.h +++ b/src/superio/smsc/sio10n268/chip.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _SUPERIO_SMSC_SIO10N268 -#define _SUPERIO_SMSC_SIO10N268 +#ifndef SUPERIO_SMSC_SIO10N268_CHIP_H +#define SUPERIO_SMSC_SIO10N268_CHIP_H #include <device/device.h> #include <pc80/keyboard.h> @@ -31,5 +31,4 @@ struct superio_smsc_sio10n268_config { struct pc_keyboard keyboard; }; -#endif /* _SUPERIO_SMSC_SIO10N268 */ - +#endif diff --git a/src/superio/smsc/sio10n268/sio10n268.h b/src/superio/smsc/sio10n268/sio10n268.h index b3a635e0bf..3d868b0ec1 100644 --- a/src/superio/smsc/sio10n268/sio10n268.h +++ b/src/superio/smsc/sio10n268/sio10n268.h @@ -17,9 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -// XXX the SIO10N268 has no logical devices. +#ifndef SUPERIO_SMSC_SIO10N268_SIO10N268_H +#define SUPERIO_SMSC_SIO10N268_SIO10N268_H + +/* Note: The SIO10N268 has no logical devices. */ #define SIO10N268_FDC 0x00 /* Floppy */ #define SIO10N268_PP 0x03 /* Parallel port */ #define SIO10N268_KBDC 0x05 /* Keyboard */ +#endif diff --git a/src/superio/smsc/smscsuperio/Makefile.inc b/src/superio/smsc/smscsuperio/Makefile.inc index 209a307fb2..0dfc8d80d0 100644 --- a/src/superio/smsc/smscsuperio/Makefile.inc +++ b/src/superio/smsc/smscsuperio/Makefile.inc @@ -18,5 +18,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -#config chip.h ramstage-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += superio.c diff --git a/src/superio/smsc/smscsuperio/chip.h b/src/superio/smsc/smscsuperio/chip.h index 3f017e4464..1655eea102 100644 --- a/src/superio/smsc/smscsuperio/chip.h +++ b/src/superio/smsc/smscsuperio/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_SMSC_SMSCSUPERIO_CHIP_H +#define SUPERIO_SMSC_SMSCSUPERIO_CHIP_H + #include <device/device.h> #include <pc80/keyboard.h> #include <uart8250.h> @@ -28,3 +31,5 @@ struct superio_smsc_smscsuperio_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/via/vt1211/vt1211.h b/src/superio/via/vt1211/vt1211.h index eaffa2e993..6ce0361840 100644 --- a/src/superio/via/vt1211/vt1211.h +++ b/src/superio/via/vt1211/vt1211.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_VIA_VT1211_VT1211_H +#define SUPERIO_VIA_VT1211_VT1211_H + /* Logical device numbers (LDNs). */ #define VT1211_FDC 0x00 /* Floppy */ #define VT1211_PP 0x01 /* Parallel port */ @@ -31,3 +34,5 @@ #define VT1211_HWM 0x0b /* Hardware monitor (HM) */ #define VT1211_FIR 0x0c /* Very fast IR (VFIR/FIR) */ #define VT1211_ROM 0x0d /* Flash ROM */ + +#endif diff --git a/src/superio/winbond/w83627dhg/chip.h b/src/superio/winbond/w83627dhg/chip.h index b948ba3f1c..4aec1bf741 100644 --- a/src/superio/winbond/w83627dhg/chip.h +++ b/src/superio/winbond/w83627dhg/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83627DHG_CHIP_H +#define SUPERIO_WINBOND_W83627DHG_CHIP_H + #include <pc80/keyboard.h> #include <uart8250.h> @@ -27,3 +30,5 @@ struct superio_winbond_w83627dhg_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/winbond/w83627dhg/w83627dhg.h b/src/superio/winbond/w83627dhg/w83627dhg.h index cd74fe3397..8a1668c4dc 100644 --- a/src/superio/winbond/w83627dhg/w83627dhg.h +++ b/src/superio/winbond/w83627dhg/w83627dhg.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83627DHG_W83627DHG_H +#define SUPERIO_WINBOND_W83627DHG_W83627DHG_H + #define W83627DHG_FDC 0 /* Floppy */ #define W83627DHG_PP 1 /* Parallel port */ #define W83627DHG_SP1 2 /* Com1 */ @@ -30,3 +33,5 @@ #define W83627DHG_ACPI 10 /* ACPI */ #define W83627DHG_HWM 11 /* Hardware monitor */ #define W83627DHG_PECI_SST 12 /* PECI, SST */ + +#endif diff --git a/src/superio/winbond/w83627ehg/chip.h b/src/superio/winbond/w83627ehg/chip.h index e95365357a..21a53de4ab 100644 --- a/src/superio/winbond/w83627ehg/chip.h +++ b/src/superio/winbond/w83627ehg/chip.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83627EHG_CHIP_H +#define SUPERIO_WINBOND_W83627EHG_CHIP_H + #include <pc80/keyboard.h> #include <uart8250.h> @@ -28,3 +31,5 @@ struct superio_winbond_w83627ehg_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/winbond/w83627ehg/w83627ehg.h b/src/superio/winbond/w83627ehg/w83627ehg.h index 2ae8431a28..f03cf0672d 100644 --- a/src/superio/winbond/w83627ehg/w83627ehg.h +++ b/src/superio/winbond/w83627ehg/w83627ehg.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __SUPERIO_WINBOND_W83627EHG_W83627EHG_H -#define __SUPERIO_WINBOND_W83627EHG_W83627EHG_H +#ifndef SUPERIO_WINBOND_W83627EHG_W83627EHG_H +#define SUPERIO_WINBOND_W83627EHG_W83627EHG_H #define W83627EHG_FDC 0 /* Floppy */ #define W83627EHG_PP 1 /* Parallel Port */ diff --git a/src/superio/winbond/w83627hf/chip.h b/src/superio/winbond/w83627hf/chip.h index e8dfe2ea99..20f3d1782f 100644 --- a/src/superio/winbond/w83627hf/chip.h +++ b/src/superio/winbond/w83627hf/chip.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83627HF_CHIP_H +#define SUPERIO_WINBOND_W83627HF_CHIP_H + #include <pc80/keyboard.h> #include <uart8250.h> @@ -29,3 +32,5 @@ struct superio_winbond_w83627hf_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/winbond/w83627hf/w83627hf.h b/src/superio/winbond/w83627hf/w83627hf.h index 093084333c..cb186a90f6 100644 --- a/src/superio/winbond/w83627hf/w83627hf.h +++ b/src/superio/winbond/w83627hf/w83627hf.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __SUPERIO_WINBOND_W83627HF_W83627HF_H -#define __SUPERIO_WINBOND_W83627HF_W83627HF_H +#ifndef SUPERIO_WINBOND_W83627HF_W83627HF_H +#define SUPERIO_WINBOND_W83627HF_W83627HF_H #define W83627HF_FDC 0 /* Floppy */ #define W83627HF_PP 1 /* Parallel Port */ diff --git a/src/superio/winbond/w83627thf/chip.h b/src/superio/winbond/w83627thf/chip.h index 6f45535fa5..427c34f598 100644 --- a/src/superio/winbond/w83627thf/chip.h +++ b/src/superio/winbond/w83627thf/chip.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83627THF_CHIP_H +#define SUPERIO_WINBOND_W83627THF_CHIP_H + #include <pc80/keyboard.h> #include <uart8250.h> @@ -29,3 +32,5 @@ struct superio_winbond_w83627thf_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/winbond/w83627thf/w83627thf.h b/src/superio/winbond/w83627thf/w83627thf.h index b92234b86b..cc59b9dbb4 100644 --- a/src/superio/winbond/w83627thf/w83627thf.h +++ b/src/superio/winbond/w83627thf/w83627thf.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83627THF_W83627THF_H +#define SUPERIO_WINBOND_W83627THF_W83627THF_H + #define W83627THF_FDC 0 /* Floppy */ #define W83627THF_PP 1 /* Parallel Port */ #define W83627THF_SP1 2 /* Com1 */ @@ -31,3 +34,5 @@ #define W83627THF_GPIO3 9 #define W83627THF_ACPI 10 #define W83627THF_HWM 11 /* Hardware Monitor */ + +#endif diff --git a/src/superio/winbond/w83627thg/chip.h b/src/superio/winbond/w83627thg/chip.h index 3decc84713..30e0378d99 100644 --- a/src/superio/winbond/w83627thg/chip.h +++ b/src/superio/winbond/w83627thg/chip.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83627THG_CHIP_H +#define SUPERIO_WINBOND_W83627THG_CHIP_H + #include <pc80/keyboard.h> #include <uart8250.h> @@ -29,3 +32,5 @@ struct superio_winbond_w83627thg_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/winbond/w83627thg/w83627thg.h b/src/superio/winbond/w83627thg/w83627thg.h index 3456f80f42..a00814b6ae 100644 --- a/src/superio/winbond/w83627thg/w83627thg.h +++ b/src/superio/winbond/w83627thg/w83627thg.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83627THG_W83627THG_H +#define SUPERIO_WINBOND_W83627THG_W83627THG_H + #define W83627THG_FDC 0 /* Floppy */ #define W83627THG_PP 1 /* Parallel Port */ #define W83627THG_SP1 2 /* Com1 */ @@ -30,3 +33,5 @@ #define W83627THG_GPIO3 9 #define W83627THG_ACPI 10 #define W83627THG_HWM 11 /* Hardware Monitor */ + +#endif diff --git a/src/superio/winbond/w83627uhg/chip.h b/src/superio/winbond/w83627uhg/chip.h index fa1a653516..74a41f8feb 100644 --- a/src/superio/winbond/w83627uhg/chip.h +++ b/src/superio/winbond/w83627uhg/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $ */ +#ifndef SUPERIO_WINBOND_W83627UHG_CHIP_H +#define SUPERIO_WINBOND_W83627UHG_CHIP_H + #include <pc80/keyboard.h> #include <uart8250.h> @@ -27,3 +30,5 @@ struct superio_winbond_w83627uhg_config { struct uart8250 com1, com2, com3, com4, com5, com6; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/winbond/w83627uhg/w83627uhg.h b/src/superio/winbond/w83627uhg/w83627uhg.h index 4dd168e9e6..ca7248f9d5 100644 --- a/src/superio/winbond/w83627uhg/w83627uhg.h +++ b/src/superio/winbond/w83627uhg/w83627uhg.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $ */ +#ifndef SUPERIO_WINBOND_W83627UHG_W83627UHG_H +#define SUPERIO_WINBOND_W83627UHG_W83627UHG_H + #define W83627UHG_FDC 0 /* Floppy */ #define W83627UHG_PP 1 /* Parallel port */ #define W83627UHG_SP1 2 /* Com1 */ @@ -33,3 +36,5 @@ #define W83627UHG_SP4 13 /* Com4 */ #define W83627UHG_SP5 14 /* Com5 */ #define W83627UHG_SP6 15 /* Com6 */ + +#endif diff --git a/src/superio/winbond/w83697hf/chip.h b/src/superio/winbond/w83697hf/chip.h index 3bc316cb6a..cb7aebd9af 100644 --- a/src/superio/winbond/w83697hf/chip.h +++ b/src/superio/winbond/w83697hf/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83697HF_CHIP_H +#define SUPERIO_WINBOND_W83697HF_CHIP_H + #include <uart8250.h> extern struct chip_operations superio_winbond_w83697hf_ops; @@ -25,3 +28,5 @@ extern struct chip_operations superio_winbond_w83697hf_ops; struct superio_winbond_w83697hf_config { struct uart8250 com1, com2; }; + +#endif diff --git a/src/superio/winbond/w83697hf/w83697hf.h b/src/superio/winbond/w83697hf/w83697hf.h index 1bc1bcdf19..3e979c911d 100644 --- a/src/superio/winbond/w83697hf/w83697hf.h +++ b/src/superio/winbond/w83697hf/w83697hf.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83697HF_W83697HF_H +#define SUPERIO_WINBOND_W83697HF_W83697HF_H + #define W83697HF_FDC 0 /* Floppy */ #define W83697HF_PP 1 /* Parallel Port */ #define W83697HF_SP1 2 /* Com1 */ @@ -28,3 +31,5 @@ #define W83697HF_GPIO234 9 /* GPIO 2, 3, 4 */ #define W83697HF_ACPI 10 /* ACPI */ #define W83697HF_HWM 11 /* Hardware Monitor */ + +#endif diff --git a/src/superio/winbond/w83977f/chip.h b/src/superio/winbond/w83977f/chip.h index 5842299ed1..94a8cb694a 100644 --- a/src/superio/winbond/w83977f/chip.h +++ b/src/superio/winbond/w83977f/chip.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83977F_CHIP_H +#define SUPERIO_WINBOND_W83977F_CHIP_H + #include <pc80/keyboard.h> #include <uart8250.h> @@ -27,3 +30,5 @@ struct superio_winbond_w83977f_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/winbond/w83977f/w83977f.h b/src/superio/winbond/w83977f/w83977f.h index 0c1c626e5a..25eb1cbc7f 100644 --- a/src/superio/winbond/w83977f/w83977f.h +++ b/src/superio/winbond/w83977f/w83977f.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83977F_W83977F_H +#define SUPERIO_WINBOND_W83977F_W83977F_H + #define W83977F_FDC 0 /* Floppy */ #define W83977F_PP 1 /* Parallel Port */ #define W83977F_SP1 2 /* Com1 */ @@ -27,3 +30,5 @@ #define W83977F_IR 6 /* Infrared Port */ #define W83977F_GPIO1 7 /* General Purpose I/O 1 */ #define W83977F_GPIO2 8 /* General Purpose I/O 2 */ + +#endif diff --git a/src/superio/winbond/w83977tf/chip.h b/src/superio/winbond/w83977tf/chip.h index 62ed2833f2..1af2f94d06 100644 --- a/src/superio/winbond/w83977tf/chip.h +++ b/src/superio/winbond/w83977tf/chip.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83977TF_CHIP_H +#define SUPERIO_WINBOND_W83977TF_CHIP_H + #include <pc80/keyboard.h> #include <uart8250.h> @@ -29,3 +32,5 @@ struct superio_winbond_w83977tf_config { struct uart8250 com1, com2; struct pc_keyboard keyboard; }; + +#endif diff --git a/src/superio/winbond/w83977tf/w83977tf.h b/src/superio/winbond/w83977tf/w83977tf.h index c75fc8c8a0..2e0e9232f0 100644 --- a/src/superio/winbond/w83977tf/w83977tf.h +++ b/src/superio/winbond/w83977tf/w83977tf.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef SUPERIO_WINBOND_W83977TF_W83977TF_H +#define SUPERIO_WINBOND_W83977TF_W83977TF_H + #define W83977TF_FDC 0 /* Floppy */ #define W83977TF_PP 1 /* Parallel Port */ #define W83977TF_SP1 2 /* Com1 */ @@ -30,3 +33,5 @@ #define W83977TF_GPIO2 8 #define W83977TF_GPIO3 9 #define W83977TF_ACPI 10 + +#endif |