Changeset 178 for sbliveos2/trunk/drv16/rm.cpp

Timestamp:

Apr 30, 2001, 11:08:00 PM (24 years ago)

Author:

sandervl

Message:

DirectAudio interface updates

File:

• sbliveos2/trunk/drv16/rm.cpp (modified) (9 diffs)

sbliveos2/trunk/drv16/rm.cpp

@@ -42 +42 @@
 #include <dbgos2.h>
 
-char DeviceName[64] = "Creative Labs SoundBlaster Live";
-
+#define EMU10K1_JOYSTICK_EXTENT 0x8     /* 8 byte I/O space */
+#define EMU10K1_EXTENT  0x20    /* 32 byte I/O space */
+
+char DeviceName[64] = "Creative Labs SoundBlaster Live!";
+char DeviceNameJoy[64] = "Creative Labs SoundBlaster Live! Joystick";
 /**@external LDev_Resources::isEmpty
  *  Returns TRUE iff the LDev_Resources structure has no information.
@@ -141 +144 @@
            ((pGIS->uchMajorVersion == 20) && (pGIS->uchMinorVersion > 30)) );
    }
-
-   if(getPCIConfiguration(pciId) == FALSE) {
-      _state = rmDriverFailed;
-   }
-
 }
 
@@ -166 +164 @@
 {
 #if 1
+   if(getPCIConfiguration(DevID) == FALSE) {
+      return FALSE;
+   }
+
    //Manual detection in ResourceManager class constructor; 
    return (_state == rmDriverCreated || _state == rmAdapterCreated);
@@ -203 +205 @@
  */
 #pragma off (unreferenced)
-LDev_Resources* ResourceManager::GetRMDetectedResources ( DEVID DevID , ULONG ulSearchFlags, bool fPciDevice)
+LDev_Resources* ResourceManager::GetRMDetectedResources ( DEVID DevID , ULONG ulSearchFlags, bool fPciDevice, bool fJoystick)
 #pragma on (unreferenced)
 {
@@ -215 +217 @@
 
    //Fill in resources read from PCI Configuration space
-   pResources->uIRQLevel[0]  = pciConfigData->InterruptLine;
-   if(pResources->uIRQLevel[0] == 0 || pResources->uIRQLevel[0] > 15)  {
-        dprintf(("Invalid PCI irq %x", (int)pResources->uIRQLevel[0]));
-        DebugInt3();
-        return NULL;
+   if(!fJoystick) {
+        pResources->uIRQLevel[0]  = pciConfigData->InterruptLine;
+        if(pResources->uIRQLevel[0] == 0 || pResources->uIRQLevel[0] > 15)  {
+                dprintf(("Invalid PCI irq %x", (int)pResources->uIRQLevel[0]));
+                DebugInt3();
+                return NULL;
+        }
    }
    pResources->uIOBase[0]   = (USHORT)(pciConfigData->Bar0 & 0xFFFFFFF0);
-   pResources->uIOLength[0] = 0x20;
+   if(fJoystick) {
+        pResources->uIOLength[0] = EMU10K1_JOYSTICK_EXTENT;
+   }
+   else pResources->uIOLength[0] = EMU10K1_EXTENT;
 
    return pResources;
@@ -345 +352 @@
  */
 
-LDev_Resources* ResourceManager::pGetDevResources ( DEVID DevID , ULONG ulSearchFlags, bool fPciDevice)
+LDev_Resources* ResourceManager::pGetDevResources ( DEVID DevID , ULONG ulSearchFlags, bool fPciDevice, bool fJoystick)
 {
    APIRET rc;
@@ -362 +369 @@
    // Initialize resource object.  Use detected information if available,
    // otherwise use hardcoded defaults.
-   pResources = GetRMDetectedResources( DevID, ulSearchFlags, fPciDevice );
+   pResources = GetRMDetectedResources( DevID, ulSearchFlags, fPciDevice, fJoystick);
    if (!pResources) goto exit;
 
@@ -369 +376 @@
    if (! pResourceList) goto exit;
    pahResources = _pahRMAllocResources( pResourceList );
-   if (! pahResources) goto exit;
+   if (! pahResources) {
+       _state = rmAllocFailed;
+       goto exit;
+   }
 
    //--- Here, we got all the resources we wanted.  Register adapter if not yet done.
@@ -375 +385 @@
    if (_state != rmAdapterCreated) {
       rc = _rmCreateAdapter();
-
-      // Register the device with OS/2 RM.
-      _rmCreateDevice((unsigned char __far *)DeviceName, pahResources );
-   }
+   }
+
+   // Register the device with OS/2 RM.
+   if(fJoystick) {
+        _rmCreateDevice((unsigned char __far *)DeviceNameJoy, pahResources );
+   }
+   else _rmCreateDevice((unsigned char __far *)DeviceName, pahResources );
 
 exit: