1. Move run_bios prototype to device.h

2. Use time.h for get_time() and move tb_freq into functions.c
3. Move read_io and write_io to io.c and make them static
4. Make a couple of functions static in interrupt.c
5. Refactor a cast from char[] to u64 to get rid of potential alignment problems and a warning

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5191 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index aeb03c7eee6ba8d5d9e8046aba5c0356c65ad447..b5088c1080e871588930e7a19dc7f0c1f22badfc 100644 (file)
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -652,7 +652,6 @@ void pci_dev_set_subsystem(struct device *dev, unsigned vendor, unsigned device)
 void pci_dev_init(struct device *dev)
 {
 #if CONFIG_PCI_ROM_RUN == 1 || CONFIG_VGA_ROM_RUN == 1
-       void run_bios(struct device *dev, unsigned long addr);
        struct rom_header *rom, *ram;
 
        if (CONFIG_PCI_ROM_RUN != 1 && /* Only execute VGA ROMs. */

diff --git a/src/include/device/device.h b/src/include/device/device.h
index d0cc370980462639e3e724a81d9900a39ad9cb56..df8fb5f6d5564e4d06bde07c46a040b2fcdb0a09 100644 (file)
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -117,6 +117,9 @@ const char *bus_path(struct bus *bus);
 void dev_set_enabled(device_t dev, int enable);
 void disable_children(struct bus *bus);
 
+/* Option ROM helper functions */
+void run_bios(struct device *dev, unsigned long addr);
+
 /* Helper functions */
 device_t find_dev_path(struct bus *parent, struct device_path *path);
 device_t alloc_find_dev(struct bus *parent, struct device_path *path);

diff --git a/util/x86emu/yabel/compat/functions.c b/util/x86emu/yabel/compat/functions.c
index 4d1f1e4fda68cf699f42b0b30bebb902bee56f16..6367fb025d574898296edbb72e3e1070dd21da9a 100644 (file)
--- a/util/x86emu/yabel/compat/functions.c
+++ b/util/x86emu/yabel/compat/functions.c
@@ -18,6 +18,7 @@
 #include <device/device.h>
 #include "../debug.h"
 #include "../biosemu.h"
+#include "../compat/time.h"
 
 #define VMEM_SIZE (1024 * 1024) /* 1 MB */
 
@@ -52,6 +53,8 @@ void run_bios(struct device * dev, unsigned long addr)
        }
 }
 
+unsigned long tb_freq = 0;
+
 u64 get_time(void)
 {
     u64 act;
@@ -64,50 +67,3 @@ u64 get_time(void)
     act = ((u64) edx << 32) | eax; 
     return act;
 }
-
-unsigned int
-read_io(void *addr, size_t sz)
-{
-        unsigned int ret;
-       /* since we are using inb instructions, we need the port number as 16bit value */
-       u16 port = (u16)(u32) addr;
-
-        switch (sz) {
-        case 1:
-               asm volatile ("inb %1, %b0" : "=a"(ret) : "d" (port));
-                break;
-        case 2:
-               asm volatile ("inw %1, %w0" : "=a"(ret) : "d" (port));
-                break;
-        case 4:
-               asm volatile ("inl %1, %0" : "=a"(ret) : "d" (port));
-                break;
-        default:
-                ret = 0;
-        }
-
-        return ret;
-}
-
-int
-write_io(void *addr, unsigned int value, size_t sz)
-{
-       u16 port = (u16)(u32) addr;
-        switch (sz) {
-       /* since we are using inb instructions, we need the port number as 16bit value */
-        case 1:
-               asm volatile ("outb %b0, %1" : : "a"(value), "d" (port));
-                break;
-        case 2:
-               asm volatile ("outw %w0, %1" : : "a"(value), "d" (port));
-                break;
-        case 4:
-               asm volatile ("outl %0, %1" : : "a"(value), "d" (port));
-                break;
-        default:
-                return -1;
-        }
-
-        return 0;
-}
-

diff --git a/util/x86emu/yabel/compat/time.h b/util/x86emu/yabel/compat/time.h
index c8432eca43fa31913139cf895a54686cebd8ba2f..6f7099bd867231f814794e3f88d81934fa26e6c9 100644 (file)
--- a/util/x86emu/yabel/compat/time.h
+++ b/util/x86emu/yabel/compat/time.h
@@ -13,5 +13,6 @@
 #define _BIOSEMU_COMPAT_TIME_H
 
 /* TODO: check how this works in x86 */
-static unsigned long tb_freq = 0;
+extern unsigned long tb_freq;
+u64 get_time(void);
 #endif 

diff --git a/util/x86emu/yabel/interrupt.c b/util/x86emu/yabel/interrupt.c
index 9dc33fa8d1ced5a7541d0468bcbc36c7405cad8e..9a796005bb97650d365d66bfd91994852c78a6f6 100644 (file)
--- a/util/x86emu/yabel/interrupt.c
+++ b/util/x86emu/yabel/interrupt.c
@@ -31,7 +31,7 @@
 
 
 //setup to run the code at the address, that the Interrupt Vector points to...
-void
+static void
 setupInt(int intNum)
 {
        DEBUG_PRINTF_INTR("%s(%x): executing interrupt handler @%08x\n",
@@ -50,7 +50,7 @@ setupInt(int intNum)
 }
 
 // handle int10 (VGA BIOS Interrupt)
-void
+static void
 handleInt10(void)
 {
        // the data for INT10 is stored in BDA (0000:0400h) offset 49h-66h
@@ -207,7 +207,7 @@ static u8 keycode_table[256] = {
 
 ;
 
-void
+static void
 translate_keycode(u64 * keycode)
 {
        u8 scan_code = 0;
@@ -233,7 +233,7 @@ translate_keycode(u64 * keycode)
 }
 
 // handle int16 (Keyboard BIOS Interrupt)
-void
+static void
 handleInt16(void)
 {
        // keyboard buffer is in BIOS Memory Area:
@@ -319,7 +319,7 @@ handleInt16(void)
 }
 
 // handle int1a (PCI BIOS Interrupt)
-void
+static void
 handleInt1a(void)
 {
        // function number in AX

diff --git a/util/x86emu/yabel/io.c b/util/x86emu/yabel/io.c
index 6d36e8078fe92e5bd1c1edc9ba3227bf1622b83d..38a5d32c7cd37121d39a42d8df2a19d7379b89e7 100644 (file)
--- a/util/x86emu/yabel/io.c
+++ b/util/x86emu/yabel/io.c
@@ -24,12 +24,51 @@
 #include <device/pci_ops.h>
 #endif
 
-// those are defined in net-snk/oflib/pci.c
-extern unsigned int read_io(void *, size_t);
-extern int write_io(void *, unsigned int, size_t);
+static unsigned int
+read_io(void *addr, size_t sz)
+{
+        unsigned int ret;
+       /* since we are using inb instructions, we need the port number as 16bit value */
+       u16 port = (u16)(u32) addr;
+
+        switch (sz) {
+        case 1:
+               asm volatile ("inb %1, %b0" : "=a"(ret) : "d" (port));
+                break;
+        case 2:
+               asm volatile ("inw %1, %w0" : "=a"(ret) : "d" (port));
+                break;
+        case 4:
+               asm volatile ("inl %1, %0" : "=a"(ret) : "d" (port));
+                break;
+        default:
+                ret = 0;
+        }
+
+        return ret;
+}
 
-//defined in net-snk/kernel/timer.c
-extern u64 get_time(void);
+static int
+write_io(void *addr, unsigned int value, size_t sz)
+{
+       u16 port = (u16)(u32) addr;
+        switch (sz) {
+       /* since we are using inb instructions, we need the port number as 16bit value */
+        case 1:
+               asm volatile ("outb %b0, %1" : : "a"(value), "d" (port));
+                break;
+        case 2:
+               asm volatile ("outw %w0, %1" : : "a"(value), "d" (port));
+                break;
+        case 4:
+               asm volatile ("outl %0, %1" : : "a"(value), "d" (port));
+                break;
+        default:
+                return -1;
+        }
+
+        return 0;
+}
 
 #ifdef CONFIG_ARCH_X86
 #include <arch/io.h>

diff --git a/util/x86emu/yabel/mem.c b/util/x86emu/yabel/mem.c
index c04f56bfacf71e263addb515b746438a4267836f..8bcc9e12c2feaddaea41214bc31751b66c455492 100644 (file)
--- a/util/x86emu/yabel/mem.c
+++ b/util/x86emu/yabel/mem.c
@@ -159,9 +159,6 @@ u32 ebda_size;
 #define DEBUG_CHECK_VMEM_WRITE(_addr, _val)
 #endif
 
-//defined in net-snk/kernel/timer.c
-extern u64 get_time(void);
-
 void update_time(u32);
 
 #if !defined(CONFIG_YABEL_DIRECTHW) || (!CONFIG_YABEL_DIRECTHW)

diff --git a/util/x86emu/yabel/vbe.c b/util/x86emu/yabel/vbe.c
index 11a1ece73d68e697f6aa865ff0d3e1a67a38ecb1..6326a9c214487181daf3d1291b761224d7e42744 100644 (file)
--- a/util/x86emu/yabel/vbe.c
+++ b/util/x86emu/yabel/vbe.c
@@ -570,8 +570,17 @@ vbe_get_info(void)
                     sizeof(ddc_info.edid_block_zero));
        }
 #endif
-       if (*((u64 *) ddc_info.edid_block_zero) !=
-           (u64) 0x00FFFFFFFFFFFF00ULL) {
+/* This could fail because of alignment issues, so use a longer form.
+       *((u64 *) ddc_info.edid_block_zero) != (u64) 0x00FFFFFFFFFFFF00ULL
+*/
+       if (ddc_info.edid_block_zero[0] != 0x00 ||
+           ddc_info.edid_block_zero[1] != 0xFF ||
+           ddc_info.edid_block_zero[2] != 0xFF ||
+           ddc_info.edid_block_zero[3] != 0xFF ||
+           ddc_info.edid_block_zero[4] != 0xFF ||
+           ddc_info.edid_block_zero[5] != 0xFF ||
+           ddc_info.edid_block_zero[6] != 0xFF ||
+           ddc_info.edid_block_zero[7] != 0x00 ) {
                // invalid EDID signature... probably no monitor
 
                output->display_type = 0x0;