Changeset 188 for sbliveos2/trunk/drv16

Timestamp:

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

Author:

sandervl

Message:

joystick reactivated; version increase; Rudi's fixes

Location:

sbliveos2/trunk/drv16

Files:

• init.cpp (modified) (3 diffs)
• ioctl.cpp (modified) (1 diff)
• wavestrm.cpp (modified) (5 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.

sbliveos2/trunk/drv16/ioctl.cpp

@@ -108 +108 @@
       }
       else {
-         delete pstream;
+#if 1
+        // Rudi: Workaround for MMPM device sharing bug
+        if (pstream->ulStreamState & STREAM_STREAMING) {
+          CONTROL_PARM dummy;
+          pstream->PauseStream(&dummy);
+          pstream->ResumeStream();
+          p->pvReserved = (VOID FAR *) (ULONG)prp->s.ioctl.usSysFileNum;
+          p->sReturnCode = 0;
+          return;
+        }
+#endif
+         delete pstream;
       }
    }

sbliveos2/trunk/drv16/wavestrm.cpp

@@ -165 +165 @@
                 //underrun: stop playback
                 dprintf(("underrun: stop playback"));
-                pahw->Stop(this);
+                pahw->Stop(this);
                 fUnderrun = TRUE;
                 return;
@@ -171 +171 @@
         space = OSS16_StreamGetSpace(this);
         while(space) {
-                byteswritten = AddBuffer(space);
+                byteswritten = AddBuffer(space);
+                if(byteswritten == (ULONG)-1) break;
                 space -= byteswritten;
-                if(byteswritten == 0) break;
-        }       
+        }
    }
 }
@@ -191 +191 @@
 
    if(!pTemp || pTemp->ulBuffpos >= (pTemp->ulBuffsz & 0xFFFFFFFC)) {
-        pTemp = (PSTREAMBUFFER)qhInProcess.Head();
+        pTemp = (PSTREAMBUFFER)qhInProcess.Head();
    }
    if(!pTemp) {
         dprintf4(("AddBuffer: pTemp == NULL"));
-        return 0;
+        return (ULONG)-1;
    }
 
@@ -202 +202 @@
    Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
 
-   // write the audio buffer
-   Buff_left = min(Buff_left, space);
-   byteswritten = OSS16_StreamAddBuffer(this, pdataBuf, Buff_left);
-   if(byteswritten == 0) {
-        return 0; //no more room
-   }
-
-   // update the buffer pos counter
-   pTemp->ulBuffpos += byteswritten;
-
-   if(pTemp != qhDone.Tail()) {
-        qhDone.PushOnTail(qhInProcess.PopHead());
+   if(Buff_left) {
+        // write the audio buffer
+        Buff_left = min(Buff_left, space);
+        byteswritten = OSS16_StreamAddBuffer(this, pdataBuf, Buff_left);
+        if(byteswritten == 0) {
+            return (ULONG)-1; //no more room
+        }
+
+        // update the buffer pos counter
+        pTemp->ulBuffpos += byteswritten;
+   } 
+   else byteswritten = 0;
+
+   if(pTemp == qhInProcess.Head()) {
+        qhDone.PushOnTail(qhInProcess.PopHead());
    }
    dprintf4(("AddBuffer %lx size %d, bytes written %d", pdataBuf, (USHORT)Buff_left, (USHORT)byteswritten));
@@ -299 +302 @@
           else  break; //shouldn't happen
         }
-
-        //Get rid of empty buffers
-        ptemp = (PSTREAMBUFFER)qhInProcess.Head();
-        if(ptemp && (ptemp->ulBuffsz == 0 || ptemp->pBuffptr == NULL)) {
-                dprintf(("Returning 0 size buffer immediately"));
-                ReturnBuffer();
-        }
-        AddBuffers(FALSE);
-        break;
-   }
-   case STREAM_READ:            
-        while(_vReadAudioBuf());
-        break;
+        AddBuffers(FALSE);
+        break;
+   }
+   case STREAM_READ:
+        while(_vReadAudioBuf());
+        break;
    default:
       break;