Initial support for USB, UHCI, and USB Keyboards.

[seabios.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index a8f75a3caee18f063be507290d311b6b60f4d0cf..fbcfb79b8a414fa7a0d518f5c754105c8bcd6e09 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -36,6 +36,12 @@ static inline void cpu_relax(void)
     asm volatile("rep ; nop": : :"memory");
 }
 
+// Atomically enable irqs and sleep until an irq; then re-disable irqs.
+static inline void wait_irq(void)
+{
+    asm volatile("sti ; hlt ; cli ; cld": : :"memory");
+}
+
 static inline void nop(void)
 {
     asm volatile("nop");
@@ -167,11 +173,12 @@ void __debug_isr(const char *fname);
     } while (0)
 #define debug_stub(regs)                        \
     __debug_stub((regs), __LINE__, __func__)
-void hexdump(void *d, int len);
+void hexdump(const void *d, int len);
 
 // kbd.c
 void kbd_setup();
 void handle_15c2(struct bregs *regs);
+void process_key(u8 key);
 
 // mouse.c
 void mouse_setup();
@@ -205,7 +212,7 @@ void make_bios_writable();
 void make_bios_readonly();
 
 // pciinit.c
-void pci_bios_setup(void);
+void pci_setup(void);
 
 // smm.c
 void smm_init();
@@ -254,6 +261,7 @@ void pnp_setup();
 // pmm.c
 extern struct zone_s ZoneLow, ZoneHigh, ZoneFSeg, ZoneTmpLow, ZoneTmpHigh;
 void *zone_malloc(struct zone_s *zone, u32 size, u32 align);
+void *zone_malloc_low(u32 size, u32 align);
 void malloc_setup();
 void malloc_finalize();
 void pmm_setup();
@@ -261,12 +269,18 @@ void pmm_finalize();
 // Minimum alignment of malloc'd memory
 #define MALLOC_MIN_ALIGN 16
 // Helper functions for memory allocation.
+static inline void *malloc_low(u32 size) {
+    return zone_malloc_low(size, MALLOC_MIN_ALIGN);
+}
 static inline void *malloc_high(u32 size) {
     return zone_malloc(&ZoneHigh, size, MALLOC_MIN_ALIGN);
 }
 static inline void *malloc_fseg(u32 size) {
     return zone_malloc(&ZoneFSeg, size, MALLOC_MIN_ALIGN);
 }
+static inline void *malloc_tmphigh(u32 size) {
+    return zone_malloc(&ZoneTmpHigh, size, MALLOC_MIN_ALIGN);
+}
 static inline void *memalign_tmphigh(u32 align, u32 size) {
     return zone_malloc(&ZoneTmpHigh, size, align);
 }