Changeset 513 for OCO/branches/DAZ/drv16/wavestrm.cpp

Timestamp:

Jul 12, 2010, 12:57:31 AM (15 years ago)

Author:

David Azarewicz

Message:

AddBuffers reentry fix

File:

• OCO/branches/DAZ/drv16/wavestrm.cpp (modified) (21 diffs)

OCO/branches/DAZ/drv16/wavestrm.cpp

@@ -42 +42 @@
 extern "C" ULONG  __cdecl __saveregs OSSIDC_EntryPoint(ULONG cmd, ULONG param1, ULONG param2);
 
+#define SNDRV_PCM_STATE_XRUN 4 /* stream reached an xrun */
 
 //******************************************************************************
@@ -148 +149 @@
 {
         if (ulStreamState == STREAM_STOPPED) return;
-        rprintf(("%s: Buffer Underrun-stop", pchStr));
-        pahw->SetVolume(StreamId, getMixerStreamId(), 0);
+        rprintf(("%s: Underrun-stop", pchStr));
+        //pahw->SetVolume(StreamId, getMixerStreamId(), 0);
         pahw->Stop(StreamId);
         ulStreamState = STREAM_STOPPED;
@@ -160 +161 @@
 {
         if (ulStreamState == STREAM_STREAMING) return 0;
+        rprintf(("Underrun-start"));
         PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhInProcess.Head();
-        if(pahw->ConfigDev(StreamId, &_configinfo, (pTemp) ? pTemp->ulBuffsz : 0) == FALSE) {
-                rprintf(("WS::Write: ConfigDev failed"));
-                return ERROR_INSUFF_BUFFER;
-        }
+//      if(pahw->ConfigDev(StreamId, &_configinfo, (pTemp) ? pTemp->ulBuffsz : 0) == FALSE) {
+//              rprintf(("WS::Write: ConfigDev failed"));
+//              return ERROR_INSUFF_BUFFER;
+//      }
+        _configinfo.ulSRatePosition = 0;
         // prepare wave device for playback/recording
         if(pahw->Prepare(StreamId) == FALSE) {
-                rprintf(("WS::Write: Prepare failed"));
+                rprintf(("WS::UR Start: Prepare failed"));
                 return ERROR_START_STREAM;
         }
@@ -175 +178 @@
         ulStreamState = STREAM_STREAMING;
         fUnderrun = FALSE;
-        if (ulStreamType == STREAM_WAVE_PLAY) pahw->SetVolume(StreamId, getMixerStreamId(), volume);
+        //if (ulStreamType == STREAM_WAVE_PLAY) pahw->SetVolume(StreamId, getMixerStreamId(), volume);
         return 0;
 }
@@ -185 +188 @@
 // if this is a write stream call _vFillAudioBuf
 //******************************************************************************
+short sDbgInProcess = 0;
+short sDbgSave;
 #pragma off (unreferenced)
-void WAVESTREAM::AddBuffers(BOOL fFirst)
+void WAVESTREAM::AddBuffers(SHORT sFirst)
 #pragma on (unreferenced)
 {
@@ -193 +198 @@
         ULONG ulStatus;
 
-        //dprintf(("WS:AddBuffers First=%d, SampleSize=%lx", fFirst, _configinfo.ulSampleSize));
+        //dprintf(("WS:AddBuffers First=%d, SampleSize=%lx", sFirst, _configinfo.ulSampleSize));
+
+        if (sDbgInProcess) {
+                rprintf(("WS::ABS InProcess Now=%x Save=%x", sFirst, sDbgSave));
+                return;
+        }
+        sDbgInProcess++;
+        sDbgSave = sFirst;
 
         ulBytesWritten = 0;
@@ -204 +216 @@
                 // In extream cases we will stay stuck in this loop long enough to casue a trap rjj
                 if (pahw->GetSpace(StreamId, &_configinfo, &ulSpace) == FALSE) {
-                        rprintf(("WAVESTREAM::AddBuffers GetSpace failed"));
+                        rprintf(("WS::ABS GetSpace failed"));
                         return;
                 }
                 ulSpace &= (~(_configinfo.ulSampleSize - 1));
 #if 1
+                /* DAZ testing -- underrun detection */
                 if (ulSpace == 0) {
                         OSS16_WaveGetStatus(StreamId, &ulStatus);
-                        rprintf(("WAVESTREAM::AddBuffers ulSpace=0, u32status=%lx", ulStatus));
-
-                        _vUnderrunStop("WS:AB");
+                        rprintf(("WS::ABS ulSpace=0 state=%lx u32status=%lx", ulStreamState, ulStatus));
+
+                        _vUnderrunStop("WS:ABS");
                         _vUnderrunStart();
 
                         if (pahw->GetSpace(StreamId, &_configinfo, &ulSpace) == FALSE) {
-                                rprintf(("WS::AB GetSpace failed"));
+                                rprintf(("WS::ABS GetSpace failed"));
                                 return;
                         }
                         ulSpace &= (~(_configinfo.ulSampleSize - 1));
+                        if (ulSpace ==0) rprintf(("WS::ABS still no space"));
                 }
 #endif
@@ -227 +241 @@
                 {
                         if (ulDAZ++ > 20) {
-                                rprintf(("WAVESTREAM::AddBuffers DAZ break")); // Temporary hack to prevent lockups when uniaud32 stops (underrun)
+                                rprintf(("WS::ABS DAZ break")); // Temporary hack to prevent lockups when uniaud32 stops (underrun)
                                 int3(); /* should never happen */
                                 break;
                         }
-#if 0
-//DAZ move the ProcBlock to the start stream code, if really needed
-                        // First time is in task time. For I7 need to give time for interrupt time
-                        if (fFirst == TRUE)  //PS+++
-                        {
-                                //cli();
-                                DevHelp_ProcBlock (0x5541, 20, 0); // ok since the first call is at task time
-                                ulBytesWritten = AddBuffer(ulSpace);
-                                return;
-                        }
-#endif
                         ulBytesWritten = AddBuffer(ulSpace);
                         if (ulBytesWritten == (ULONG)-1) {
                                 OSS16_WaveGetStatus(StreamId, &ulStatus);
-                                rprintf(("WAVESTREAM::AddBuffers AddBuffer returns -1 u32Status=%lx", ulStatus));
+                                rprintf(("WS::ABS AddBuffer returns -1 u32Status=%lx", ulStatus));
                                 break;
                         }
@@ -255 +258 @@
 //              }
         }
+        sDbgInProcess--;
 }
 
@@ -296 +300 @@
         if (pahw->Transfer(StreamId, &_configinfo, pDataBuf, ulBuffLeft, &ulBytesWritten) == FALSE) {
                 // This could mean that the hardware has underrun TODO: implement underrun logic
-                rprintf(("WS::AddBuffer: pahw->Transfer failed"));
+                rprintf(("WS::AB: pahw->Transfer failed"));
                 return (ULONG)-1;
         }
+        //dprintf(("WS::AB: %lx of %lx bytes written", ulBytesWritten, ulBuffLeft));
         if (ulBytesWritten == 0) {
                 // This could mean that the hardware has underrun TODO: implement underrun logic
-                rprintf(("WS::AddBuffer: 0 of %lx bytes written by transfer", ulBuffLeft));
+                //rprintf(("WS::AddBuffer: 0 of %lx bytes written by transfer", ulBuffLeft));
                 return (ULONG)-1;
         }
@@ -396 +401 @@
                                 break;
                         }
-                        if (qhInProcess.IsElements()) AddBuffers(FALSE);
+                        if (qhInProcess.IsElements()) AddBuffers(1);
                         // Return any buffers that have been completely written to uniaud32
                         //dprintf(("WS::Process usBufferMode=%x", usBufferMode));
@@ -418 +423 @@
                         while(_vReadAudioBuf()) {
                                 if (ulDAZ++ > 20) { /* temporary hack to prevent hangs when uniaud32 stops (overruns) */
-                                        rprintf(("WAVESTREAM::Process Read DAZ Break"));
+                                        rprintf(("WS::Process Read DAZ Break"));
                                         break;
                                 }
@@ -442 +447 @@
 //******************************************************************************
 //******************************************************************************
-#define SNDRV_PCM_STATE_XRUN 4 /* stream reached an xrun */
 ULONG WAVESTREAM::Write(PSTREAMBUFFER pStreamBuf)
 {
@@ -457 +461 @@
                 fUnderrun = TRUE;
         }
-#else
-        if (!fUnderrun && !qhInProcess.IsElements()) {
-                rprintf(("WS::Write: Buffer Underrun detect"));
-                fUnderrun = TRUE;
-        }
 #endif
         qhInProcess.PushOnTail((PQUEUEELEMENT)pStreamBuf);
-        //dprintf(("WS::Write: sz=%lx IRQ=%lx", pStreamBuf->ulBuffsz, _configinfo.ulBytesPerIRQ));
-//        if (pStreamBuf->ulBuffsz < (_configinfo.ulBytesPerIRQ*2)) {
-//              dprintf(("WS::Write: BufferMode=1"));
-//              usBufferMode = 1;
-//      }
         if (fUnderrun) {
                 _vUnderrunStart();
-                AddBuffers(FALSE);
+                AddBuffers(2);
         }
         return 0;
@@ -614 +608 @@
         if (ulStreamType == STREAM_WAVE_PLAY)
         {
+                //DAZ moved from AddBuffers, for I7, might not be needed
+                //DevHelp_ProcBlock (0x5541, 20, 0);
                 pahw->SetVolume(StreamId, getMixerStreamId(), volume);    //PS
-                AddBuffers(TRUE);
+                AddBuffers(3);
         }
         else
@@ -641 +637 @@
 {
         if(ulStreamState == STREAM_STOPPED) {
-                dprintf(("WAVESTREAM::StopStream %lx (already stopped)", StreamId));
+                //dprintf(("WS::StopStream %lx (already stopped)", StreamId));
                 fUnderrun = FALSE;
                 pControl->ulTime = GetCurrentTime();
@@ -676 +672 @@
 
         if(ulStreamState == STREAM_PAUSED) {
-                dprintf(("WAVESTREAM::PauseStream %lx (already paused)", StreamId));
+                dprintf(("WS::PauseStream %lx (already paused)", StreamId));
                 fUnderrun = FALSE;
                 pControl->ulTime = GetCurrentTime();
@@ -691 +687 @@
         if (pahw->GetPosition(StreamId, &_configinfo, &ulEndPos2) == FALSE) ulEndPos2 = 0;
         if (ulEndPos2 != ulEndPos) {
-                dprintf(("WAVESTREAM::PauseStream %lx!=%lx", ulEndPos, ulEndPos2));
+                dprintf(("WS::PauseStream %lx!=%lx", ulEndPos, ulEndPos2));
                 if (ulEndPos2) ulEndPos = ulEndPos2;
         }
@@ -699 +695 @@
         ulStreamState = STREAM_PAUSED;
 
-        dprintf(("WAVESTREAM::PauseStream %lx", StreamId));
+        dprintf(("WS::PauseStream %lx", StreamId));
 
         _ulBytesProcessed = ulEndPos;
@@ -717 +713 @@
 ULONG  WAVESTREAM::ResumeStream(void)
 {
-#ifdef DEBUG
         //dprintf(("WAVESTREAM::ResumeStream %lx", StreamId));
-#endif
         return StartStream();
 }
@@ -729 +723 @@
         case PROPERTY_VOLUME:
                 volume = value;
-                dprintf(("WAVESTREAM::SetProperty() Vol: %0lx",value));
+                dprintf(("WS::SetProperty() Vol: %0lx",value));
                 if(ulStreamState == STREAM_STREAMING && ulStreamType == STREAM_WAVE_PLAY) {
                         MixerSetWaveVolume(getMixerStreamId(), StreamId, volume);