[LinuxBIOS] r332 - in LinuxBIOSv3: arch/x86 include include/arch/x86 include/device lib mainboard/emulation/qemu-x86 northbridge/intel/i440bxemulation southbridge/intel/i82371eb superio/winbond/w83627hf
svn at openbios.org
svn at openbios.org
Mon May 21 08:48:56 CEST 2007
Author: uwe
Date: 2007-05-21 08:48:47 +0200 (Mon, 21 May 2007)
New Revision: 332
Modified:
LinuxBIOSv3/arch/x86/macros.h
LinuxBIOSv3/arch/x86/mtrr.h
LinuxBIOSv3/include/arch/x86/archelf.h
LinuxBIOSv3/include/arch/x86/byteorder.h
LinuxBIOSv3/include/arch/x86/div64.h
LinuxBIOSv3/include/arch/x86/hlt.h
LinuxBIOSv3/include/arch/x86/io.h
LinuxBIOSv3/include/arch/x86/pci_ops.h
LinuxBIOSv3/include/arch/x86/pciconf.h
LinuxBIOSv3/include/arch/x86/swab.h
LinuxBIOSv3/include/arch/x86/types.h
LinuxBIOSv3/include/console.h
LinuxBIOSv3/include/device/agp.h
LinuxBIOSv3/include/device/cardbus.h
LinuxBIOSv3/include/device/device.h
LinuxBIOSv3/include/device/hypertransport.h
LinuxBIOSv3/include/device/hypertransport_def.h
LinuxBIOSv3/include/device/path.h
LinuxBIOSv3/include/device/pci.h
LinuxBIOSv3/include/device/pci_def.h
LinuxBIOSv3/include/device/pci_ids.h
LinuxBIOSv3/include/device/pci_ops.h
LinuxBIOSv3/include/device/pci_rom.h
LinuxBIOSv3/include/device/pcie.h
LinuxBIOSv3/include/device/pcix.h
LinuxBIOSv3/include/device/pnp_def.h
LinuxBIOSv3/include/device/resource.h
LinuxBIOSv3/include/device/smbus.h
LinuxBIOSv3/include/device/smbus_def.h
LinuxBIOSv3/include/elf.h
LinuxBIOSv3/include/elf_boot.h
LinuxBIOSv3/include/isa-dma.h
LinuxBIOSv3/include/keyboard.h
LinuxBIOSv3/include/lar.h
LinuxBIOSv3/include/lib.h
LinuxBIOSv3/include/mc146818rtc.h
LinuxBIOSv3/include/tables.h
LinuxBIOSv3/include/uart8250.h
LinuxBIOSv3/lib/lzmadecode.h
LinuxBIOSv3/mainboard/emulation/qemu-x86/config.h
LinuxBIOSv3/northbridge/intel/i440bxemulation/config.h
LinuxBIOSv3/northbridge/intel/i440bxemulation/i440bx.h
LinuxBIOSv3/southbridge/intel/i82371eb/config.h
LinuxBIOSv3/superio/winbond/w83627hf/chip.h
LinuxBIOSv3/superio/winbond/w83627hf/w83627hf.h
Log:
Use the same naming convention and placement for "include guards" in
all header files.
This closes #40, as I think we don't need to invest time to fix this in
LinuxBIOSv2, but only in LinuxBIOSv3.
Signed-off-by: Uwe Hermann <uwe at hermann-uwe.de>
Acked-by: Ronald G. Minnich <rminnich at gmail.com>
Modified: LinuxBIOSv3/arch/x86/macros.h
===================================================================
--- LinuxBIOSv3/arch/x86/macros.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/arch/x86/macros.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef X86_MACROS_H
-#define X86_MACROS_H 1
+#ifndef ARCH_X86_MACROS_H
+#define ARCH_X86_MACROS_H
#define port80_post(value) \
movb $value, %al; \
outb %al, $0x80
-#endif
+#endif /* ARCH_X86_MACROS_H */
Modified: LinuxBIOSv3/arch/x86/mtrr.h
===================================================================
--- LinuxBIOSv3/arch/x86/mtrr.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/arch/x86/mtrr.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -1,5 +1,5 @@
-#ifndef CPU_X86_MTRR_H
-#define CPU_X86_MTRR_H
+#ifndef ARCH_X86_MTRR_H
+#define ARCH_X86_MTRR_H
/* These are the region types */
#define MTRR_TYPE_UNCACHEABLE 0
@@ -38,4 +38,4 @@
#endif
-#endif /* CPU_X86_MTRR_H */
+#endif /* ARCH_X86_MTRR_H */
Modified: LinuxBIOSv3/include/arch/x86/archelf.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/archelf.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/archelf.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -1,8 +1,8 @@
-#ifndef CPU_GENERIC_X86_ARCH_ELF_H
-#define CPU_GENERIC_X86_ARCH_ELF_H
+#ifndef ARCH_X86_ARCHELF_H
+#define ARCH_X86_ARCHELF_H
#define ELF_CLASS ELFCLASS32
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
-#endif /* CPU_GENERIC_X86_ARCH_ELF_H */
+#endif /* ARCH_X86_ARCHELF_H */
Modified: LinuxBIOSv3/include/arch/x86/byteorder.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/byteorder.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/byteorder.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,9 +14,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _BYTEORDER_H
-#define _BYTEORDER_H
+#ifndef ARCH_X86_BYTEORDER_H
+#define ARCH_X86_BYTEORDER_H
+
#define __LITTLE_ENDIAN 1234
#include <swab.h>
@@ -30,4 +31,4 @@
#define cpu_to_be16(x) swab16((x))
#define be16_to_cpu(x) swab16((x))
-#endif /* _BYTEORDER_H */
+#endif /* ARCH_X86_BYTEORDER_H */
Modified: LinuxBIOSv3/include/arch/x86/div64.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/div64.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/div64.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -4,8 +4,8 @@
* It was taken from the Linux kernel, include/asm-i386/div64.h.
*/
-#ifndef __I386_DIV64
-#define __I386_DIV64
+#ifndef ARCH_X86_DIV64_H
+#define ARCH_X86_DIV64_H
/*
* do_div() is NOT a C function. It wants to return
@@ -51,4 +51,5 @@
return dum2;
}
-#endif
+
+#endif /* ARCH_X86_DIV64_H */
Modified: LinuxBIOSv3/include/arch/x86/hlt.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/hlt.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/hlt.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef ARCH_HLT_H
-#define ARCH_HLT_H
+#ifndef ARCH_X86_HLT_H
+#define ARCH_X86_HLT_H
static inline __attribute__((always_inline)) void hlt(void)
{
asm("hlt");
}
-#endif
+#endif /* ARCH_X86_HLT_H */
Modified: LinuxBIOSv3/include/arch/x86/io.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/io.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/io.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,8 +14,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _ARCH_IO_H
-#define _ARCH_IO_H
+#ifndef ARCH_X86_IO_H
+#define ARCH_X86_IO_H
#include <types.h>
@@ -147,5 +147,4 @@
return *(volatile u32 *) addr;
}
-#endif
-
+#endif /* ARCH_X86_IO_H */
Modified: LinuxBIOSv3/include/arch/x86/pci_ops.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/pci_ops.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/pci_ops.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -13,9 +13,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef ARCH_I386_PCI_OPS_H
-#define ARCH_I386_PCI_OPS_H
+#ifndef ARCH_X86_PCI_OPS_H
+#define ARCH_X86_PCI_OPS_H
+
extern struct pci_bus_operations pci_cf8_conf1;
extern struct pci_bus_operations pci_cf8_conf2;
@@ -25,4 +26,4 @@
void pci_set_method(struct device * dev);
-#endif /* ARCH_I386_PCI_OPS_H */
+#endif /* ARCH_X86_PCI_OPS_H */
Modified: LinuxBIOSv3/include/arch/x86/pciconf.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/pciconf.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/pciconf.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -1,3 +1,6 @@
+#ifndef ARCH_X86_PCICONF_H
+#define ARCH_X86_PCICONF_H
+
#ifndef PCI_CONF_REG_INDEX
// These are defined in the PCI spec, and hence are theoretically
@@ -15,3 +18,5 @@
#endif
#define CONFIG_ADDR(bus,devfn,where) (((bus) << 16) | ((devfn) << 8) | (where))
#endif
+
+#endif /* ARCH_X86_PCICONF_H */
Modified: LinuxBIOSv3/include/arch/x86/swab.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/swab.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/swab.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -4,8 +4,8 @@
* It is based on include/linux/byteorder/swab.h from the Linux kernel.
*/
-#ifndef _SWAB_H
-#define _SWAB_H
+#ifndef ARCH_X86_SWAB_H
+#define ARCH_X86_SWAB_H
/*
* linux/byteorder/swab.h
@@ -36,4 +36,4 @@
(((unsigned int)(x) & (unsigned int)0x00ff0000UL) >> 8) | \
(((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24) ))
-#endif /* _SWAB_H */
+#endif /* ARCH_X86_SWAB_H */
Modified: LinuxBIOSv3/include/arch/x86/types.h
===================================================================
--- LinuxBIOSv3/include/arch/x86/types.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/arch/x86/types.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -2,8 +2,8 @@
* Generic data types.
*/
-#ifndef _ARCH_TYPES_H
-#define _ARCH_TYPES_H
+#ifndef ARCH_X86_TYPES_H
+#define ARCH_X86_TYPES_H
typedef unsigned long long u64;
typedef unsigned int u32;
@@ -19,4 +19,4 @@
#define NULL ((void *)0)
-#endif
+#endif /* ARCH_X86_TYPES_H */
Modified: LinuxBIOSv3/include/console.h
===================================================================
--- LinuxBIOSv3/include/console.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/console.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,8 +14,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef CONSOLE_CONSOLE_H_
-#define CONSOLE_CONSOLE_H_
+#ifndef CONSOLE_H
+#define CONSOLE_H
#include <types.h>
@@ -54,5 +54,4 @@
//
int printk(int msg_level, const char *fmt, ...);
-
-#endif /* CONSOLE_CONSOLE_H_ */
+#endif /* CONSOLE_H */
Modified: LinuxBIOSv3/include/device/agp.h
===================================================================
--- LinuxBIOSv3/include/device/agp.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/agp.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -1,5 +1,3 @@
-#ifndef DEVICE_AGP_H
-#define DEVICE_AGP_H
/* (c) 2005 Linux Networx GPL see COPYING for details */
/*
This program is free software; you can redistribute it and/or modify
@@ -18,11 +16,13 @@
*/
+#ifndef DEVICE_AGP_H
+#define DEVICE_AGP_H
+
unsigned int agp_scan_bus(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max);
unsigned int agp_scan_bridge(struct device *dev, unsigned int max);
extern struct device_operations default_agp_ops_bus;
-
#endif /* DEVICE_AGP_H */
Modified: LinuxBIOSv3/include/device/cardbus.h
===================================================================
--- LinuxBIOSv3/include/device/cardbus.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/cardbus.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -1,5 +1,3 @@
-#ifndef DEVICE_CARDBUS_H
-#define DEVICE_CARDBUS_H
/* (c) 2005 Linux Networx GPL see COPYING for details */
/*
This program is free software; you can redistribute it and/or modify
@@ -17,6 +15,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#ifndef DEVICE_CARDBUS_H
+#define DEVICE_CARDBUS_H
+
void cardbus_read_resources(struct device *dev);
unsigned int cardbus_scan_bus(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max);
Modified: LinuxBIOSv3/include/device/device.h
===================================================================
--- LinuxBIOSv3/include/device/device.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/device.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef DEVICE_H
-#define DEVICE_H
+#ifndef DEVICE_DEVICE_H
+#define DEVICE_DEVICE_H
#include <types.h>
#include <device/resource.h>
@@ -276,4 +276,4 @@
unsigned int dev_phase3(struct device * bus, unsigned int max);
void dev_phase5(struct device *dev);
-#endif /* DEVICE_H */
+#endif /* DEVICE_DEVICE_H */
Modified: LinuxBIOSv3/include/device/hypertransport.h
===================================================================
--- LinuxBIOSv3/include/device/hypertransport.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/hypertransport.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,6 +14,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef DEVICE_HYPERTRANSPORT_H
#define DEVICE_HYPERTRANSPORT_H
Modified: LinuxBIOSv3/include/device/hypertransport_def.h
===================================================================
--- LinuxBIOSv3/include/device/hypertransport_def.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/hypertransport_def.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,6 +14,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef DEVICE_HYPERTRANSPORT_DEF_H
#define DEVICE_HYPERTRANSPORT_DEF_H
Modified: LinuxBIOSv3/include/device/path.h
===================================================================
--- LinuxBIOSv3/include/device/path.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/path.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,6 +14,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef DEVICE_PATH_H
#define DEVICE_PATH_H
Modified: LinuxBIOSv3/include/device/pci.h
===================================================================
--- LinuxBIOSv3/include/device/pci.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/pci.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -20,6 +20,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef DEVICE_PCI_H
+#define DEVICE_PCI_H
+
+#include <types.h>
+#include <device/pci_def.h>
+#include <device/resource.h>
+#include <device/device.h>
+#include <device/pci_ops.h>
+#include <device/pci_rom.h>
+
/*
* For more information, please consult the following manuals (look at
* http://www.pcisig.com/ for how to get them):
@@ -30,16 +40,6 @@
* PCI System Design Guide
*/
-#ifndef PCI_H
-#define PCI_H
-
-#include <types.h>
-#include <device/pci_def.h>
-#include <device/resource.h>
-#include <device/device.h>
-#include <device/pci_ops.h>
-#include <device/pci_rom.h>
-
/* Common pci operations without a standard interface */
struct pci_operations {
/* set the Subsystem IDs for the PCI device */
@@ -119,4 +119,4 @@
return bops;
}
-#endif /* PCI_H */
+#endif /* DEVICE_PCI_H */
Modified: LinuxBIOSv3/include/device/pci_def.h
===================================================================
--- LinuxBIOSv3/include/device/pci_def.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/pci_def.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,9 +14,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PCI_DEF_H
-#define PCI_DEF_H
+#ifndef DEVICE_PCI_DEF_H
+#define DEVICE_PCI_DEF_H
+
/*
* Under PCI, each device has 256 bytes of configuration address space,
* of which the first 64 bytes are standardized as follows:
@@ -481,4 +482,4 @@
#define PCI_FUNC(devfn) ((devfn) & 0x07)
#define PCI_BDF(bus,dev,func) ((bus) << 16 | (dev) << 11 | (func) << 8)
-#endif /* PCI_DEF_H */
+#endif /* DEVICE_PCI_DEF_H */
Modified: LinuxBIOSv3/include/device/pci_ids.h
===================================================================
--- LinuxBIOSv3/include/device/pci_ids.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/pci_ids.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -8,6 +8,9 @@
* The 'Device classes and subclasses' section is copied from the Linux file.
*/
+#ifndef DEVICE_PCI_IDS_H
+#define DEVICE_PCI_IDS_H
+
/*
* PCI Class, Vendor and Device IDs
*
@@ -145,3 +148,4 @@
#define PCI_VENDOR_ID_AMD 0x1022
+#endif /* DEVICE_PCI_IDS_H */
Modified: LinuxBIOSv3/include/device/pci_ops.h
===================================================================
--- LinuxBIOSv3/include/device/pci_ops.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/pci_ops.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,9 +14,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PCI_OPS_H
-#define PCI_OPS_H
+#ifndef DEVICE_PCI_OPS_H
+#define DEVICE_PCI_OPS_H
+
#include <types.h>
#include <device/device.h>
#include <pci_ops.h>
@@ -28,4 +29,4 @@
void pci_write_config16(struct device * dev, unsigned where, u16 val);
void pci_write_config32(struct device * dev, unsigned where, u32 val);
-#endif /* PCI_OPS_H */
+#endif /* DEVICE_PCI_OPS_H */
Modified: LinuxBIOSv3/include/device/pci_rom.h
===================================================================
--- LinuxBIOSv3/include/device/pci_rom.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/pci_rom.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,8 +14,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PCI_ROM_H
-#define PCI_ROM_H
+#ifndef DEVICE_PCI_ROM_H
+#define DEVICE_PCI_ROM_H
+
#include <types.h>
#include <byteorder.h>
@@ -54,4 +55,4 @@
extern void pci_dev_init(struct device *dev);
-#endif
+#endif /* DEVICE_PCI_ROM_H */
Modified: LinuxBIOSv3/include/device/pcie.h
===================================================================
--- LinuxBIOSv3/include/device/pcie.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/pcie.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,9 +14,11 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+/* (c) 2005 Linux Networx GPL see COPYING for details */
+
#ifndef DEVICE_PCIE_H
#define DEVICE_PCIE_H
-/* (c) 2005 Linux Networx GPL see COPYING for details */
unsigned int pcie_scan_bus(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max);
Modified: LinuxBIOSv3/include/device/pcix.h
===================================================================
--- LinuxBIOSv3/include/device/pcix.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/pcix.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,8 +14,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef DEVICE_PCIX_H
#define DEVICE_PCIX_H
+
/* (c) 2005 Linux Networx GPL see COPYING for details */
unsigned int pcix_scan_bus(struct bus *bus,
Modified: LinuxBIOSv3/include/device/pnp_def.h
===================================================================
--- LinuxBIOSv3/include/device/pnp_def.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/pnp_def.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,6 +14,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef DEVICE_PNP_DEF_H
#define DEVICE_PNP_DEF_H
@@ -26,5 +27,4 @@
#define PNP_IDX_DRQ0 0x74
#define PNP_IDX_DRQ1 0x75
-
#endif /* DEVICE_PNP_DEF_H */
Modified: LinuxBIOSv3/include/device/resource.h
===================================================================
--- LinuxBIOSv3/include/device/resource.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/resource.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,9 +14,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RESOURCE_H
-#define RESOURCE_H
+#ifndef DEVICE_RESOURCE_H
+#define DEVICE_RESOURCE_H
+
#include <types.h>
#define IORESOURCE_BITS 0x000000ff /* Bus-specific bits */
@@ -117,4 +118,4 @@
#define RESOURCE_TYPE_MAX 20
extern const char *resource_type(struct resource *resource);
-#endif /* RESOURCE_H */
+#endif /* DEVICE_RESOURCE_H */
Modified: LinuxBIOSv3/include/device/smbus.h
===================================================================
--- LinuxBIOSv3/include/device/smbus.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/smbus.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,6 +14,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef DEVICE_SMBUS_H
#define DEVICE_SMBUS_H
@@ -61,5 +62,4 @@
int smbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buffer);
int smbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buffer);
-
#endif /* DEVICE_SMBUS_H */
Modified: LinuxBIOSv3/include/device/smbus_def.h
===================================================================
--- LinuxBIOSv3/include/device/smbus_def.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/device/smbus_def.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -14,6 +14,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef DEVICE_SMBUS_DEF_H
#define DEVICE_SMBUS_DEF_H
Modified: LinuxBIOSv3/include/elf.h
===================================================================
--- LinuxBIOSv3/include/elf.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/elf.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -24,11 +24,11 @@
* You should have received a copy of the GNU Lesser General Public
* License along with the GNU C Library; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
+ * 02111-1307 USA.
*/
-#ifndef _ELF_H
-#define _ELF_H 1
+#ifndef ELF_H
+#define ELF_H
#include <types.h>
#include <archelf.h>
@@ -2632,4 +2632,4 @@
#define BOOTLOADER "elfboot"
#define BOOTLOADER_VERSION "1.3"
-#endif /* elf.h */
+#endif /* ELF_H */
Modified: LinuxBIOSv3/include/elf_boot.h
===================================================================
--- LinuxBIOSv3/include/elf_boot.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/elf_boot.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -16,7 +16,6 @@
*
*/
-
#ifndef ELF_BOOT_H
#define ELF_BOOT_H
@@ -104,5 +103,4 @@
#define LIN_INITRD_SIZE 0x00000005
/* Size of the ramdisk in bytes */
-
#endif /* ELF_BOOT_H */
Modified: LinuxBIOSv3/include/isa-dma.h
===================================================================
--- LinuxBIOSv3/include/isa-dma.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/isa-dma.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -17,10 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __ISA_DMA_H
-#define __ISA_DMA_H
+#ifndef ISA_DMA_H
+#define ISA_DMA_H
/* This function is called in the southbridge code. */
void isa_dma_init(void);
-#endif
+#endif /* ISA_DMA_H */
Modified: LinuxBIOSv3/include/keyboard.h
===================================================================
--- LinuxBIOSv3/include/keyboard.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/keyboard.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __KEYBOARD_H
-#define __KEYBOARD_H
+#ifndef KEYBOARD_H
+#define KEYBOARD_H
/* TODO: This structure should contain typematic settings, but LinuxBIOS
* does not care yet.
@@ -30,4 +30,4 @@
void init_pc_keyboard(unsigned int port0, unsigned int port1,
struct pc_keyboard *kbd);
-#endif
+#endif /* KEYBOARD_H */
Modified: LinuxBIOSv3/include/lar.h
===================================================================
--- LinuxBIOSv3/include/lar.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/lar.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -47,6 +47,9 @@
* ---------------------------------------------------------------------------
*/
+#ifndef LAR_H
+#define LAR_H
+
#include <types.h>
#define MAGIC "LARCHIVE"
@@ -68,3 +71,5 @@
int find_file(struct mem_file *archive, char *filename, struct mem_file *result);
int copy_file(struct mem_file *archive, char *filename, void *where);
int run_file(struct mem_file *archive, char *filename, void *where);
+
+#endif /* LAR_H */
Modified: LinuxBIOSv3/include/lib.h
===================================================================
--- LinuxBIOSv3/include/lib.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/lib.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -30,4 +30,4 @@
void beep_short(void);
void beep_long(void);
-#endif
+#endif /* LIB_H */
Modified: LinuxBIOSv3/include/mc146818rtc.h
===================================================================
--- LinuxBIOSv3/include/mc146818rtc.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/mc146818rtc.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -117,5 +117,4 @@
int get_option(void *dest, char *name);
int last_boot_normal(void);
-
-#endif /* MC146818RTC_H */
+#endif /* MC146818RTC_H */
Modified: LinuxBIOSv3/include/tables.h
===================================================================
--- LinuxBIOSv3/include/tables.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/tables.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -261,5 +261,4 @@
struct cmos_option_table *get_option_table(void);
-
#endif /* TABLES_H */
Modified: LinuxBIOSv3/include/uart8250.h
===================================================================
--- LinuxBIOSv3/include/uart8250.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/include/uart8250.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -45,4 +45,4 @@
void uart8250_tx_byte(unsigned base_port, unsigned char data);
void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs);
-#endif /* UART8250_H */
+#endif /* UART8250_H */
Modified: LinuxBIOSv3/lib/lzmadecode.h
===================================================================
--- LinuxBIOSv3/lib/lzmadecode.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/lib/lzmadecode.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -19,8 +19,8 @@
to this file, however, are subject to the LGPL or CPL terms.
*/
-#ifndef __LZMADECODE_H
-#define __LZMADECODE_H
+#ifndef LZMADECODE_H
+#define LZMADECODE_H
typedef unsigned char Byte;
typedef unsigned short UInt16;
@@ -64,4 +64,4 @@
const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed);
-#endif
+#endif /* LZMADECODE_H */
Modified: LinuxBIOSv3/mainboard/emulation/qemu-x86/config.h
===================================================================
--- LinuxBIOSv3/mainboard/emulation/qemu-x86/config.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/mainboard/emulation/qemu-x86/config.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -1,3 +1,8 @@
+#ifndef MAINBOARD_EMULATION_QEMU_X86_CONFIG_H
+#define MAINBOARD_EMULATION_QEMU_X86_CONFIG_H
+
struct mainboard_emulation_qemu_x86_config {
int nothing;
};
+
+#endif /* MAINBOARD_EMULATION_QEMU_X86_CONFIG_H */
Modified: LinuxBIOSv3/northbridge/intel/i440bxemulation/config.h
===================================================================
--- LinuxBIOSv3/northbridge/intel/i440bxemulation/config.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/northbridge/intel/i440bxemulation/config.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef NORTHBRIDGE_INTEL_I440BXEMULATION_CONFIG_H
+#define NORTHBRIDGE_INTEL_I440BXEMULATION_CONFIG_H
+
extern struct device_operations i440bxemulation_pcidomainops;
extern struct constructor i440bx_constructors[];
@@ -27,3 +30,5 @@
*/
int ramsize;
};
+
+#endif /* NORTHBRIDGE_INTEL_I440BXEMULATION_CONFIG_H */
Modified: LinuxBIOSv3/northbridge/intel/i440bxemulation/i440bx.h
===================================================================
--- LinuxBIOSv3/northbridge/intel/i440bxemulation/i440bx.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/northbridge/intel/i440bxemulation/i440bx.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef NORTHBRIDGE_INTEL_I440BXEMULATION_I440BX_H
+#define NORTHBRIDGE_INTEL_I440BXEMULATION_I440BX_H
+
/*
* Datasheet:
* - Name: Intel 440BX AGPset: 82443BX Host Bridge/Controller
@@ -89,3 +92,4 @@
unsigned int i440bx_scan_root_bus(struct device *root, unsigned int max);
+#endif /* NORTHBRIDGE_INTEL_I440BXEMULATION_I440BX_H */
Modified: LinuxBIOSv3/southbridge/intel/i82371eb/config.h
===================================================================
--- LinuxBIOSv3/southbridge/intel/i82371eb/config.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/southbridge/intel/i82371eb/config.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -20,9 +20,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef SOUTHBRIDGE_INTEL_I82371EB_CONFIG_H
+#define SOUTHBRIDGE_INTEL_I82371EB_CONFIG_H
+
extern struct constructor i82371eb_constructors[];
struct southbridge_intel_i82371eb_config {
unsigned int ide0_enable : 1;
unsigned int ide1_enable : 1;
};
+
+#endif /* SOUTHBRIDGE_INTEL_I82371EB_CONFIG_H */
Modified: LinuxBIOSv3/superio/winbond/w83627hf/chip.h
===================================================================
--- LinuxBIOSv3/superio/winbond/w83627hf/chip.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/superio/winbond/w83627hf/chip.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -1,3 +1,6 @@
+#ifndef SUPERIO_WINBOND_W83627HF_CHIP_H
+#define SUPERIO_WINBOND_W83627HF_CHIP_H
+
#include <keyboard.h>
#include <uart8250.h>
@@ -5,3 +8,5 @@
int com1_baud, com2_baud;
struct pc_keyboard keyboard;
};
+
+#endif /* SUPERIO_WINBOND_W83627HF_CHIP_H */
Modified: LinuxBIOSv3/superio/winbond/w83627hf/w83627hf.h
===================================================================
--- LinuxBIOSv3/superio/winbond/w83627hf/w83627hf.h 2007-05-21 06:23:28 UTC (rev 331)
+++ LinuxBIOSv3/superio/winbond/w83627hf/w83627hf.h 2007-05-21 06:48:47 UTC (rev 332)
@@ -1,3 +1,6 @@
+#ifndef SUPERIO_WINBOND_W83627HF_W83627HF_H
+#define SUPERIO_WINBOND_W83627HF_W83627HF_H
+
#define W83627HF_FDC 0 /* Floppy */
#define W83627HF_PP 1 /* Parallel Port */
#define W83627HF_SP1 2 /* Com1 */
@@ -88,4 +91,4 @@
#define W83627HF_XSCNF 0x15
#define W83627HF_XWBCNF 0x16
-
+#endif /* SUPERIO_WINBOND_W83627HF_W83627HF_H */
More information about the coreboot
mailing list