Changeset 473

Timestamp:

Nov 9, 2009, 2:36:35 AM (16 years ago)

Author:

pasha

Message:

Fix buffers overflow problem, check Flash10, fix some strange code

Location:

OCO/trunk/drv16

Files:

• audiohw.cpp (modified) (3 diffs)
• commdbg.c (modified) (1 diff)
• dwavestrm.cpp (modified) (2 diffs)
• ioctl.cpp (modified) (15 diffs)
• ossidc16.cpp (modified) (2 diffs)
• ssm_idc.cpp (modified) (3 diffs)
• strategy.cpp (modified) (2 diffs)
• timer.cpp (modified) (3 diffs)
• waveplay.cpp (modified) (16 diffs)
• wavestrm.cpp (modified) (12 diffs)

OCO/trunk/drv16/audiohw.cpp

@@ -128 +128 @@
       OPERATION_RECORD
    },
-   {  // Last device is marked as AUDIOHW_INVALID_DEVICE
-      AUDIOHW_INVALID_DEVICE,
-      -1,
-      -1,
-      -1
-   },
-   {  // Last device is marked as AUDIOHW_INVALID_DEVICE
-      AUDIOHW_INVALID_DEVICE,
-      -1,
-      -1,
-      -1
+   {  // ALSA PCM support ADPCM
+      AUDIOHW_WAVE_PLAY,
+      0,
+      DATATYPE_ADPCM_AVC,
+      OPERATION_PLAY
+   },
+   {  //
+      AUDIOHW_INVALID_DEVICE,
+      0,
+      DATATYPE_ADPCM_AVC,
+      OPERATION_RECORD
    },
    {  // Last device is marked as AUDIOHW_INVALID_DEVICE
@@ -281 +281 @@
 {
    int i;
-
    for (i = 0;
        ((i < NUM_HARDWARE_DEVICE_TYPES) &&
@@ -291 +290 @@
    } /* endfor */
    return (HardwareArray[i].DeviceType);
-
 }

OCO/trunk/drv16/commdbg.c

@@ -390 +390 @@
         mov     al,c
         out     dx, al
-
-        DELAY
-        DELAY
-        DELAY
         }
 }

OCO/trunk/drv16/dwavestrm.cpp

@@ -166 +166 @@
 ULONG DWAVESTREAM::StartStream(void)
 {
+    dprintf(("DWAVESTREAM::StartStream"));
    return WAVESTREAM::StartStream();
 }
@@ -175 +176 @@
    ULONG space, Buff_left, byteswritten;
 
-   if(!pTemp) pTemp = (PSTREAMBUFFER)qhInProcess.Tail();
-
-   if(ulStreamType & STREAM_WRITE && pTemp && pTemp->looping) 
+    dprintf(("DW::AddBuffers"));
+    if (!pTemp) pTemp = (PSTREAMBUFFER)qhInProcess.Tail();
+
+    if (ulStreamType & STREAM_WRITE && pTemp && pTemp->looping) 
+    {
+        Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
+        if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS) 
+        {
+            dprintf(("DWAVESTREAM::AddBuffers GetPositions"));
+            DebugInt3();
+            return;
+        }
+        if(fFirst) 
+        {
+             space = min(space, 4*_configinfo.ulFragsize);
+        }
+        else
+        { 
+            space = min(space, _configinfo.ulFragsize);
+        }
+        if (space) 
+        {
+           if (space >= Buff_left) 
+           {
+              byteswritten = AddBuffer(Buff_left);
+              if (byteswritten == Buff_left) 
+              {
+                  pTemp->ulBuffpos = 0; //reset fill position
+                  AddBuffer(space - Buff_left);
+              }
+           }
+           else 
+           {
+              AddBuffer(space);
+           }
+        }       
+        pTemp->ulDonepos = 0; //make sure it ::Process never thinks it's done
+   }
+   else 
    {
-        Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
-
-            if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS) 
-           {
-               dprintf(("DWAVESTREAM::AddBuffers GetPositions"));
-               DebugInt3();
-               return;
-           }
-        if(fFirst) {
-             space = min(space, 4*_configinfo.ulFragsize);
-        }
-        else space = min(space, _configinfo.ulFragsize);
-
-            if(space) {
-            if(space >= Buff_left) {
-                 byteswritten = AddBuffer(Buff_left);
-                 if(byteswritten == Buff_left) {
-                     pTemp->ulBuffpos = 0; //reset fill position
-                     AddBuffer(space - Buff_left);
-                 }
-            }
-            else AddBuffer(space);
-            }   
-        pTemp->ulDonepos = 0; //make sure it ::Process never thinks it's done
-   }
-   else WAVESTREAM::AddBuffers(fFirst);
+     WAVESTREAM::AddBuffers(fFirst);
+   }
+    dprintf(("DW::AddBuffers End"));
 }
 //*****************************************************************************

OCO/trunk/drv16/ioctl.cpp

@@ -203 +203 @@
 
 #ifdef DEBUG
-//   dprintf(("IACapability: src type: %d, op %d",(USHORT)p->ulDataType, (USHORT)p->ulOperation));
+   dprintf(("IACapability: src type: 0x%lx, op %d",p->ulDataType, (USHORT)p->ulOperation));
 #endif
 
@@ -210 +210 @@
 
 #ifdef DEBUG
-//   dprintf(("IACapability: dev type: %d, ldev %d",ulDevicetype, LDev));
+   dprintf(("IACapability: dev type: %ld, ldev %d",ulDevicetype, LDev));
 #endif
 
@@ -223 +223 @@
    {
       pHWobj->DevCaps(p);
-      if (p->ulSupport != SUPPORT_SUCCESS) {
+      if (p->ulSupport != SUPPORT_SUCCESS) 
+      {
+         //PS+++ filling to our parameters as say mmpm2.inf for returning error in this call
+         // (for HDA only!!!!!)
+         p->ulDataType     = WAVE_FORMAT_4S16;
+         p->ulChannels     = 2;
+         p->ulSamplingRate = HZ_44100;
+         //
          dprintf(("IACapability: Error support"));
          prp->usStatus |= RPERR;
@@ -232 +239 @@
        dprintf(("IACapability: Error get HW obj"));
 #endif
+      //PS+++ filling to our parameters as say mmpm2.inf for returning error in this call
+      // (for HDA only!!!!!)
+      p->ulDataType     = WAVE_FORMAT_4S16;
+      p->ulChannels     = 2;
+      p->ulSamplingRate = HZ_44100;
+      //
       p->ulSupport = UNSUPPORTED_DATATYPE;
       prp->usStatus |= RPERR;
@@ -367 +380 @@
 void IoctlDirectAudio(PREQPACKET prp)
 {
-    dprintf(("IoctlDirectAudio"));
+    dprintf(("IoctlDirectAudio Code:0x%x",prp->s.ioctl.bCode));
     if(prp->s.ioctl.bCode == DAUDIO_OPEN)
     {
@@ -396 +409 @@
         {
             pHWobj->DevCaps(&audioCaps);
-            if (audioCaps.ulSupport != SUPPORT_SUCCESS) {
+            if (audioCaps.ulSupport != SUPPORT_SUCCESS) 
+            {
                 dprintf(("IDirectAudio: DevCaps failed"));
                 pInit->sReturnCode = INVALID_REQUEST;
@@ -403 +417 @@
             }
         }
-        else {
+        else 
+        {
+            dprintf(("IDirectAudio: HW DevCaps failed"));
             pInit->sReturnCode = INVALID_REQUEST;
             prp->usStatus |= RPERR;
@@ -418 +434 @@
         }
 
-        if(!pStream->IsEverythingOk()) {
+        if(!pStream->IsEverythingOk()) 
+        {
             delete pStream;
             dprintf(("IlDirectAudio: IsEverythingOk"));
@@ -465 +482 @@
         {
             pHWobj->DevCaps(&audioCaps);
-            if (audioCaps.ulSupport != SUPPORT_SUCCESS) {
+            if (audioCaps.ulSupport != SUPPORT_SUCCESS) 
+            {
                 dprintf(("IlDirectAudio: DevCaps failed"));
                 prp->usStatus |= RPERR;
@@ -471 +489 @@
                 return;
             }
+            dprintf(("IoctlDirectAudio ret"));
             pInit->sReturnCode = 0;
             return;
         }
         else {
+            dprintf(("IoctlDirectAudio err req"));
             pInit->sReturnCode = INVALID_REQUEST;
             prp->usStatus |= RPERR;
@@ -499 +519 @@
         {
             pHWobj->DevCaps(lpCaps);
-            return;
-        }
-        else {
+            dprintf(("IoctlDirectAudio ret1"));
+            return;
+        }
+        else 
+        {
             prp->usStatus |= RPERR;
+            dprintf(("IoctlDirectAudio ret err1"));
             return;
         }
@@ -509 +532 @@
 
     pStream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
-    if(pStream == NULL) {
+    if(pStream == NULL) 
+    {
         dprintf(("IDirectAudio stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
         DebugInt3();
@@ -547 +571 @@
     case DAUDIO_START:
     {
-        if(numFreeStreams > 0) {
+        if(numFreeStreams > 0) 
+        {
               rc = pStream->StartStream();
               if(!rc) numFreeStreams--;
@@ -621 +646 @@
     }
 
-    if(rc) {
+    if(rc) 
+    {
+        dprintf(("IoctlDirectAudio ret err rc=%ld",rc));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
     }
+    dprintf(("IoctlDirectAudio ret Ok"));
     return;
 }
@@ -644 +672 @@
 {
 #ifdef DEBUG
-    dprintf(("StrategyIoctl:cat:0x%x, code:0x%x dev %d", prp->s.ioctl.bCategory, prp->s.ioctl.bCode, current_device));
+    dprintf(("StrategyIoctl:cat:0x%x, code:0x%x cd %d gd %d", prp->s.ioctl.bCategory, prp->s.ioctl.bCode, current_device, LDev));
 #endif
     if (prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT) 

OCO/trunk/drv16/ossidc16.cpp

@@ -715 +715 @@
     {
         PWAVESTREAM pStream;
-//            dprintf(("IDC16_PROCESS. param1: %x, param2: %x",param1, param2));
-        //Signal all active wave playback streams to update their status
+//           dprintf(("IDC16_PROCESS"));
+           //Signal all active wave playback streams to update their status
             pStream = (PWAVESTREAM)FindFirstActiveStream(STREAM_WAVE_PLAY);
             while(pStream) 
@@ -722 +722 @@
                 pStream->Process();
                pStream = (PWAVESTREAM)FindNextActiveStream(STREAM_WAVE_PLAY, pStream);
-            }
-        //Signal all active wave capture streams to update their status
-        pStream = (PWAVESTREAM)FindFirstActiveStream(STREAM_WAVE_CAPTURE);
-        while(pStream) {
-                    pStream->Process();
-                    pStream = (PWAVESTREAM)FindNextActiveStream(STREAM_WAVE_CAPTURE, pStream);
-            }
-            break;
+           }
+           //Signal all active wave capture streams to update their status
+           pStream = (PWAVESTREAM)FindFirstActiveStream(STREAM_WAVE_CAPTURE);
+           while(pStream) 
+           {
+                 pStream->Process();
+                 pStream = (PWAVESTREAM)FindNextActiveStream(STREAM_WAVE_CAPTURE, pStream);
+           }
+//           dprintf(("IDC16_PROCESS end"));
+           break;
     }
 

OCO/trunk/drv16/ssm_idc.cpp

@@ -98 +98 @@
            }
 #endif
+//           ddprintf(("DDCMD_WRITE beg"));
            ulReturnCode = pstream->Write((PSTREAMBUF) p->pBuffer,(unsigned) p->ulBufferSize);
 //           ddprintf(("DDCMD_WRITE %lx rc=%ld",p->ulBufferSize, ulReturnCode));
@@ -132 +133 @@
          case DDCMD_STOP:
              ddprintf(("DDCMD_STOP"));
-             DevHelp_ProcBlock ((ULONG)p, 2, 0);
+//             DevHelp_ProcBlock ((ULONG)p, 2, 0);
              p->ulParmSize=sizeof(ULONG);
              return pstream->StopStream((PCONTROL_PARM)p->pParm);
@@ -146 +147 @@
              return pstream->EnableEvent(p);
          case DDCMD_DISABLE_EVENT:
-//             ddprintf(("DDCMD_DISABLE_EVENT"));
+             ddprintf(("DDCMD_DISABLE_EVENT"));
              return pstream->DisableEvent(p);
          case DDCMD_PAUSE_TIME:
-//             ddprintf(("DDCMD_PAUSE_TIME"));
+             ddprintf(("DDCMD_PAUSE_TIME"));
              return pstream->PauseStreamTime();
          case DDCMD_RESUME_TIME:

OCO/trunk/drv16/strategy.cpp

@@ -52 +52 @@
 
 SOUNDCARD soundCard = NO_AUDIO;
+
+#ifdef ENABLE_HW_CERTIFICATION
 
 extern "C" char szINTEL_ICH[];
@@ -82 +84 @@
 extern "C" char szAZX[];
 
-#ifdef ENABLE_HW_CERTIFICATION
 static char *pszIntelICH        = (char *)szINTEL_ICH;
-#if 0 // fixme to be gone
 static char *pszSigmatel9721_23 = (char *)szSIGMATEL_9721_23;
-#endif
 static char *pszSBLive          = (char *)szSBLIVE;
 static char *pszCMedia          = (char *)szCMEDIA;

OCO/trunk/drv16/timer.cpp

@@ -127 +127 @@
    pStream = (MIDISTREAM*) FindActiveStream( ulStreamType );
 
+   dprintf(("TIMER::Ctx"));
    if (pStream)   // Should always be a valid fn adr when timer is running.
       pStream->Process();
@@ -324 +325 @@
    USHORT rc;
 
+   dprintf(("TIMER::iStart"));
    // Disable any any pre-existing timer and reset state variables.
    if ( _eState != TIMER_Stopped )
@@ -369 +371 @@
 int TIMER::_iStop()
 {
+   dprintf(("TIMER::iStop"));
    _eState = TIMER_Stopped;            // Stop this Timer.
    if (! TIMER::_isAnyRunning()) {     // If no other Timers are running...

OCO/trunk/drv16/waveplay.cpp

@@ -61 +61 @@
     ULONG ret;
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::Open %lx",StreamId));
+//    dprintf(("WAVEPLAY::Open %lx",StreamId));
 #endif
     if (fAPMSuspend)
     {
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::Open. Suspend state"));
+//        dprintf(("WAVEPLAY::Open. Suspend state"));
 #endif
         apm_resume();
@@ -107 +107 @@
 {
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::Close stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
+//    dprintf(("WAVEPLAY::Close stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
 #endif
 #if 0 // fixme to be gone?
@@ -119 +119 @@
         force_closed = 0;
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
+//        dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
 #endif
         return TRUE;
@@ -140 +140 @@
                 open_strategy = 0UL;
 #ifdef DEBUG
-                dprintf(("OSS16_WAVECLOSE: Success"));
+//                dprintf(("OSS16_WAVECLOSE: Success"));
 #endif /* DEBUG */
                 return TRUE;
@@ -171 +171 @@
     {
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::ConfigDev. Suspend state"));
+//        dprintf(("WAVEPLAY::ConfigDev. Suspend state"));
 #endif
         apm_resume();
@@ -189 +189 @@
     }
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev1 SampleRate %ld", pConfigInfo->ulHwSampleRate));
-    dprintf(("WAVEPLAY::ConfigDev1 ulFirstBufSize %ld", ulFirstBufSize));
-    dprintf(("WAVEPLAY::ConfigDev1 ulFragsize %ld", pConfigInfo->ulFragsize));
+    dprintf(("WAVEPLAY::ConfigDev1\nSampleRate %ld", pConfigInfo->ulHwSampleRate));
+    dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
+    dprintf(("ulFragsize %ld", pConfigInfo->ulFragsize));
 #endif
 
@@ -211 +211 @@
         ulFirstBufSize = ConvertLength(ulFirstBufSize, pConfigInfo);
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::ConfigDev2 ulFirstBufSize %ld", ulFirstBufSize));
+        dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
 #endif /* DEBUG */
     }
@@ -223 +223 @@
     ulPCMConsumeRate = ConvertLength(pConfigInfo->ulPCMConsumeRate, pConfigInfo);
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev: cons rate %ld buf size %ld init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
+    dprintf(("cons rate %ld buf size %ld init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
 #endif /* DEBUG */
 
@@ -252 +252 @@
 
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev2 fragsize %ld", fragsize));
+    dprintf(("fragsize %ld", fragsize));
 #endif
     hwparam.ulSampleRate    = pConfigInfo->ulHwSampleRate;
@@ -261 +261 @@
 #ifdef DEBUG
         dprintf(("WAVEPLAY:ConfigDev:OSS16_WaveSetFormat . rc = %d",rc));
-        dprintf(("WAVEPLAY:ConfigDev:samp rate %ld",hwparam.ulSampleRate));
-        dprintf(("WAVEPLAY:ConfigDev:bits per sample %ld",hwparam.ulBitsPerSample));
-        dprintf(("WAVEPLAY:ConfigDev:channels %ld",hwparam.ulNumChannels));
-        dprintf(("WAVEPLAY:ConfigDev:data type %ld",hwparam.ulDataType));
+        dprintf(("samp rate %ld",hwparam.ulSampleRate));
+        dprintf(("bits per sample %ld",hwparam.ulBitsPerSample));
+        dprintf(("channels %ld",hwparam.ulNumChannels));
+        dprintf(("data type %ld",hwparam.ulDataType));
 
 #endif
@@ -294 +294 @@
     {
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::Transfer. Suspend state"));
+//        dprintf(("WAVEPLAY::Transfer. Suspend state"));
 #endif
         apm_resume();
@@ -415 +415 @@
             dprintf(("WPLAY::AddBuffer need %ld space:%ld", ulCvtBufferSize, Space));
 #endif
-            while (!Space)
-               for (i=0; i < 0xffffff; i++)
-               {
-                    OSS16_WaveGetSpace(StreamId, &Space);
-                    if (Space & ~(pConfigInfo->ulHwSampleSize - 1)) break;
-               }
-#ifdef DEBUG
-            dprintf(("OUT %lx need %ld space:%ld ",i, ulCvtBufferSize, Space));
-#endif
+            if (Space < pConfigInfo->ulBytesPerIRQ)
+            {
+               return TRUE;
+            }
+
             if (ulCvtBufferSize > Space)
                 ulCvtBufferSize = Space & ~(pConfigInfo->ulHwSampleSize - 1);
@@ -433 +429 @@
             {
                  GetSpace(StreamId, pConfigInfo, &Space);
-                 dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld %x failed due to full buffer free space:%ld", ulCvtBufferSize, (USHORT)rc,Space));
+                 dprintf(("WPLAY::AddBuffer; %ld %x failed due to full buffer free space:%ld", ulCvtBufferSize, (USHORT)rc,Space));
             }
 #ifdef DEBUG
             else 
-                dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
+                dprintf(("WPLAY::AddBuffer; %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
 #endif
             *pulBytesTransferred = 0;
@@ -492 +488 @@
         *pulStreamPosition = 0;
 #ifdef DEBUG
-        dprintf(("OSS16_WAVEPLAY::GetPosition: Failed"));
+        dprintf(("WAVEPLAY::GetPosition: Failed"));
 #endif /* DEBUG */
         return FALSE;
@@ -515 +511 @@
         *pulStreamSpace = 0;
 #ifdef DEBUG
-        dprintf(("OSS16_WAVEPLAY::GetSpace: Failed"));
+        dprintf(("WAVEPLAY::GetSpace: Failed"));
 #endif /* DEBUG */
         return FALSE;
@@ -537 +533 @@
         *pulHwPtr = 0;
         #ifdef DEBUG
-        dprintf(("OSS16_WAVEPLAY::WaveGetHwPtr: Failed"));
+        dprintf(("WAVEPLAY::WaveGetHwPtr: Failed"));
         #endif /* DEBUG */
         return FALSE;

OCO/trunk/drv16/wavestrm.cpp

@@ -181 +181 @@
         }
         space &= (~(_configinfo.ulSampleSize - 1));
-        curspace = space;
+        curspace = min(space, _configinfo.ulBytesPerIRQ/_configinfo.ulSampleSize * 2);
         while (space && qhInProcess.IsElements()) 
         {
@@ -188 +188 @@
             if (fFirst == TRUE)  //PS+++
             {
-                 DevHelp_ProcBlock (space, 20, 0);
+                cli();
+//                 DevHelp_ProcBlock (space, 20, 0);
             }
 //            dgprintf(("AddBuffers write %ld SSize:%ld %d",space, _configinfo.ulSampleSize, fFirst == TRUE?1:2));
@@ -195 +196 @@
             {
 //                dgprintf(("WAVESTREAM::AddBuffers Error 2"));
-                return;
+                break;
             }
             if(byteswritten == (ULONG)-1)
@@ -233 +234 @@
     if(pahw->GetHwPtr(StreamId, &_configinfo, &start_pos) == FALSE)
     {
-        dgprintf(("WAVESTREAM::AddBuffer Error in WaveGetHwPtr"));
+        dgprintf(("WAVESTREAM::AddBuffer Err in GetHwPtr"));
         DebugInt3();
         return (ULONG)-1;
@@ -240 +241 @@
     if (!pTemp->ulBuffsz || !space)
     {
-        dgprintf(("WAVESTREAM::AddBuffer NULL, Bufsz:%ld Space:%ld",pTemp->ulBuffsz, space));
+        dgprintf(("WAVESTREAM::AddBuffer 0, Bufsz:%ld Space:%ld",pTemp->ulBuffsz, space));
         //PS+++ if is ZERO do nothing and ask for give new buffer, See REMARK in mmpm2.inf
         qhDone.PushOnTail(qhInProcess.PopHead());
 //        DebugInt3();
-        return 0;
+        return -1;
     }
     // get the buffer pointer and amount of data remaining
@@ -261 +262 @@
         dgprintf(("AddBuffer: No more room!!"));
 //        DebugInt3();
-        return (ULONG)-1; //no more room
+//PS+++        return (ULONG)-1; //no more room
+        return 0;   //PS+++ may be in next time?
     }
     // update the buffer pos counter
@@ -304 +306 @@
     }
 
-    dprintf4(("_vReadAudioBuf %lx size %ld, bytes read %ld", pdataBuf, Buff_left, bytesread));
+//    dprintf4(("_vReadAudioBuf %lx size %ld, bytes read %ld", pdataBuf, Buff_left, bytesread));
 
     // update the buffer pos counter
@@ -325 +327 @@
 // can be returned and finally process any events pending.
 //******************************************************************************
-//USHORT ProcNumber = 0;
+USHORT ProcNumber = 0;
 void DBGCALLCONV WAVESTREAM::Process(void)
 {
  PSTREAMBUFFER ptemp;
  ULONG         ulCurBytesProcessed = 0;
-// USHORT        CurProcNumber = ProcNumber++;
+ USHORT        CurProcNumber = ProcNumber++;
  ULONG         space;
 
@@ -351 +353 @@
     _ulBytesProcessed = ulCurBytesProcessed;
 
-//    if ((pahw->GetSpace(StreamId, &_configinfo, &space) != FALSE) && (space > _configinfo.ulBytesPerIRQ))
-    switch (ulStreamType & STREAM_WRITE) {
+    if ((pahw->GetSpace(StreamId, &_configinfo, &space) != FALSE) && (space > _configinfo.ulBytesPerIRQ/_configinfo.ulSampleSize ))
+    switch (ulStreamType & STREAM_WRITE) 
+    {
 
         // if there are buffers that have been completly written to the audio buffer
@@ -522 +525 @@
 
 #ifdef DEBUG
-    ddprintf(("WAVESTREAM::StartStream"));
+//    ddprintf(("WAVESTREAM::StartStream"));
 #endif
 
@@ -572 +575 @@
         }
     }
-    ddprintf(("WAVESTREAM::StartStream %lx End", StreamId));
+//    ddprintf(("WAVESTREAM::StartStream %lx End", StreamId));
     return NO_ERROR;
 
@@ -598 +601 @@
 
     ulStreamState = STREAM_STOPPED;
-    ddprintf(("WAVESTREAM::StopStream %lx", StreamId));
+//    ddprintf(("WAVESTREAM::StopStream %lx", StreamId));
     ReturnBuffers();
     pControl->ulTime = GetCurrentTime();