Initial support for USB, UHCI, and USB Keyboards.

[seabios.git] / src / post.c

diff --git a/src/post.c b/src/post.c
index 9bb51326c814009ae050b83fcac1e0f566d5eee4..f72e134aec4b275f4dbac9961de82dcfd7b15955 100644 (file)
--- a/src/post.c
+++ b/src/post.c
@@ -19,11 +19,12 @@
 #include "bregs.h" // struct bregs
 #include "mptable.h" // mptable_init
 #include "boot.h" // IPL
+#include "usb.h" // usb_setup
 
 void
 __set_irq(int vector, void *loc)
 {
-    SET_IVT(vector, SEG_BIOS, (u32)loc - BUILD_BIOS_ADDR);
+    SET_IVT(vector, SEGOFF(SEG_BIOS, (u32)loc - BUILD_BIOS_ADDR));
 }
 
 #define set_irq(vector, func) do {              \
@@ -64,7 +65,7 @@ init_ivt()
 
     // set vector 0x79 to zero
     // this is used by 'gardian angel' protection system
-    SET_IVT(0x79, 0, 0);
+    SET_IVT(0x79, SEGOFF(0, 0));
 
     __set_irq(0x1E, &diskette_param_table2);
 }
@@ -78,7 +79,7 @@ init_bda()
     memset(bda, 0, sizeof(*bda));
 
     int esize = EBDA_SIZE_START;
-    SET_BDA(mem_size_kb, 640 - esize);
+    SET_BDA(mem_size_kb, BUILD_LOWRAM_END/1024 - esize);
     u16 eseg = EBDA_SEGMENT_START;
     SET_BDA(ebda_seg, eseg);
 
@@ -119,7 +120,7 @@ ram_probe(void)
     }
 
     // Don't declare any memory between 0xa0000 and 0x100000
-    add_e820(0xa0000, 0x50000, E820_HOLE);
+    add_e820(BUILD_LOWRAM_END, BUILD_BIOS_ADDR-BUILD_LOWRAM_END, E820_HOLE);
 
     // Mark known areas as reserved.
     u16 ebda_seg = get_ebda_seg();
@@ -171,24 +172,27 @@ post()
     malloc_setup();
     pmm_setup();
 
+    pci_setup();
+    smm_init();
+
     pnp_setup();
     vga_setup();
 
+    usb_setup();
     kbd_setup();
     lpt_setup();
     serial_setup();
     mouse_setup();
 
-    pci_bios_setup();
-    smm_init();
-
     init_bios_tables();
 
     boot_setup();
 
     drive_setup();
+    cdemu_setup();
     floppy_setup();
     ata_setup();
+    ramdisk_setup();
 
     optionrom_setup();
 
@@ -225,5 +229,6 @@ _start()
     dprintf(3, "Jump to int19\n");
     struct bregs br;
     memset(&br, 0, sizeof(br));
+    br.flags = F_IF;
     call16_int(0x19, &br);
 }