Separate out ram shadow code and permit more code to write to bios.

[seabios.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 88890de2c3dd2c4443ad5d418d2c0f6496c254a5..5c3710048f8c25f599b8a95b8b8be479ee48d434 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -32,6 +32,11 @@ static inline void irq_restore(unsigned long flags)
     asm volatile("pushl %0 ; popfl" : : "g" (flags) : "memory", "cc");
 }
 
+static inline void cpu_relax(void)
+{
+    asm volatile("rep ; nop": : :"memory");
+}
+
 static inline void nop(void)
 {
     asm volatile("nop");
@@ -42,34 +47,13 @@ static inline void hlt(void)
     asm volatile("hlt");
 }
 
-// XXX - move this to a c file and use PANIC PORT.
-#define BX_PANIC(fmt, args...) do { \
-        bprintf(0, fmt , ##args);   \
-        irq_disable();              \
-        for (;;)                    \
-            hlt();                  \
-    } while (0)
-
-#define BX_INFO(fmt, args...) bprintf(0, fmt , ##args)
-
-static inline void
-memset(void *s, int c, size_t n)
+static inline void wbinvd(void)
 {
-    while (n)
-        ((char *)s)[--n] = c;
+    asm volatile("wbinvd");
 }
 
-static inline void *
-memcpy(void *d1, const void *s1, size_t len)
-{
-    u8 *d = d1;
-    const u8 *s = s1;
-
-    while (len--) {
-        *d++ = *s++;
-    }
-    return d1;
-}
+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()
@@ -111,7 +95,7 @@ void __call16_int(struct bregs *callregs, u16 offset)
 #ifdef MODE16
 #define call16_int(nr, callregs) do {                           \
         extern void irq_trampoline_ ##nr ();                    \
-        __call16_int((callregs), (u16)&irq_trampoline_ ##nr );  \
+        __call16_int((callregs), (u32)&irq_trampoline_ ##nr );  \
     } while (0)
 #else
 #include "../out/rom16.offset.auto.h"
@@ -120,8 +104,17 @@ void __call16_int(struct bregs *callregs, u16 offset)
 #endif
 
 // output.c
-void bprintf(u16 action, const char *fmt, ...)
-    __attribute__ ((format (printf, 2, 3)));
+void BX_PANIC(const char *fmt, ...)
+    __attribute__ ((format (printf, 1, 2)))
+    __attribute__ ((noreturn));
+void printf(const char *fmt, ...)
+    __attribute__ ((format (printf, 1, 2)));
+void __dprintf(const char *fmt, ...)
+    __attribute__ ((format (printf, 1, 2)));
+#define dprintf(lvl, fmt, args...) do {                         \
+        if (CONFIG_DEBUG_LEVEL && (lvl) <= CONFIG_DEBUG_LEVEL)  \
+            __dprintf((fmt) , ##args );                         \
+    } while (0)
 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);
@@ -132,8 +125,6 @@ void __debug_isr(const char *fname);
     __debug_stub(__func__, regs)
 #define debug_isr(regs) \
     __debug_isr(__func__)
-#define printf(fmt, args...)                     \
-    bprintf(1, fmt , ##args )
 
 // Frequently used return codes
 #define RET_EUNSUPPORTED 0x86
@@ -150,21 +141,39 @@ set_code_success(struct bregs *regs)
     set_cf(regs, 0);
 }
 
-#define set_fail(regs) do {                     \
-        __debug_fail(__func__, (regs));         \
-        set_cf((regs), 1);                      \
-    } while (0)
+static inline void
+set_fail_silent(struct bregs *regs)
+{
+    set_cf(regs, 1);
+}
 
-#define set_code_fail(regs, code) do {          \
-        set_fail(regs);                         \
-        (regs)->ah = (code);                    \
-    } while (0)
+static inline void
+set_code_fail_silent(struct bregs *regs, u8 code)
+{
+    regs->ah = code;
+    set_cf(regs, 1);
+}
+
+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 handle_15c2(struct bregs *regs);
 
+// serial.c
+void serial_setup();
+void lpt_setup();
+
 // clock.c
+void timer_setup();
+int usleep(u32 count);
 void handle_1583(struct bregs *regs);
+void handle_1586(struct bregs *regs);
 
 // apm.c
 void VISIBLE16 handle_1553(struct bregs *regs);
@@ -174,9 +183,18 @@ void handle_1ab1(struct bregs *regs);
 
 // util.c
 u8 checksum(u8 *far_data, u32 len);
-void usleep(u32 count);
+
+// shadow.c
+void make_bios_writable();
+void make_bios_readonly();
 
 // rombios32.c
 void rombios32_init(void);
 
+// boot.c
+void printf_bootdev(u16 bootdev);
+
+// post_menu.c
+void interactive_bootmenu();
+
 #endif // util.h