Changeset 548 for GPL/branches/uniaud32-2.1.x/drv32/rmhelp.cpp

Timestamp:

Mar 16, 2011, 11:54:53 PM (14 years ago)

Author:

David Azarewicz

Message:

APIC interrupt fixes from trunk

File:

• GPL/branches/uniaud32-2.1.x/drv32/rmhelp.cpp (modified) (13 diffs)

GPL/branches/uniaud32-2.1.x/drv32/rmhelp.cpp

@@ -40 +40 @@
 ULONG                   RMFlags;
 
-static HDRIVER          DriverHandle = (HDRIVER)-1;
-static ULONG            ctResHandles = 0;
-static HRESOURCE        arResHandles[MAX_RESHANDLES];
+static HDRIVER DriverHandle = (HDRIVER)-1;
+static HDEVICE DeviceHandle = 0;
+static HADAPTER AdapterHandle = 0;
+static ULONG ctResHandles = 0;
+static HRESOURCE arResHandles[MAX_RESHANDLES];
 
 
@@ -80 +82 @@
      rc = RMCreateDriver( FlatToSel((ULONG)&DriverStruct), FlatToSel((ULONG)&hDriver) );
 
-     dprintf(("RMCreateDriver rc = %d\n", rc));
-
      if( rc == RMRC_SUCCESS )   DriverHandle = hDriver;
+     dprintf(("RMCreateDriver rc=%d DriverHandle=%x", rc, DriverHandle));
   }
 
@@ -113 +114 @@
   }
 
-  dprintf(("RMAllocResource[%d] IO rc = %d\n", ctResHandles, rc));
+  dprintf(("RMAllocResource[%d] IO rc = %d", ctResHandles, rc));
 
   return FALSE;
@@ -141 +142 @@
   }
 
-  dprintf(("RMAllocResource[%d] MEM rc = %d\n", ctResHandles, rc));
+  dprintf(("RMAllocResource[%d] MEM rc = %d", ctResHandles, rc));
 
   return rc == 0;
@@ -152 +153 @@
 {
         RESOURCESTRUCT  Resource;
-        HRESOURCE               hres;
+        HRESOURCE               hRes;
         APIRET          rc;
 
@@ -161 +162 @@
 
         rc = RMAllocResource(DriverHandle,                      // Handle to driver.
-                       FlatToSel((ULONG)&hres),                 // OUT:  "allocated" resource node handle
+                       FlatToSel((ULONG)&hRes),                 // OUT:  "allocated" resource node handle
                        FlatToSel((ULONG)&Resource));    // Resource to allocate.
 
+
         if (rc == 0) {
-                if (ctResHandles < MAX_RESHANDLES ) arResHandles[ctResHandles++] = hres;
-                *phRes = hres;
+                *phRes = hRes;
+                if (DeviceHandle) {
+                        dprintf(("RMRequestIRQ: DriverHandle=%x DeviceHandle=%x hRes=%x", DriverHandle, DeviceHandle, hRes));
+                        rc = RMModifyResources(DriverHandle, DeviceHandle, RM_MODIFY_ADD, hRes);
+                } else {
+                        if (ctResHandles < MAX_RESHANDLES ) arResHandles[ctResHandles++] = hRes;
+                }
         }
 
-        dprintf(("RMAllocResource[%d] IRQ rc = %d\n", ctResHandles, rc));
+        dprintf(("RMAllocResource[%d] IRQ=%d rc=%d", ctResHandles, ulIrq, rc));
 
         return rc == 0;
@@ -178 +185 @@
 BOOL RMDeallocateIRQ(HRESOURCE hRes)
 {
-        ULONG ulI;
-
-        RMDeallocResource(DriverHandle, hRes);
-
-        for (ulI=0; ulI<ctResHandles; ulI++) {
-                if (arResHandles[ulI] == hRes) {
-                        arResHandles[ulI] = 0;
-                        break;
-                }               
-        }
-
-        return 0;
-}
-
-
-//******************************************************************************
-//******************************************************************************
-VOID RMDone(ULONG DevID)
+        APIRET rc;
+
+        dprintf(("RMDeallocateIRQ: DriverHandle=%x DeviceHandle=%x hRes=%x", DriverHandle, DeviceHandle, hRes));
+        rc = RMModifyResources(DriverHandle, DeviceHandle, RM_MODIFY_DELETE, hRes);
+
+        return rc == 0;
+}
+
+
+//******************************************************************************
+//******************************************************************************
+VOID RMDone(ULONG DevID, PHADAPTER phAdapter, PHDEVICE phDevice)
 {
   APIRET        rc;
@@ -205 +206 @@
   char          szDeviceName[128];
   char          szMixerName[64];
-  struct
-  {
+  struct {
     ULONG       NumResource;
     HRESOURCE   hResource[MAX_RESHANDLES];
@@ -214 +214 @@
 
   if( DevID && OSS32_QueryNames(OSS32_DEFAULT_DEVICE,
-                 szDeviceName, sizeof(szDeviceName),
-                 szMixerName, sizeof(szMixerName), FALSE) == OSSERR_SUCCESS )
+                szDeviceName, sizeof(szDeviceName),
+                szMixerName, sizeof(szMixerName), FALSE) == OSSERR_SUCCESS )
   {
     switch(DevID) {
@@ -285 +285 @@
         break;
 */
-    }
+    } /* switch */
 
 
@@ -317 +317 @@
                            NULL);                               // Allocated resources.
 
-      dprintf(("RMCreateAdapter rc = %d\n", rc));
+      dprintf(("RMCreateAdapter rc=%d", rc));
 
       if( rc == 0 )
       {
-        if( !szDeviceName[0] )  strcpy(szDeviceName, "Unknown");
-
-        //NOTE: Assumes szDeviceName is a stack pointer!!
-        memset( (PVOID) &DeviceStruct, 0, sizeof(DeviceStruct) );
-        DeviceStruct.DevDescriptName = FlatToSel((ULONG)szDeviceName);
-        DeviceStruct.DevFlags        = DS_FIXED_LOGICALNAME;
-        DeviceStruct.DevType         = DS_TYPE_AUDIO;
-        DeviceStruct.pAdjunctList    = NULL;
-
-        rc = RMCreateDevice(DriverHandle,                       // Handle to driver
+                AdapterHandle = hAdapter;
+                if (phAdapter) *phAdapter = hAdapter;
+                if( !szDeviceName[0] )  strcpy(szDeviceName, "Unknown");
+
+                //NOTE: Assumes szDeviceName is a stack pointer!!
+                memset( (PVOID) &DeviceStruct, 0, sizeof(DeviceStruct) );
+                DeviceStruct.DevDescriptName = FlatToSel((ULONG)szDeviceName);
+                DeviceStruct.DevFlags        = DS_FIXED_LOGICALNAME;
+                DeviceStruct.DevType         = DS_TYPE_AUDIO;
+                DeviceStruct.pAdjunctList    = NULL;
+
+                rc = RMCreateDevice(DriverHandle,                       // Handle to driver
                             FlatToSel((ULONG)&hDevice),         // (OUT) Handle to device, unused.
                             FlatToSel((ULONG)&DeviceStruct),    // Device structure
@@ -336 +338 @@
                             FlatToSel((ULONG)&ahResource));     // Allocated resources
 
-        dprintf(("RMCreateDevice rc = %d\n", rc));
-
-        if( rc == 0 )
-        {
-          // no resource handles to be freed
-          ctResHandles = 0;     return;
-        }
-
-// !!! Not implemented in startup.asm
-//      RMDestroyAdapter(DriverHandle, hAdapter);
-      }
-    }
-    else        dprintf(("No resources allocated !!!\n"));
-  }
+                dprintf(("RMCreateDevice rc=%d", rc));
+
+                if( rc == 0 )
+                {
+                  DeviceHandle = hDevice;
+                  if (phDevice) *phDevice = hDevice;
+                  ctResHandles = 0;  // no resource handles to be freed
+                        dprintf(("RMDone: DriverHandle=%x DeviceHandle=%x", DriverHandle, DeviceHandle));
+                  return;
+                }
+
+                // !!! Not implemented in startup.asm
+                //      RMDestroyAdapter(DriverHandle, hAdapter);
+      } /* if rc == 0 */
+    } /* ctResHandles */
+    else        dprintf(("No resources allocated !!!"));
+  } /* if DevID */
 
 
@@ -358 +363 @@
 
 
-
+/* DAZ - dirty hack so that resource manager is updated correctly
+ * when using APIC and multiple adapters */
+VOID RMSetHandles(HADAPTER hAdapter, HDEVICE hDevice)
+{
+        AdapterHandle = hAdapter;
+        DeviceHandle = hDevice;
+}
+