some changes for gcc4

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index 17c1542cffcc1562ca2e4567801ca51e37c8f88d..5e30dde991d41efa29074137b1ceb837503d83fd 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -54,7 +54,6 @@ void c_start(unsigned int magic, struct mb_info *mbinfo)
        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 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));
        

-       

        smi_disable();
        
        /* Try really hard to shut up USB_LEGKEY. */
        smi_disable();
        
        /* Try really hard to shut up USB_LEGKEY. */


@@ -62,7 +61,9 @@ 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_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();
 
        /* Open the SMRAM aperture and load our ELF. */
        old_smramc = smram_save_state();