Changeset 478

Timestamp:

Apr 9, 2010, 11:08:21 PM (15 years ago)

Author:

pasha

Message:

remove beep call, remove all int3 for release versions

Location:

OCO/trunk/drv16

Files:

• dwavestrm.cpp (modified) (3 diffs)
• ioctl.cpp (modified) (18 diffs)
• malloc.c (modified) (1 diff)
• mixer.cpp (modified) (4 diffs)
• mpu401.cpp (modified) (14 diffs)
• ssm_idc.cpp (modified) (2 diffs)
• strategy.cpp (modified) (1 diff)
• waudio.cpp (modified) (52 diffs)
• waveplay.cpp (modified) (1 diff)
• wavestrm.cpp (modified) (2 diffs)

OCO/trunk/drv16/dwavestrm.cpp

@@ -176 +176 @@
    ULONG space, Buff_left, byteswritten;
 
-    dprintf(("DW::AddBuffers"));
+//    dprintf(("DW::AddBuffers"));
     if (!pTemp) pTemp = (PSTREAMBUFFER)qhInProcess.Tail();
 
@@ -218 +218 @@
      WAVESTREAM::AddBuffers(fFirst);
    }
-    dprintf(("DW::AddBuffers End"));
+//    dprintf(("DW::AddBuffers End"));
 }
 //*****************************************************************************
@@ -279 +279 @@
    WAVESTREAM(streamtype, pinit, filesysnum, mixerStreamId), fError(FALSE), hCtxHook(0), hSem(0)
 {
+    dprintf(("DWS::DWS Init"));
     if (DevHelp_AllocateCtxHook((NPFN)HookHandlerAsm, &hCtxHook)) 
     {

OCO/trunk/drv16/ioctl.cpp

@@ -380 +380 @@
 void IoctlDirectAudio(PREQPACKET prp)
 {
-    dprintf(("IoctlDirectAudio Code:0x%x",prp->s.ioctl.bCode));
+//    dprintf(("IoctlDirectAudio Code:0x%x",prp->s.ioctl.bCode));
     if(prp->s.ioctl.bCode == DAUDIO_OPEN)
     {
@@ -489 +489 @@
                 return;
             }
-            dprintf(("IoctlDirectAudio ret"));
+            dprintf(("IoctlDirectAudio ret0"));
             pInit->sReturnCode = 0;
             return;
@@ -553 +553 @@
     {
     case DAUDIO_CLOSE:
+         dprintf(("ID close"));
         delete pStream;
         break;
@@ -558 +559 @@
     case DAUDIO_SETVOLUME:
     {
+        dprintf(("ID SetVolume"));
         pStream->SetProperty(PROPERTY_VOLUME, MAKE_VOLUME_LR(pDAudioCmd->Vol.VolumeL, pDAudioCmd->Vol.VolumeR));
         break;
@@ -564 +566 @@
     case DAUDIO_GETVOLUME:
     {
+        dprintf(("ID GetVolume"));
         pDAudioCmd->Vol.VolumeL = GET_VOLUME_L(pStream->GetProperty(PROPERTY_VOLUME));
         pDAudioCmd->Vol.VolumeR = GET_VOLUME_R(pStream->GetProperty(PROPERTY_VOLUME));
@@ -571 +574 @@
     case DAUDIO_START:
     {
+        dprintf(("ID Start NF:%d",(USHORT)numFreeStreams));
         if(numFreeStreams > 0) 
         {
@@ -576 +580 @@
               if(!rc) numFreeStreams--;
         }
-        else  rc = 1; //fail
-
+        else
+        {
+              dprintf(("ID Start rc1"));
+              rc = 1; //fail
+        }
         break;
     }
@@ -586 +593 @@
         int          fActive = pStream->isActive();
 
+        dprintf(("ID Stop NF:%d",(USHORT)numFreeStreams));
         rc = pStream->StopStream(&cParm);
         if(!rc && fActive) numFreeStreams++;
@@ -594 +602 @@
     {
         CONTROL_PARM cParm;
+        dprintf(("ID Pause"));
         rc = pStream->PauseStream(&cParm);
         break;
@@ -600 +609 @@
     case DAUDIO_RESUME:
     {
+        dprintf(("ID Resume"));
         rc = pStream->ResumeStream();
         break;
@@ -606 +616 @@
     case DAUDIO_GETPOS:
     {
+//        dprintf(("ID GetPos"));
         pDAudioCmd->Pos.ulCurrentPos = pStream->GetCurrentPos();
         pDAudioCmd->Pos.ulWritePos   = pStream->GetCurrentWritePos();
@@ -613 +624 @@
     case DAUDIO_ADDBUFFER:
     {
+//        dprintf(("ID AddBuffer"));
         rc = pStream->Write((PSTREAMBUF)pDAudioCmd->Buffer.lpBuffer, pDAudioCmd->Buffer.ulBufferLength);
         break;
@@ -619 +631 @@
     case DAUDIO_SETPROPERTY:
     {
+        dprintf(("ID SetProp"));
         rc = pStream->SetProperty((USHORT)pDAudioCmd->SetProperty.type, pDAudioCmd->SetProperty.value);
         break;
@@ -627 +640 @@
         DDCMDREGISTER reg;
 
+        dprintf(("ID Reg"));
         reg.ulFunction     = DDCMD_REG_STREAM;
         reg.hStream        = pDAudioCmd->Thread.hSemaphore;
@@ -637 +651 @@
     case DAUDIO_DEREGISTER_THREAD:
     {
+        dprintf(("ID DeReg"));
         pStream->DeRegister();
         break;
@@ -642 +657 @@
 
     case DAUDIO_QUERYVERSION:
+        dprintf(("ID qVer"));
         pDAudioCmd->Version.ulVersion = DAUDIO_VERSION;
         break;
@@ -652 +668 @@
         return;
     }
-    dprintf(("IoctlDirectAudio ret Ok"));
+//    dprintf(("IoctlDirectAudio ret Ok"));
     return;
 }
@@ -671 +687 @@
 extern "C" void StrategyIoctl(PREQPACKET prp, USHORT LDev)
 {
+    if (prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT) 
+    {
+        IoctlDirectAudio(prp);
+        return;
+    }
+
 #ifdef DEBUG
     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) 
-    {
-        IoctlDirectAudio(prp);
-        return;
-    }
-
     if (prp->s.ioctl.bCategory == 0x90) 
     {

OCO/trunk/drv16/malloc.c

@@ -322 +322 @@
    uRequest = (uSize + 3) & -4;        // Force DWORD alignment.
 
-   if (pmbFree->uSize >= uRequest)
-      npvReturn = npvAllocateBlock( pmbFree, uRequest, NULL );
-   else {
-      pmbPrev = pmbFree;
-      for ( pmb=pmbFree->pmbNext; pmb; pmbPrev=pmb, pmb=pmb->pmbNext)
-         if (pmb->uSize >= uRequest) {
-            npvReturn = npvAllocateBlock( pmb, uRequest, pmbPrev );
-            break;
-         }
-   }
-
-   if (npvReturn)
-   {
-      SignatureCheck( (PMEMBLOCK) (((PUCHAR) npvReturn) - HDR_SIZE), (PSZ) "malloc() exit, allocated block" );
-   }
-   else 
-   {
+    if (pmbFree->uSize >= uRequest)
+    {
+        npvReturn = npvAllocateBlock(pmbFree, uRequest, NULL);
+    }
+    else 
+    {
+        pmbPrev = pmbFree;
+        for (pmb=pmbFree->pmbNext; pmb; pmbPrev=pmb, pmb=pmb->pmbNext)
+        {
+             if (pmb->uSize >= uRequest) 
+             {
+                 npvReturn = npvAllocateBlock(pmb, uRequest, pmbPrev);
+                 break;
+             }
+        }
+    }
+
+    if (npvReturn)
+    {
+        SignatureCheck( (PMEMBLOCK) (((PUCHAR) npvReturn) - HDR_SIZE), (PSZ) "malloc() exit, allocated block" );
+    }
+    else 
+    {
        // Out of Memory !!!
        int3();
-   }
-
-   HeapCheck((PSZ) "malloc() exit" );
-   return npvReturn;
+    }
+
+    HeapCheck((PSZ) "malloc() exit" );
+    return npvReturn;
 }
 

OCO/trunk/drv16/mixer.cpp

@@ -71 +71 @@
 static int ALSAToIOCTL90Control[OSS32_MIX_MAX_CONTROLS] = {
 /* OSS32_MIX_VOLUME_MASTER_FRONT  */   -1,
-/* OSS32_MIX_VOLUME_MASTER_REAR   */   -1,
+/* OSS32_MIX_VOLUME_MASTER_REAR   */   -1,
 /* OSS32_MIX_VOLUME_PCM           */   STREAMVOLSET & 0xF,
-/* OSS32_MIX_VOLUME_MIDI              */   -1,
-/* OSS32_MIX_VOLUME_LINEIN            */   LINESET & 0xF,
-/* OSS32_MIX_VOLUME_MIC               */   MICSET & 0xF,
-/* OSS32_MIX_VOLUME_CD            */   CDSET & 0xF,
+/* OSS32_MIX_VOLUME_MIDI          */   -1,
+/* OSS32_MIX_VOLUME_LINEIN        */   LINESET & 0xF,
+/* OSS32_MIX_VOLUME_MIC           */   MICSET & 0xF,
+/* OSS32_MIX_VOLUME_CD            */   CDSET & 0xF,
 /* OSS32_MIX_VOLUME_SPDIF         */   -1,
 /* OSS32_MIX_VOLUME_VIDEO         */   VIDEOSET & 0xF,
-/* OSS32_MIX_VOLUME_SPEAKER           */   MONOINSET & 0xF,
-/* OSS32_MIX_VOLUME_PHONE             */   PHONESET & 0xF,
+/* OSS32_MIX_VOLUME_SPEAKER       */   MONOINSET & 0xF,
+/* OSS32_MIX_VOLUME_PHONE         */   PHONESET & 0xF,
 /* OSS32_MIX_VOLUME_HEADPHONE     */   -1, 
 /* OSS32_MIX_VOLUME_AUX           */   AUXSET & 0xF,
-/* OSS32_MIX_VOLUME_CAPTURE           */   RECORDGAINSET & 0xF,
+/* OSS32_MIX_VOLUME_CAPTURE       */   RECORDGAINSET & 0xF,
 /* none */                             -1,
 /* none */                             -1,
@@ -90 +90 @@
 /* none */                             -1,
 /* none */                             -1,
-/* OSS32_MIX_INPUTSRC                 */   RECORDSRCSET & 0xF,
+/* OSS32_MIX_INPUTSRC             */   RECORDSRCSET & 0xF,
 /* OSS32_MIX_LEVEL_BASS           */   BASSTREBLESET & 0xF,
 /* OSS32_MIX_LEVEL_TREBLE         */   BASSTREBLESET & 0xF,
@@ -191 +191 @@
             //  case I90SRC_RES6:
             default:
+                dprintf(("IoctlMixer: Unk VolL:%lx", (ULONG)pMixStruct->VolumeL));
                 break;
             }
@@ -302 +303 @@
 //   case MSGBUF:
     default:
+        dprintf(("IoctlMixer: bad code:%lx", (ULONG)prp->s.ioctl.bCode));
         prp->usStatus |= RPERR | RPBADCMD;
         return;

OCO/trunk/drv16/mpu401.cpp

@@ -71 +71 @@
 BOOL MPU_401::Open(ULONG ulDevice, ULONG ulStreamType, ULONG ulSysFileNum, OSSSTREAMID FAR *pStreamId)
 {
-    dprintf(("MPU_401::open"));
+//    dprintf(("MPU_401::open"));
     if(midiOutStreamId == 0) 
     {
@@ -77 +77 @@
         if(OSS16_MidiOpen(current_device, MPU401_RECEIVE, pStreamId) != OSSERR_SUCCESS)
         {
-            dprintf(("MPU_401::open: OSS16_MidiOpen failed!!"));
+//            dprintf(("MPU_401::open: OSS16_MidiOpen failed!!"));
             DebugInt3();
             midiOutStreamId = 0;
@@ -96 +96 @@
 {
 
-    dprintf(("MPU_401::Close"));
-
-#if 1
+//    dprintf(("MPU_401::Close"));
+
+#if 0
     if(OSS16_MidiClose(StreamId) != OSSERR_SUCCESS) {
         dprintf(("MPU_401::close: OSS16_MidiClose failed!!"));
@@ -112 +112 @@
 int MPU_401::writeByte(OSSSTREAMID StreamId, BYTE b)
 {
-    dprintf(("MPU_401::writeByte"));
+//    dprintf(("MPU_401::writeByte"));
     if(!StreamId) {
         DebugInt3();
@@ -126 +126 @@
 int MPU_401::readByte(OSSSTREAMID StreamId)
 {
-    dprintf(("MPU_401::readByte"));
+//    dprintf(("MPU_401::readByte"));
     //TODO:
     return -1;
@@ -134 +134 @@
 int MPU_401::Reset(OSSSTREAMID StreamId)
 {
-    dprintf(("MPU_401::Reset"));
+//    dprintf(("MPU_401::Reset"));
 
     return 0;
@@ -144 +144 @@
     BOOL rc;
 
-    dprintf(("MPU_401::Start"));
+//    dprintf(("MPU_401::Start"));
     // Start timer on 4 mSec interval.
     rc = getTimer()->Start();
@@ -153 +153 @@
 int MPU_401::Stop(OSSSTREAMID StreamId)
 {
-    dprintf(("MPU_401::Stop"));
+//    dprintf(("MPU_401::Stop"));
     getTimer()->Stop();
     allNotesOff(StreamId);
@@ -164 +164 @@
     OSSSTREAMID StreamId;
 
-    dprintf(("MPU_401::RTMIDI_OpenReceive"));
+//    dprintf(("MPU_401::RTMIDI_OpenReceive"));
 
     //TODO:
@@ -179 +179 @@
     OSSSTREAMID StreamId;
 
-    dprintf(("MPU_401::RTMIDI_OpenSend"));
+//    dprintf(("MPU_401::RTMIDI_OpenSend"));
     //TODO:
     //Send == Receive (Send to RTMIDI = Receive from ALSA)
@@ -191 +191 @@
 void MPU_401::RTMIDI_CloseReceive(OSSSTREAMID StreamId)
 {
-    dprintf(("MPU_401::RTMIDI_CloseReceive"));
+//    dprintf(("MPU_401::RTMIDI_CloseReceive"));
     OSS16_MidiClose(StreamId);
 }
@@ -198 +198 @@
 void MPU_401::RTMIDI_CloseSend(OSSSTREAMID StreamId)
 {
-    dprintf(("MPU_401::RTMIDI_CloseSend"));
+//    dprintf(("MPU_401::RTMIDI_CloseSend"));
 
     OSS16_MidiClose(StreamId);
@@ -215 +215 @@
    }
    if(pma == NULL) {
-        dprintf(("MPU_401::processIrq: no mpu device found!!"));
+//      dprintf(("MPU_401::processIrq: no mpu device found!!"));
         return;
    }
@@ -224 +224 @@
    for(int i=0;i<bufsize;i++) {
 #ifdef DEBUG
-       dprintf(("midi %x",(unsigned char)buffer));
+//       dprintf(("midi %x",(unsigned char)buffer));
 #endif
        pma->pfnSendByte(pma->ulRTMIDI_Handle, (unsigned char)buffer);

OCO/trunk/drv16/ssm_idc.cpp

@@ -98 +98 @@
            }
 #endif
-//           ddprintf(("DDCMD_WRITE beg"));
+//           ddprintf(("DDCMD_WRITE"));
            ulReturnCode = pstream->Write((PSTREAMBUF) p->pBuffer,(unsigned) p->ulBufferSize);
-//           ddprintf(("DDCMD_WRITE %lx rc=%ld",p->ulBufferSize, ulReturnCode));
+           ddprintf(("DDCMD_WRITE %lx rc=%ld",p->ulBufferSize, ulReturnCode));
            if (ulReturnCode)
               return ulReturnCode;
@@ -106 +106 @@
       }
       case DDCMD_STATUS: {
-//         ddprintf(("DDCMD_STATUS"));
+         ddprintf(("DDCMD_STATUS"));
          PDDCMDSTATUS p = (PDDCMDSTATUS) pCommon;
          PSTATUS_PARM p2 = (PSTATUS_PARM) p->pStatus;

OCO/trunk/drv16/strategy.cpp

@@ -307 +307 @@
 //       printk("Soundcard %s not supported", (char FAR *)devCaps[0].szDeviceName);
        dprintf(("Soundcard %s not supported", (char FAR *)devCaps[0].szDeviceName));
-       DevHelp_Beep(1000, 50);
+//       DevHelp_Beep(1000, 50);
        DebugInt3();
        goto failure;

OCO/trunk/drv16/waudio.cpp

@@ -407 +407 @@
 
    default:
+       dprintf(("DataFormat wrong:%x",ulBitsPerSample));
        DebugInt3();
        return 0;
@@ -558 +559 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = ConvertNone;
-        dprintf(("CONVERT_NONE"));
+        dprintf(("CNV_NONE"));
         break;
 
@@ -565 +566 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8To8SignChange;
-        dprintf(("CONVERT_8_UNSIGNED_TO_8_SIGNED/CONVERT_8_SIGNED_TO_8_UNSIGNED"));
+        dprintf(("CNV_8_U_TO_8_S/CNV_8_S_TO_8_U"));
         break;
 
@@ -572 +573 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert8MonoTo8Stereo;
-        dprintf(("CONVERT_8_UNSIGNED_TO_8_UNSIGNED_MONO_STEREO/CONVERT_8_SIGNED_TO_8_SIGNED_MONO_STEREO"));
+        dprintf(("CNV_8_U_TO_8_U_MN_ST/CNV_8_S_TO_8_S_MN_ST"));
         break;
 
@@ -579 +580 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert8MonoTo8StereoSignChange;
-        dprintf(("CONVERT_8_SIGNED_TO_8_UNSIGNED_MONO_STEREO/CONVERT_8_UNSIGNED_TO_8_SIGNED_MONO_STEREO"));
+        dprintf(("CNV_8_S_TO_8_U_MN_ST/CNV_8_U_TO_8_S_MN_ST"));
         break;
 
@@ -586 +587 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert8To16;
-        dprintf(("CONVERT_8_SIGNED_TO_16_SIGNED/CONVERT_8_UNSIGNED_TO_16_UNSIGNED"));
+        dprintf(("CNV_8_S_TO_16_S/CNV_8_U_TO_16_U"));
         break;
 
@@ -593 +594 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert8To16SignChange;
-        dprintf(("CONVERT_8_SIGNED_TO_16_UNSIGNED/CONVERT_8_UNSIGNED_TO_16_SIGNED"));
+        dprintf(("CNV_8_S_TO_16_U/CNV_8_U_TO_16_S"));
         break;
 
@@ -600 +601 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(2,0);   //factor 4
         pConfigInfo->pfnConvert = Convert8MonoTo16Stereo;
-        dprintf(("CONVERT_8_SIGNED_TO_16_SIGNED_MONO_STEREO/CONVERT_8_UNSIGNED_TO_16_UNSIGNED_MONO_STEREO"));
+        dprintf(("CNV_8_S_TO_16_S_MN_ST/CNV_8_U_TO_16_U_MN_ST"));
         break;
 
@@ -607 +608 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(2,0);   //factor 4
         pConfigInfo->pfnConvert = Convert8MonoTo16StereoSignChange;
-        dprintf(("CONVERT_8_SIGNED_TO_16_UNSIGNED_MONO_STEREO/CONVERT_8_UNSIGNED_TO_16_SIGNED_MONO_STEREO"));
+        dprintf(("CNV_8_S_TO_16_U_MN_ST/CNV_8_U_TO_16_S_MN_ST"));
         break;
 
@@ -613 +614 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert8UnsignedTo8UnsignedStereoMono;
-        dprintf(("CONVERT_8_UNSIGNED_TO_8_UNSIGNED_STEREO_MONO"));
+        dprintf(("CNV_8_U_TO_8_U_ST_MN"));
         break;
 
@@ -619 +620 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert8SignedTo8SignedStereoMono;
-        dprintf(("CONVERT_8_SIGNED_TO_8_SIGNED_STEREO_MONO"));
+        dprintf(("CNV_8_S_TO_8_S_ST_MN"));
         break;
 
@@ -625 +626 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert8UnsignedTo8SignedStereoMono;
-        dprintf(("CONVERT_8_UNSIGNED_TO_8_SIGNED_STEREO_MONO"));
+        dprintf(("CNV_8_U_TO_8_S_ST_MN"));
         break;
 
@@ -631 +632 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert8SignedTo8UnsignedStereoMono;
-        dprintf(("CONVERT_8_SIGNED_TO_8_UNSIGNED_STEREO_MONO"));
+        dprintf(("CNV_8_S_TO_8_U_ST_MN"));
         break;
 
@@ -637 +638 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8UnsignedTo16UnsignedStereoMono;
-        dprintf(("CONVERT_8_UNSIGNED_TO_16_UNSIGNED_STEREO_MONO"));
+        dprintf(("CNV_8_U_TO_16_U_ST_MN"));
         break;
 
@@ -643 +644 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8UnsignedTo16SignedStereoMono;
-        dprintf(("CONVERT_8_UNSIGNED_TO_16_SIGNED_STEREO_MONO"));
+        dprintf(("CNV_8_U_TO_16_S_ST_MN"));
         break;
 
@@ -649 +650 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8SignedTo16SignedStereoMono;
-        dprintf(("CONVERT_8_SIGNED_TO_16_SIGNED_STEREO_MONO"));
+        dprintf(("CNV_8_S_TO_16_S_ST_MN"));
         break;
 
@@ -655 +656 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert8SignedTo16UnsignedStereoMono;
-        dprintf(("CONVERT_8_SIGNED_TO_16_UNSIGNED_STEREO_MONO"));
+        dprintf(("CNV_8_S_TO_16_U_ST_MN"));
         break;
 
@@ -662 +663 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert16To16SignChange;
-        dprintf(("CONVERT_16_UNSIGNED_TO_16_SIGNED/CONVERT_16_SIGNED_TO_16_UNSIGNED"));
+        dprintf(("CNV_16_U_TO_16_S/CNV_16_S_TO_16_U"));
         break;
 
@@ -669 +670 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16To8;
-        dprintf(("CONVERT_16_UNSIGNED_TO_8_UNSIGNED/CONVERT_16_SIGNED_TO_8_SIGNED"));
+        dprintf(("CNV_16_U_TO_8_U/CNV_16_S_TO_8_S"));
         break;
 
@@ -676 +677 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16To8SignChange;
-        dprintf(("CONVERT_16_UNSIGNED_TO_8_SIGNED/CONVERT_16_SIGNED_TO_8_UNSIGNED"));
+        dprintf(("CNV_16_U_TO_8_S/CNV_16_S_TO_8_U"));
         break;
 
@@ -683 +684 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert16MonoTo16Stereo;
-        dprintf(("CONVERT_16_UNSIGNED_TO_16_UNSIGNED_MONO_STEREO/CONVERT_16_SIGNED_TO_16_SIGNED_MONO_STEREO"));
+        dprintf(("CNV_16_U_TO_16_U_MN_ST/CNV_16_S_TO_16_S_MN_ST"));
         break;
 
@@ -690 +691 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(1,0);   //factor 2
         pConfigInfo->pfnConvert = Convert16MonoTo16StereoSignChange;
-        dprintf(("CONVERT_16_UNSIGNED_TO_16_SIGNED_MONO_STEREO/CONVERT_16_SIGNED_TO_16_UNSIGNED_MONO_STEREO"));
+        dprintf(("CNV_16_U_TO_16_S_MN_ST/CNV_16_S_TO_16_U_MN_ST"));
         break;
 
@@ -697 +698 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert16MonoTo8Stereo;
-        dprintf(("CONVERT_16_UNSIGNED_TO_8_UNSIGNED_MONO_STEREO/CONVERT_16_SIGNED_TO_8_UNSIGNED_MONO_STEREO"));
+        dprintf(("CNV_16_U_TO_8_U_MONO_ST/CNV_16_S_TO_8_U_MN_ST"));
         break;
 
@@ -704 +705 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,0);   //factor 1
         pConfigInfo->pfnConvert = Convert16MonoTo8StereoSignChange;
-        dprintf(("CONVERT_16_UNSIGNED_TO_8_SIGNED_MONO_STEREO/CONVERT_16_SIGNED_TO_8_SIGNED_MONO_STEREO"));
+        dprintf(("CNV_16_U_TO_8_S_MN_ST/CNV_16_S_TO_8_S_MN_ST"));
         break;
 
@@ -710 +711 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16UnsignedTo16SignedStereoMono;
-        dprintf(("CONVERT_16_UNSIGNED_TO_16_SIGNED_STEREO_MONO"));
+        dprintf(("CNV_16_U_TO_16_S_ST_MN"));
         break;
 
@@ -716 +717 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16UnsignedTo16UnsignedStereoMono;
-        dprintf(("CONVERT_16_UNSIGNED_TO_16_UNSIGNED_STEREO_MONO"));
+        dprintf(("CNV_16_U_TO_16_U_ST_MN"));
         break;
 
@@ -722 +723 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16SignedTo16SignedStereoMono;
-        dprintf(("CONVERT_16_SIGNED_TO_16_SIGNED_STEREO_MONO"));
+        dprintf(("CNV_16_S_TO_16_S_ST_MN"));
         break;
 
@@ -728 +729 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,1);   //factor 0.5
         pConfigInfo->pfnConvert = Convert16SignedTo16UnsignedStereoMono;
-        dprintf(("CONVERT_16_SIGNED_TO_16_UNSIGNED_STEREO_MONO"));
+        dprintf(("CNV_16_S_TO_16_U_ST_MN"));
         break;
 
@@ -734 +735 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,2);   //factor 0.25
         pConfigInfo->pfnConvert = Convert16UnsignedTo8UnsignedStereoMono;
-        dprintf(("CONVERT_16_UNSIGNED_TO_8_UNSIGNED_STEREO_MONO"));
+        dprintf(("CNV_16_U_TO_8_U_ST_MN"));
         break;
 
@@ -740 +741 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,2);   //factor 0.25
         pConfigInfo->pfnConvert = Convert16UnsignedTo8SignedStereoMono;
-        dprintf(("CONVERT_16_UNSIGNED_TO_8_SIGNED_STEREO_MONO"));
+        dprintf(("CNV_16_U_TO_8_S_ST_MN"));
         break;
 
@@ -746 +747 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,2);   //factor 0.25
         pConfigInfo->pfnConvert = Convert16SignedTo8SignedStereoMono;
-        dprintf(("CONVERT_16_SIGNED_TO_8_SIGNED_STEREO_MONO"));
+        dprintf(("CNV_16_S_TO_8_S_ST_MN"));
         break;
 
@@ -752 +753 @@
         pConfigInfo->ulConversionFactor = CONVERSION_FACTOR(0,2);   //factor 0.25
         pConfigInfo->pfnConvert = Convert16SignedTo8UnsignedStereoMono;
-        dprintf(("CONVERT_16_SIGNED_TO_8_UNSIGNED_STEREO_MONO"));
+        dprintf(("CNV_16_S_TO_8_U_ST_MN"));
         break;
 
@@ -762 +763 @@
     }
 
-    dprintf(("Conversion factor %lx", pConfigInfo->ulConversionFactor));
+    dprintf(("Cnv factor %lx", pConfigInfo->ulConversionFactor));
 
     //Some hardware can't do full duplex with different sample rates (e.g. ALS4000)
@@ -774 +775 @@
             pConfigInfo->ulFixedSampleRate     = pWaveStream->GetProperty(PROPERTY_FREQUENCY);
             pConfigInfo->fSampleRateConversion = TRUE;
-            dprintf(("Force sample rate conversion for legacy hardware -> %d", pConfigInfo->ulFixedSampleRate));
+            dprintf(("Force sample rate cnv for legacy hardware -> %d", pConfigInfo->ulFixedSampleRate));
         }
     }
@@ -805 +806 @@
             else pConfigInfo->ulSRateIncrement = SRATE_CALC_INCREMENT_INVERT(pConfigInfo->ulFixedSampleRate, pConfigInfo->ulSampleRate);
 
-            dprintf(("Sample rate conversion: increment %ld", pConfigInfo->ulSRateIncrement));
+            dprintf(("Sample rate cnv: increment %ld", pConfigInfo->ulSRateIncrement));
         }
         else {
@@ -825 +826 @@
         return TRUE;
     }
-    if(pConfigInfo->fSampleRateConversion) {
+    if(pConfigInfo->fSampleRateConversion) 
+    {
         pConfigInfo->ulHwSampleRate = pConfigInfo->ulFixedSampleRate;
 #ifdef DEBUG
-//    dprintf(("WAVEAUDIO::QuerySampleFormat: SampleRate1 %d", pConfigInfo->ulHwSampleRate));
+        dprintf(("WA::QuerySampleFormat: SampleRate1 %d", pConfigInfo->ulHwSampleRate));
 #endif
     }
@@ -835 +837 @@
         pConfigInfo->ulHwSampleRate = pConfigInfo->ulSampleRate;
 #ifdef DEBUG
-//    dprintf(("WAVEAUDIO::QuerySampleFormat: SampleRate2 %d", pConfigInfo->ulHwSampleRate));
+        dprintf(("WA::QuerySampleFormat: SampleRate2 %d", pConfigInfo->ulHwSampleRate));
 #endif
     }
@@ -1055 +1057 @@
          pCaps->ulOperation != OPERATION_RECORD )
     {
-        dprintf(("DevCaps1 unsupported play/record"));
+        dprintf(("DevCaps1 not play/record"));
         pCaps->ulSupport = UNSUPPORTED_OPERATION;
         return;
@@ -1071 +1073 @@
         if(pCaps->ulChannels > pWaveCaps->ulMaxChannels) 
         {
-            dprintf(("DevCaps1 unsupported channel"));
+            dprintf(("DevCaps1 not channel"));
             pCaps->ulSupport = UNSUPPORTED_CHANNELS;
             return;
@@ -1078 +1080 @@
     if (pCaps->ulSamplingRate == 0) 
     {
-        dprintf(("DevCaps1 unsupported rate"));
+        dprintf(("DevCaps1 not rate"));
         pCaps->ulSupport = UNSUPPORTED_RATE;
         return;
@@ -1134 +1136 @@
             if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_24BPS)) 
             {
-                dprintf(("DevCaps1 unsupported 24BPS"));
+                dprintf(("DevCaps1 not 24BPS"));
                 pCaps->ulSupport = UNSUPPORTED_BPS;
                 return;
@@ -1143 +1145 @@
             {
                 pCaps->ulSupport = UNSUPPORTED_BPS;
-                dprintf(("DevCaps1 unsupported 32BPS"));
+                dprintf(("DevCaps1 not 32BPS"));
                 return;
             }
             break;
         default:
-            dprintf(("DevCaps1 unsupported BPS %d",(USHORT)pCaps->ulBitsPerSample));
+            dprintf(("DevCaps1 not BPS %d",(USHORT)pCaps->ulBitsPerSample));
             pCaps->ulSupport = UNSUPPORTED_BPS;
             return;
@@ -1164 +1166 @@
         if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_ALAW)) 
         {
-            dprintf(("DevCaps1 unsupported ALAW"));
+            dprintf(("DevCaps1 not ALAW"));
             pCaps->ulSupport = UNSUPPORTED_DATATYPE;
             return;
@@ -1171 +1173 @@
         if (pCaps->ulBitsPerSample != 8) 
         {
-            dprintf(("DevCaps1 unsupported ALAW BPS8"));
+            dprintf(("DevCaps1 not ALAW BPS8"));
             pCaps->ulSupport = UNSUPPORTED_BPS;
             return;
@@ -1184 +1186 @@
         if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_MULAW)) 
         {
-            dprintf(("DevCaps1 unsupported MULAW"));
+            dprintf(("DevCaps1 not MULAW"));
             pCaps->ulSupport = UNSUPPORTED_DATATYPE;
             return;
@@ -1191 +1193 @@
         if (pCaps->ulBitsPerSample != 8) 
         {
-            dprintf(("DevCaps1 unsupported MULAW BPS8"));
+            dprintf(("DevCaps1 not MULAW BPS8"));
             pCaps->ulSupport = UNSUPPORTED_BPS;
             return;
@@ -1203 +1205 @@
         if(!(pWaveCaps->ulDataFormats & OSS32_CAPS_PCM_FORMAT_ADPCM)) 
         {
-            dprintf(("DevCaps1 unsupported ADPCM"));
+            dprintf(("DevCaps1 not ADPCM"));
             pCaps->ulSupport = UNSUPPORTED_DATATYPE;
             return;
@@ -1210 +1212 @@
         if (pCaps->ulBitsPerSample != 4) 
         {
-            dprintf(("DevCaps1 unsupported ADPCM BPS4"));
+            dprintf(("DevCaps1 not ADPCM BPS4"));
             pCaps->ulSupport = UNSUPPORTED_BPS;
             return;
@@ -1219 +1221 @@
 
     default:
-        dprintf(("DevCaps1 unsupported dattype"));
+        dprintf(("DevCaps1 not dattype"));
         pCaps->ulSupport = UNSUPPORTED_DATATYPE;
         return;
@@ -1274 +1276 @@
     //return success
     pCaps->ulSupport = SUPPORT_SUCCESS;
-#if 0//def DEBUG
     dprintf(("WAVEAUDIO::DevCaps %ld %ld %ld ", pCaps->ulBitsPerSample, pCaps->ulSamplingRate, pCaps->ulChannels));
-    dprintf(("Operation %ld ResourceClass %ld ResourceUnits %ld", pCaps->ulOperation, pCaps->ulResourceClass, pCaps->ulResourceUnits));
+    dprintf(("Op %ld ResourceClass %ld ResourceUnits %ld", pCaps->ulOperation, pCaps->ulResourceClass, pCaps->ulResourceUnits));
     dprintf(("Data type %ld, data subtype %ld", pCaps->ulDataType, pCaps->ulDataSubType));
+#ifdef DEBUG
     dprintf(("Flags:"));
 
@@ -1492 +1494 @@
     newlen = CONVERT_LENGTH(length, pConfigInfo->ulConversionFactor);
 
+//PS+++
+#ifdef WhatIsIt
     if(newlen >= 4UL*1024UL*1024UL) {
         //oh, oh
@@ -1497 +1501 @@
         return newlen;
     }
+#endif
     if(newlen && pConfigInfo->fSampleRateConversion) {
         newlen = SRATE_CONVERT_LENGTH(newlen, pConfigInfo->ulSRatePosition,

OCO/trunk/drv16/waveplay.cpp

@@ -189 +189 @@
     }
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev1\nSampleRate %ld", pConfigInfo->ulHwSampleRate));
+    dprintf(("WAVEPLAY::ConfigDev1 SampleRate %ld", pConfigInfo->ulHwSampleRate));
     dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
     dprintf(("ulFragsize %ld", pConfigInfo->ulFragsize));

OCO/trunk/drv16/wavestrm.cpp

@@ -378 +378 @@
                 }
             }
-            if ((pahw->GetSpace(StreamId, &_configinfo, &space) != FALSE) && (space > _configinfo.ulBytesPerIRQ/_configinfo.ulSampleSize )
+            if ((pahw->GetSpace(StreamId, &_configinfo, &space) != FALSE) 
                && qhInProcess.IsElements())
             {
@@ -700 +700 @@
 {
 #ifdef DEBUG
-//    dprintf(("WAVESTREAM::WAVESTREAM"));
+    dprintf(("WS::WS:S"));
 #endif
     // get the pointer to the hardware object