Fixup previous memcpy optimization.

[seabios.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index aa82d4bd8a7d542940c1b89a95b6263321e81445..bb1a445ac89f5595355afa6db7fefa3a14b683ab 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -67,13 +67,18 @@ static inline u64 rdtscll(void)
 
 // util.c
 inline u32 stack_hop(u32 eax, u32 edx, u32 ecx, void *func);
-u8 checksum_far(u16 buf_seg, u8 *buf_far, u32 len);
-u8 checksum(u8 *buf, u32 len);
+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 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);
@@ -83,11 +88,12 @@ inline void __call16_int(struct bregs *callregs, u16 offset);
         __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, ...)
@@ -111,6 +117,7 @@ void __debug_isr(const char *fname);
     } while (0)
 #define debug_stub(regs)                        \
     __debug_stub((regs), __LINE__, __func__)
+void hexdump(void *d, int len);
 
 // kbd.c
 void kbd_setup();
@@ -157,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();