Define 16bit OFFSET_x to be 32bit addresses; introduce CONFIG_BIOS_ADDR.

[seabios.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 11ca26972f48056c70c69a972e2d380af9c1cb57..aa5e45741ca924450db0a0418fbc7e46d743a651 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -6,8 +6,7 @@
 #ifndef __UTIL_H
 #define __UTIL_H
 
-#include "ioport.h" // outb
-#include "biosvar.h" // struct bregs
+#include "types.h" // u32
 
 static inline void irq_disable(void)
 {
@@ -47,46 +46,25 @@ static inline void hlt(void)
     asm volatile("hlt");
 }
 
-void *memset(void *s, int c, size_t n);
-void *memcpy(void *d1, const void *s1, size_t len);
-
-static inline void
-eoi_master_pic()
+static inline void wbinvd(void)
 {
-    outb(PIC1_IRQ5, PORT_PIC1);
+    asm volatile("wbinvd");
 }
 
-static inline void
-eoi_both_pics()
+static inline void cpuid(u32 index, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)
 {
-    outb(PIC2_IRQ13, PORT_PIC2);
-    eoi_master_pic();
-}
-
-// Call a function with a specified register state.  Note that on
-// return, the interrupt enable/disable flag may be altered.
-static inline
-void call16(struct bregs *callregs)
-{
-    asm volatile(
-#ifdef MODE16
-        "calll __call16\n"
-#else
-        "calll __call16_from32\n"
-#endif
-        : "+a" (callregs), "+m" (*callregs)
-        :
-        : "ebx", "ecx", "edx", "esi", "edi", "ebp", "cc");
+    asm("cpuid"
+        : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
+        : "0" (index));
 }
 
-static inline
-void __call16_int(struct bregs *callregs, u16 offset)
-{
-    callregs->cs = SEG_BIOS;
-    callregs->ip = offset;
-    call16(callregs);
-}
+void *memset(void *s, int c, size_t n);
+void *memcpy(void *d1, const void *s1, size_t len);
+void *memmove(void *d, const void *s, size_t len);
 
+struct bregs;
+inline void call16(struct bregs *callregs);
+inline void __call16_int(struct bregs *callregs, u16 offset);
 #ifdef MODE16
 #define call16_int(nr, callregs) do {                           \
         extern void irq_trampoline_ ##nr ();                    \
@@ -95,10 +73,11 @@ void __call16_int(struct bregs *callregs, u16 offset)
 #else
 #include "../out/rom16.offset.auto.h"
 #define call16_int(nr, callregs)                                \
-    __call16_int((callregs), OFFSET_irq_trampoline_ ##nr )
+    __call16_int((callregs), OFFSET_irq_trampoline_ ##nr - BUILD_BIOS_ADDR)
 #endif
 
 // output.c
+void debug_serial_setup();
 void BX_PANIC(const char *fmt, ...)
     __attribute__ ((format (printf, 1, 2)))
     __attribute__ ((noreturn));
@@ -114,43 +93,29 @@ void __debug_enter(const char *fname, struct bregs *regs);
 void __debug_fail(const char *fname, struct bregs *regs);
 void __debug_stub(const char *fname, struct bregs *regs);
 void __debug_isr(const char *fname);
-#define debug_enter(regs) \
-    __debug_enter(__func__, regs)
+#define debug_enter(regs, lvl) do {                     \
+        if ((lvl) && (lvl) <= CONFIG_DEBUG_LEVEL)       \
+            __debug_enter(__func__, regs);              \
+    } while (0)
+#define debug_isr(lvl) do {                             \
+        if ((lvl) && (lvl) <= CONFIG_DEBUG_LEVEL)       \
+            __debug_isr(__func__);                      \
+    } while (0)
 #define debug_stub(regs) \
     __debug_stub(__func__, regs)
-#define debug_isr(regs) \
-    __debug_isr(__func__)
-
-// Frequently used return codes
-#define RET_EUNSUPPORTED 0x86
-static inline void
-set_success(struct bregs *regs)
-{
-    set_cf(regs, 0);
-}
-
-static inline void
-set_code_success(struct bregs *regs)
-{
-    regs->ah = 0;
-    set_cf(regs, 0);
-}
-
-void __set_fail(const char *fname, struct bregs *regs);
-void __set_code_fail(const char *fname, struct bregs *regs, u8 code);
-
-#define set_fail(regs) \
-    __set_fail(__func__, (regs))
-#define set_code_fail(regs, code)               \
-    __set_code_fail(__func__, (regs), (code))
 
 // kbd.c
+void kbd_setup();
 void handle_15c2(struct bregs *regs);
 
+// mouse.c
+void mouse_setup();
+
+// system.c
+void mathcp_setup();
+
 // serial.c
 void serial_setup();
-void debug_serial_setup();
-void debug_serial(char c);
 void lpt_setup();
 
 // clock.c
@@ -168,8 +133,24 @@ void handle_1ab1(struct bregs *regs);
 // util.c
 u8 checksum(u8 *far_data, u32 len);
 
-// rombios32.c
-void rombios32_init(void);
+// shadow.c
+void make_bios_writable();
+void make_bios_readonly();
+
+// pciinit.c
+void pci_bios_setup(void);
+
+// smm.c
+void smm_init();
+
+// smpdetect.c
+int smp_probe(void);
+
+// mptable.c
+void mptable_init(void);
+
+// smbios.c
+void smbios_init(void);
 
 // boot.c
 void printf_bootdev(u16 bootdev);
@@ -177,4 +158,7 @@ void printf_bootdev(u16 bootdev);
 // post_menu.c
 void interactive_bootmenu();
 
+// coreboot.c
+void coreboot_fill_map();
+
 #endif // util.h