More ICH2-specific code diked out.

[netwatch.git] / hardware / ich2 / smi.c

diff --git a/hardware/ich2/smi.c b/hardware/ich2/smi.c
index 0e43185dd98cb15692da0a485293636fb6ce12c9..b3df1530aa3e3e988da9484b082d4cd2e6506be3 100644 (file)
--- a/hardware/ich2/smi.c
+++ b/hardware/ich2/smi.c
@@ -35,12 +35,10 @@ void smi_disable()
        outl(smi_en, inl(smi_en) & ~ICH2_SMI_EN_GBL_SMI_EN);
        
        /* Try really hard to shut up USB_LEGKEY. */
        outl(smi_en, inl(smi_en) & ~ICH2_SMI_EN_GBL_SMI_EN);
        
        /* Try really hard to shut up USB_LEGKEY. */

-       pci_write16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY, 0x0);

        pci_write16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY,
        pci_write16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY,

-               pci_read16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY));
-       pci_write16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY, 0x0);
+               pci_read16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY) & ~0x8000);

        pci_write16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY,
        pci_write16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY,

-               pci_read16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY));
+               pci_read16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY) & ~0x8000);

        
 }
 
        
 }