Changeset 545 for GPL/trunk/drv32/strategy.c

Timestamp:

Mar 3, 2011, 8:43:04 PM (14 years ago)

Author:

David Azarewicz

Message:

Interrupt fixes

File:

• GPL/trunk/drv32/strategy.c (modified) (3 diffs)

GPL/trunk/drv32/strategy.c

@@ -39 +39 @@
 
 ULONG DiscardableInit(RPInit __far*);
-
 ULONG deviceOwner = DEV_NO_OWNER;
 ULONG numOS2Opens = 0;
@@ -76 +75 @@
 // 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
+#include "irqos2.h"
 #endif //ACPI
 //******************************************************************************
@@ -101 +83 @@
 {
 #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);
-                         }
-                 }
-        }
+        PciAdjustInterrupts();
 #endif
-//PS++ End
         //dprintf(("StratInitComplete"));
         return(RPDONE);