Changeset 519 for GPL/branches/uniaud32-2.1.x/drv32/strategy.c

Timestamp:

Jul 20, 2010, 5:52:49 PM (15 years ago)

Author:

David Azarewicz

Message:

Changes to PCI bus scan, malloc, cleanup all warnings, misc other changes

File:

• GPL/branches/uniaud32-2.1.x/drv32/strategy.c (modified) (8 diffs)

GPL/branches/uniaud32-2.1.x/drv32/strategy.c

@@ -24 +24 @@
 
 #define INCL_NOPMAPI
-#define INCL_DOSINFOSEG      // Need Global info seg in rm.cpp algorithms
+#define INCL_DOSINFOSEG          // Need Global info seg in rm.cpp algorithms
 #include <os2.h>
 
@@ -51 +51 @@
         }
         numOS2Opens++;
-        return RPDONE;
+                return RPDONE;
 }
 //******************************************************************************
@@ -66 +66 @@
 ULONG StratInit(RP __far* _rp)
 {
-    ULONG rc;
-
-    RPInit __far* rp = (RPInit __far*)_rp;
-    rc = DiscardableInit(rp);
-    dprintf(("StratInit End rc=%d", rc));
-    return rc;
+        ULONG rc;
+
+        RPInit __far* rp = (RPInit __far*)_rp;
+        rc = DiscardableInit(rp);
+        dprintf(("StratInit End rc=%d", rc));
+        return rc;
 }
 //******************************************************************************
@@ -77 +77 @@
 #ifdef ACPI
 // See desription in irq.cpp
-#include "irqos2.h"                 //PS+++
+#include "irqos2.h"                             //PS+++
 #ifdef __cplusplus
 extern "C" {
 #endif
-ULONG InitCompleteWas = 0;          //PS+++ Indication of InitComplete call
+ULONG InitCompleteWas = 0;                      //PS+++ Indication of InitComplete call
 struct SaveIRQForSlot
 {
-    ULONG  ulSlotNo;
-    BYTE   LowIRQ;
-    BYTE   HighIRQ;
-    BYTE   Pin;
+        ULONG  ulSlotNo;
+        BYTE   LowIRQ;
+        BYTE   HighIRQ;
+        BYTE   Pin;
 };
 extern struct SaveIRQForSlot sISRHigh[];
-extern int  SaveIRQCounter;
+extern int      SaveIRQCounter;
 #ifdef __cplusplus
 }
@@ -102 +102 @@
 #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);
-             }
-         }
-    }
+        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"));
-#endif
+        dprintf(("StratInitComplete"));
   return(RPDONE);
 }
@@ -130 +128 @@
 #pragma on (unreferenced)
 {
- RPShutdown __far *rp = (RPShutdown __far *)_rp;
-
-#ifdef DEBUG
- dprintf(("StratShutdown %d", rp->Function));
-#endif
-  if(rp->Function == 1) {//end of shutdown
-        OSS32_Shutdown();
-  }
+        RPShutdown __far *rp = (RPShutdown __far *)_rp;
+
+        dprintf(("StratShutdown Start %d", rp->Function));
+        if(rp->Function == 1) {//end of shutdown
+                OSS32_Shutdown();
+        }
+        dprintf(("StratShutdown End"));
   return(RPDONE);
 }
@@ -155 +152 @@
 RPHandler StratDispatch[] =
 {
-  StratInit,                  // 00 (BC): Initialization
-  StratError,                 // 01 (B ): Media check
-  StratError,                 // 02 (B ): Build BIOS parameter block
-  StratError,                 // 03 (  ): Unused
-  StratRead,                  // 04 (BC): Read
-  StratError,                 // 05 ( C): Nondestructive read with no wait
-  StratError,                 // 06 ( C): Input status
-  StratError,                 // 07 ( C): Input flush
-  StratWrite,                 // 08 (BC): Write
-  StratError,                 // 09 (BC): Write verify
-  StratError,                 // 0A ( C): Output status
-  StratError,                 // 0B ( C): Output flush
-  StratError,                 // 0C (  ): Unused
-  StratOpen,                  // 0D (BC): Open
-  StratClose,                 // 0E (BC): Close
-  StratError,                 // 0F (B ): Removable media check
-  StratIOCtl,                 // 10 (BC): IO Control
-  StratError,                 // 11 (B ): Reset media
-  StratError,                 // 12 (B ): Get logical unit
-  StratError,                 // 13 (B ): Set logical unit
-  StratError,                 // 14 ( C): Deinstall character device driver
-  StratError,                 // 15 (  ): Unused
-  StratError,                 // 16 (B ): Count partitionable fixed disks
-  StratError,                 // 17 (B ): Get logical unit mapping of fixed disk
-  StratError,                 // 18 (  ): Unused
-  StratError,                 // 19 (  ): Unused
-  StratError,                 // 1A (  ): Unused
-  StratError,                 // 1B (  ): Unused
-  StratShutdown,              // 1C (BC): Notify start or end of system shutdown
-  StratError,                 // 1D (B ): Get driver capabilities
-  StratError,                 // 1E (  ): Unused
-  StratInitComplete           // 1F (BC): Notify end of initialization
+  StratInit,                              // 00 (BC): Initialization
+  StratError,                             // 01 (B ): Media check
+  StratError,                             // 02 (B ): Build BIOS parameter block
+  StratError,                             // 03 (  ): Unused
+  StratRead,                              // 04 (BC): Read
+  StratError,                             // 05 ( C): Nondestructive read with no wait
+  StratError,                             // 06 ( C): Input status
+  StratError,                             // 07 ( C): Input flush
+  StratWrite,                             // 08 (BC): Write
+  StratError,                             // 09 (BC): Write verify
+  StratError,                             // 0A ( C): Output status
+  StratError,                             // 0B ( C): Output flush
+  StratError,                             // 0C (  ): Unused
+  StratOpen,                              // 0D (BC): Open
+  StratClose,                             // 0E (BC): Close
+  StratError,                             // 0F (B ): Removable media check
+  StratIOCtl,                             // 10 (BC): IO Control
+  StratError,                             // 11 (B ): Reset media
+  StratError,                             // 12 (B ): Get logical unit
+  StratError,                             // 13 (B ): Set logical unit
+  StratError,                             // 14 ( C): Deinstall character device driver
+  StratError,                             // 15 (  ): Unused
+  StratError,                             // 16 (B ): Count partitionable fixed disks
+  StratError,                             // 17 (B ): Get logical unit mapping of fixed disk
+  StratError,                             // 18 (  ): Unused
+  StratError,                             // 19 (  ): Unused
+  StratError,                             // 1A (  ): Unused
+  StratError,                             // 1B (  ): Unused
+  StratShutdown,                          // 1C (BC): Notify start or end of system shutdown
+  StratError,                             // 1D (B ): Get driver capabilities
+  StratError,                             // 1E (  ): Unused
+  StratInitComplete               // 1F (BC): Notify end of initialization
 };
 //******************************************************************************
@@ -199 +196 @@
 {
   if (rp->Command < sizeof(StratDispatch)/sizeof(StratDispatch[0]))
-        return(StratDispatch[rp->Command](rp));
+                return(StratDispatch[rp->Command](rp));
   else  return(RPERR_COMMAND | RPDONE);
 }