diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2008-08-01 11:25:41 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2008-08-01 11:25:41 +0000 |
| commit | d98cf5bed93e48f4cb3bdc5219a03207cd01c3ce (patch) | |
| tree | 072e22c0b4436607b18af31205c4fc50b3b8911e /src/devices/emulator | |
| parent | 8533606db71ef9c4f77983eaea1b2f27c9bb7baf (diff) | |
fix typos and warnings in the device tree code (trivial)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3441 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/emulator')
| -rw-r--r-- | src/devices/emulator/biosemu.c | 6 | ||||
| -rw-r--r-- | src/devices/emulator/pcbios/pcibios.c | 4 | ||||
| -rw-r--r-- | src/devices/emulator/pcbios/pcibios.h | 5 | ||||
| -rw-r--r-- | src/devices/emulator/x86emu/decode.h | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/src/devices/emulator/biosemu.c b/src/devices/emulator/biosemu.c index e38541edd3..c0584354d2 100644 --- a/src/devices/emulator/biosemu.c +++ b/src/devices/emulator/biosemu.c @@ -7,6 +7,8 @@ #include <x86emu/x86emu.h> +#include "pcbios/pcibios.h" + #define MEM_WB(where, what) wrb(where, what) #define MEM_WW(where, what) wrw(where, what) #define MEM_WL(where, what) wrl(where, what) @@ -22,6 +24,10 @@ void x_outw(u16 port, u16 val); u32 x_inl(u16 port); void x_outl(u16 port, u32 val); + +// sys.c +void X86EMU_setMemBase(void *base, size_t size); + /* general software interrupt handler */ u32 getIntVect(int num) { diff --git a/src/devices/emulator/pcbios/pcibios.c b/src/devices/emulator/pcbios/pcibios.c index be5c91a0f1..3d645f7359 100644 --- a/src/devices/emulator/pcbios/pcibios.c +++ b/src/devices/emulator/pcbios/pcibios.c @@ -7,9 +7,9 @@ #include "pcibios.h" -int pcibios_handler() +int pcibios_handler(void) { - int i, ret = 0; + int ret = 0; struct device *dev = 0; switch (X86_AX) { diff --git a/src/devices/emulator/pcbios/pcibios.h b/src/devices/emulator/pcbios/pcibios.h index 75a1253d25..2ad9b83561 100644 --- a/src/devices/emulator/pcbios/pcibios.h +++ b/src/devices/emulator/pcbios/pcibios.h @@ -25,4 +25,7 @@ enum { SET_FAILED = 0x88, BUFFER_TOO_SMALL = 0x89 }; -#endif /* PCI_BIOS_H */
\ No newline at end of file + +int pcibios_handler(void); + +#endif /* PCI_BIOS_H */ diff --git a/src/devices/emulator/x86emu/decode.h b/src/devices/emulator/x86emu/decode.h index 321a345399..99ed7f6f35 100644 --- a/src/devices/emulator/x86emu/decode.h +++ b/src/devices/emulator/x86emu/decode.h @@ -79,6 +79,7 @@ u16* decode_rm_seg_register(int reg); unsigned decode_rm00_address(int rm); unsigned decode_rm01_address(int rm); unsigned decode_rm10_address(int rm); +unsigned decode_rmXX_address(int mod, int rm); #ifdef __cplusplus } /* End of "C" linkage for C++ */ |