X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/f1584bb056629473dd1208034fed761cbaea8e29..2768393fc00a378e42139872bf47fe02ea6f3751:/ich2/smi.c

diff --git a/ich2/smi.c b/ich2/smi.c
index c9a1f0e..0e43185 100644
--- a/ich2/smi.c
+++ b/ich2/smi.c
@@ -33,6 +33,15 @@ void smi_disable()
 {
 	unsigned short smi_en = _get_PMBASE() + ICH2_PMBASE_SMI_EN;
 	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_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_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));
+	
 }
 
 void smi_enable()
@@ -101,7 +110,10 @@ void smi_poll()
 		
 		if (pm1_sts & ICH2_PM1_STS_PWRBTN_STS)
 		{
-			output("Unhandled: PM1_STS: PWRBTN_STS");
+			if (_handlers[SMI_EVENT_PWRBTN] == SMI_HANDLER_NONE)
+				output("Unhandled: PM1_STS: PWRBTN_STS");
+			else if (_handlers[SMI_EVENT_FAST_TIMER] != SMI_HANDLER_IGNORE)
+				_handlers[SMI_EVENT_PWRBTN](SMI_EVENT_PWRBTN);
 			outw(_get_PMBASE() + ICH2_PMBASE_PM1_STS, ICH2_PM1_STS_PWRBTN_STS);
 		}
 		
@@ -224,6 +236,11 @@ int smi_enable_event(smi_event_t ev)
 			inl(_get_PMBASE() + ICH2_PMBASE_SMI_EN) |
 				ICH2_SMI_EN_BIOS_EN);
 		return 0;
+	case SMI_EVENT_PWRBTN:
+		outl(_get_PMBASE() + ICH2_PMBASE_PM1_EN,
+			inl(_get_PMBASE() + ICH2_PMBASE_PM1_EN) |
+				ICH2_PM1_EN_PWRBTN_EN);
+		return 0;
 	default:
 		return -1;
 	}
@@ -248,6 +265,11 @@ int smi_disable_event(smi_event_t ev)
 			inl(_get_PMBASE() + ICH2_PMBASE_SMI_EN) &
 				~ICH2_SMI_EN_BIOS_EN);
 		return 0;
+	case SMI_EVENT_PWRBTN:
+		outl(_get_PMBASE() + ICH2_PMBASE_PM1_EN,
+			inl(_get_PMBASE() + ICH2_PMBASE_PM1_EN) &
+				~ICH2_PM1_EN_PWRBTN_EN);
+		return 0;
 	default:
 		return -1;
 	}