Changeset 188 for sbliveos2/trunk/drv16/init.cpp

Timestamp:

Sep 9, 2001, 5:31:35 PM (24 years ago)

Author:

sandervl

Message:

joystick reactivated; version increase; Rudi's fixes

File:

• sbliveos2/trunk/drv16/init.cpp (modified) (3 diffs)

sbliveos2/trunk/drv16/init.cpp

@@ -65 +65 @@
 #define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002UL
 #endif
-#define PCI_ID  ((PCI_DEVICE_ID_CREATIVE_EMU10K1<<16UL)|PCI_VENDOR_ID_CREATIVE)
+
+#ifndef PCI_DEVICE_ID_CREATIVE_EMU10K1_JOYSTICK
+#define PCI_DEVICE_ID_CREATIVE_EMU10K1_JOYSTICK 0x7002
+#endif
+
+#define PCI_ID     ((PCI_DEVICE_ID_CREATIVE_EMU10K1<<16UL)|PCI_VENDOR_ID_CREATIVE)
+#define PCI_IDJOY  ((PCI_DEVICE_ID_CREATIVE_EMU10K1_JOYSTICK<<16UL)|PCI_VENDOR_ID_CREATIVE)
 
 // Default MIDI timer interval, milliseconds.
@@ -76 +82 @@
 static char szSBLiveAllocResFailed1[] = "Another device driver was granted exclusive access to IRQ ";
 static char szSBLiveAllocResFailed2[] = "Unable to allocate hardware resources! Aborting...";
-static char szSBLiveConfig1[]  = "SB Live! configuration: IRQ ";
-static char szSBLiveConfig2[]  = ", IO Port 0x";
-
+static char szSBLiveConfig1[]   = "SB Live! configuration: IRQ ";
+static char szSBLiveConfig2[]   = ", IO Port 0x";
+static char szSBLiveConfigJoy[] = "SB Live! Joystick     : IO Port 0x";
 
 //
@@ -183 +189 @@
         HexWordToASCII(digit, pResources->uIOBase[0], 0);
         DosWrite(1, (VOID FAR*)digit, strlen(digit), &result);
-
-        DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
-        DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
    }
    delete pResources;
+
+   //Joystick detection
+   if(pRM->bIsDevDetected(PCI_IDJOY, SEARCH_ID_DEVICEID, TRUE)) 
+   {
+       pResources = pRM->pGetDevResources(PCI_IDJOY, SEARCH_ID_DEVICEID, TRUE, TRUE);
+       if((pResources) && !pResources->isEmpty() && fVerbose) {
+           USHORT result;
+           DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
+           DosWrite(1, (VOID FAR*)szSBLiveConfigJoy, sizeof(szSBLiveConfigJoy)-1, &result);
+           HexWordToASCII(digit, pResources->uIOBase[0], 0);
+           DosWrite(1, (VOID FAR*)digit, strlen(digit), &result);
+       }
+       delete pResources;
+   }
+   if (fVerbose) {
+        USHORT result;
+        DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
+        DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
+   }
 
    // Build the MPU401 object only if we got a good 2115 init.