Lots of recommenting and restructuring. Still locks up after one xmit --- wtf?

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 04f9b2f4f3bb3a901f9ba278b438753ac536dde9..372363c60b2c0e57cc7dc7d6853247bd2917a2d5 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -50,10 +50,9 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
 
        if (mbinfo->mod_cnt != 1)
                panic("Expected exactly one module; cannot continue.");
-
+       outputf("Current SMRAMC state is: %02x", pci_read8(0, 0, 0, 0x70));
        outputf("Current USB state is: %04x %04x", pci_read16(0, 31, 2, 0xC0), pci_read16(0, 31, 4, 0xC0));
        outputf("Current SMI state is: %08x", inl(0x830));
-       outputf("Current SMRAMC state is: %02x", pci_read8(0, 0, 0, 0x70));
        
        smi_disable();
        
@@ -62,6 +61,8 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        pci_write16(0, 31, 2, 0xC0, 0);
        pci_write16(0, 31, 4, 0xC0, pci_read16(0, 31, 4, 0xC0));
        pci_write16(0, 31, 4, 0xC0, 0);
+       
+       pci_bus_enum();
 
        /* Open the SMRAM aperture and load our ELF. */
        old_smramc = smram_save_state();
@@ -80,6 +81,8 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
 
        info->firstrun();
        smram_restore_state(old_smramc);
+       
+       outputf("New SMRAMC state is: %02x", pci_read8(0, 0, 0, 0x70));
 
        puts("Waiting for a bit before returning to real mode...");
        for (i=0; i<0x500000; i++)