Changeset 478 for OCO/trunk/drv16/ioctl.cpp

Timestamp:

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

Author:

pasha

Message:

remove beep call, remove all int3 for release versions

File:

• OCO/trunk/drv16/ioctl.cpp (modified) (18 diffs)

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) 
     {