Fixup previous memcpy optimization.

[seabios.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index b3d6a4936222cd36d4ff0593a36f3af52bdf02dc..bb1a445ac89f5595355afa6db7fefa3a14b683ab 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -2,7 +2,7 @@
 //
 // Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
 //
-// This file may be distributed under the terms of the GNU GPLv3 license.
+// This file may be distributed under the terms of the GNU LGPLv3 license.
 #ifndef __UTIL_H
 #define __UTIL_H
 
@@ -65,11 +65,20 @@ static inline u64 rdtscll(void)
     return val;
 }
 
+// util.c
+inline u32 stack_hop(u32 eax, u32 edx, u32 ecx, void *func);
+u8 checksum_far(u16 buf_seg, void *buf_far, u32 len);
+u8 checksum(void *buf, u32 len);
+int memcmp(const void *s1, const void *s2, size_t n);
+size_t strlen(const char *s);
+int strcmp(const char *s1, const char *s2);
 void *memset(void *s, int c, size_t n);
-void *memcpy(void *d1, const void *s1, size_t len);
-void *memcpy_far(void *far_d1, const void *far_s1, size_t len);
+void memcpy4(void *d1, const void *s1, size_t len);
+#define memcpy(d1, s1, len) __builtin_memcpy((d1), (s1), (len))
+inline void memcpy_far(u16 d_seg, void *d_far
+                       , u16 s_seg, const void *s_far, size_t len);
 void *memmove(void *d, const void *s, size_t len);
-
+char *strtcpy(char *dest, const char *src, size_t len);
 struct bregs;
 inline void call16(struct bregs *callregs);
 inline void call16big(struct bregs *callregs);
@@ -78,10 +87,13 @@ inline void __call16_int(struct bregs *callregs, u16 offset);
         extern void irq_trampoline_ ##nr ();                    \
         __call16_int((callregs), (u32)&irq_trampoline_ ##nr );  \
     } while (0)
+inline void call16_simpint(int nr, u32 *eax, u32 *flags);
+void usleep(u32 usec);
+int get_keystroke(int msec);
 
 // output.c
 void debug_serial_setup();
-void BX_PANIC(const char *fmt, ...)
+void panic(const char *fmt, ...)
     __attribute__ ((format (printf, 1, 2)))
     __attribute__ ((noreturn));
 void printf(const char *fmt, ...)
@@ -92,19 +104,20 @@ void __dprintf(const char *fmt, ...)
         if (CONFIG_DEBUG_LEVEL && (lvl) <= CONFIG_DEBUG_LEVEL)  \
             __dprintf((fmt) , ##args );                         \
     } while (0)
-void __debug_enter(const char *fname, struct bregs *regs);
-void __debug_stub(const char *fname, int lineno, struct bregs *regs);
+void __debug_enter(struct bregs *regs, const char *fname);
+void __debug_stub(struct bregs *regs, int lineno, const char *fname);
 void __debug_isr(const char *fname);
 #define debug_enter(regs, lvl) do {                     \
         if ((lvl) && (lvl) <= CONFIG_DEBUG_LEVEL)       \
-            __debug_enter(__func__, (regs));            \
+            __debug_enter((regs), __func__);            \
     } 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__, __LINE__, (regs))
+#define debug_stub(regs)                        \
+    __debug_stub((regs), __LINE__, __func__)
+void hexdump(void *d, int len);
 
 // kbd.c
 void kbd_setup();
@@ -137,9 +150,6 @@ void VISIBLE16 handle_1553(struct bregs *regs);
 // pcibios.c
 void handle_1ab1(struct bregs *regs);
 
-// util.c
-u8 checksum(u8 *far_data, u32 len);
-
 // shadow.c
 void make_bios_writable();
 void make_bios_readonly();
@@ -154,19 +164,20 @@ void smm_init();
 int smp_probe(void);
 void smp_probe_setup(void);
 
-// mptable.c
-void mptable_init(void);
-
 // smbios.c
 void smbios_init(void);
 
 // coreboot.c
-void coreboot_fill_map();
+const char *cbfs_findNprefix(const char *prefix, int n);
+void *cb_find_optionrom(u32 vendev);
+void cbfs_run_payload(const char *filename);
+void coreboot_setup();
 
 // vgahooks.c
 void handle_155f();
 
 // optionroms.c
+void call_bcv(u16 seg, u16 ip);
 void vga_setup();
 void optionrom_setup();
 
@@ -178,7 +189,13 @@ void init_dma();
 u16 get_pnp_offset();
 void pnp_setup();
 
+// mtrr.c
+void mtrr_setup(void);
+
 // romlayout.S
 void reset_vector() __attribute__ ((noreturn));
 
+// misc.c
+extern u8 BiosChecksum;
+
 #endif // util.h