Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6415
-gerrit
commit 7b40d118a087a1d72f1b8d5beb027cf30cef71ba Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Wed Jul 30 13:53:04 2014 +1000
device/oprom/realmode: Sanitize header inclusion
Alphabetise includes to avoid duplication.
Change-Id: I7fa6998cd736bad2bab4a6b1a65d48a21d6220d9 Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/device/oprom/realmode/x86.c | 22 +++++++++++----------- src/device/oprom/realmode/x86.h | 2 +- src/device/oprom/realmode/x86_interrupts.c | 10 ++++++---- 3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 7dec258..fc3c40c 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -18,26 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
-#include <device/pci.h> -#include <string.h> - #include <arch/io.h> +#include <arch/interrupt.h> #include <arch/registers.h> -#include <cpu/amd/lxdef.h> -#include <cpu/amd/vr.h> +#include <boot/coreboot_tables.h> #include <cbfs.h> #include <console/console.h> -#include <arch/interrupt.h> -#include <cbfs.h> +#include <cpu/amd/lxdef.h> +#include <cpu/amd/vr.h> #include <delay.h> +#include <device/pci.h> +#include <device/pci_ids.h> +#include <lib/jpeg.h> #include <pc80/i8259.h> -#include "x86.h" +#include <string.h> #include <vbe.h> -#include <lib/jpeg.h> + /* we use x86emu's register file representation */ #include <x86emu/regs.h> -#include <boot/coreboot_tables.h> -#include <device/pci_ids.h> + +#include "x86.h"
/* The following symbols cannot be used directly. They need to be fixed up * to point to the correct address location after the code has been copied diff --git a/src/device/oprom/realmode/x86.h b/src/device/oprom/realmode/x86.h index a811a56..a0c7a90 100644 --- a/src/device/oprom/realmode/x86.h +++ b/src/device/oprom/realmode/x86.h @@ -52,4 +52,4 @@ int int12_handler(void); int int16_handler(void); int int1a_handler(void);
-#endif +#endif /* __DEVICE_OPROM_REALMODE_X86_H__ */ diff --git a/src/device/oprom/realmode/x86_interrupts.c b/src/device/oprom/realmode/x86_interrupts.c index 1ee6979..56a9b1b 100644 --- a/src/device/oprom/realmode/x86_interrupts.c +++ b/src/device/oprom/realmode/x86_interrupts.c @@ -19,17 +19,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
+#include <arch/io.h> +#include <arch/registers.h> +#include <console/console.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> #include <string.h> -#include <console/console.h> -#include <arch/io.h> -#include <arch/registers.h> -#include "x86.h" + /* we use x86emu's register file representation */ #include <x86emu/regs.h>
+#include "x86.h" + // errors go in AH. Just set these up so that word assigns // will work. KISS. enum {