Changeset 421 for GPL/branches/uniaud32-2.0/drv32/strategy.c

Timestamp:

Mar 23, 2009, 9:13:00 AM (16 years ago)

Author:

Paul Smedley

Message:

Updates from Pasha to improve IRQ handling and resolve long delays at startup in APIC mode when using ACPI

File:

• GPL/branches/uniaud32-2.0/drv32/strategy.c (modified) (2 diffs)

GPL/branches/uniaud32-2.0/drv32/strategy.c

@@ -77 +77 @@
 //******************************************************************************
 // External initialization complete entry-point
+#ifdef ACPI
+// See desription in irq.cpp
+#include "irqos2.h"                 //PS+++
+#ifdef __cplusplus
+extern "C" {
+#endif
+ULONG InitCompleteWas = 0;          //PS+++ Indication of InitComplete call
+struct SaveIRQForSlot
+{
+    ULONG  ulSlotNo;
+    BYTE   LowIRQ;
+    BYTE   HighIRQ;
+    BYTE   Pin;   
+};
+extern struct SaveIRQForSlot sISRHigh[];
+extern int  SaveIRQCounter;
+#ifdef __cplusplus
+}
+#endif
+#endif //ACPI
 //******************************************************************************
 #pragma off (unreferenced)
@@ -82 +102 @@
 #pragma on (unreferenced)
 {
+#ifdef ACPI
+//PS+++ Begin
+    ULONG  i, rc = 0;
+
+    InitCompleteWas = 1;
+
+    for (i = 0; i < SaveIRQCounter; i++)
+    {
+         dprintf(("Close IRQ%d - Open IRQ%d",(ULONG)sISRHigh[i].LowIRQ,(ULONG)sISRHigh[i].HighIRQ));
+         if (sISRHigh[i].HighIRQ)
+         {
+             ALSA_FreeIrq(sISRHigh[i].LowIRQ);
+             if (!ALSA_SetIrq(sISRHigh[i].HighIRQ, sISRHigh[i].ulSlotNo, 1))
+             {
+                 return (RPERR_COMMAND | RPDONE);
+             }
+         }
+    }
+#endif
+//PS++ End
 #ifdef DEBUG
     dprintf(("StratInitComplete"));