Initial support for USB, UHCI, and USB Keyboards.

[seabios.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index dc3dfc158c95c8d619ffd843cd14ef47d8cc4bda..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");
@@ -89,10 +95,10 @@ static inline u32 __ffs(u32 word)
 }
 
 // GDT bit manipulation
-#define GDT_BASE(v)  (((u64)((v) & 0xff000000) << 56)           \
-                      | ((u64)((v) & 0x00ffffff) << 16))
-#define GDT_LIMIT(v) (((u64)((v) & 0x000f0000) << 48)   \
-                      | ((u64)((v) & 0x0000ffff) << 0))
+#define GDT_BASE(v)  ((((u64)(v) & 0xff000000) << 32)           \
+                      | (((u64)(v) & 0x00ffffff) << 16))
+#define GDT_LIMIT(v) ((((u64)(v) & 0x000f0000) << 32)   \
+                      | (((u64)(v) & 0x0000ffff) << 0))
 #define GDT_CODE     (0x9bULL << 40) // Code segment - P,R,A bits also set
 #define GDT_DATA     (0x93ULL << 40) // Data segment - W,A bits also set
 #define GDT_B        (0x1ULL << 54)  // Big flag
@@ -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();
@@ -222,11 +229,9 @@ void smbios_init(void);
 // coreboot.c
 struct cbfs_file;
 struct cbfs_file *cbfs_findprefix(const char *prefix, struct cbfs_file *last);
-struct cbfs_file *cbfs_finddataprefix(const char *prefix, struct cbfs_file *last
-                                      , int *iscomp);
-int cbfs_datasize(struct cbfs_file *file, int iscomp);
+u32 cbfs_datasize(struct cbfs_file *file);
 const char *cbfs_filename(struct cbfs_file *file);
-int cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen, int iscomp);
+int cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen);
 int cbfs_copy_optionrom(void *dst, u32 maxlen, u32 vendev);
 void cbfs_run_payload(struct cbfs_file *file);
 
@@ -254,14 +259,34 @@ u16 get_pnp_offset();
 void pnp_setup();
 
 // pmm.c
-void *malloc_high(u32 size);
-void *malloc_fseg(u32 size);
+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();
 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);
+}
+static inline void *memalign_high(u32 align, u32 size) {
+    return zone_malloc(&ZoneHigh, size, align);
+}
 
 // mtrr.c
 void mtrr_setup(void);