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

Timestamp:

Jul 22, 2010, 9:33:17 PM (15 years ago)

Author:

David Azarewicz

Message:

Reintegrate branch into trunk

File:

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

OCO/trunk/drv16/ioctl.cpp

@@ -202 +202 @@
    ULONG ulDevicetype;
 
-#ifdef DEBUG
    dprintf(("IACapability: src type: 0x%lx, op %d",p->ulDataType, (USHORT)p->ulOperation));
-#endif
 
    // get the hardware device type based on the datatype and operation
    ulDevicetype = GetHardwareType((USHORT)p->ulDataType,(USHORT)p->ulOperation,LDev);
 
-#ifdef DEBUG
-//   dprintf(("IACapability: dev type: %ld, ldev %d",ulDevicetype, LDev));
-#endif
+        //dprintf(("IACapability: dev type: %ld, ldev %d",ulDevicetype, LDev));
 
    // Tell the caller we support this IOCTL
@@ -231 +227 @@
          p->ulSamplingRate = HZ_44100;
          //
-         dprintf(("IACapability: Error support"));
+         rprintf(("IACapability: Error support"));
          prp->usStatus |= RPERR;
       }
    }
    else {
-#ifdef DEBUG
-//       dprintf(("IACapability: Error get HW obj"));
-#endif
+        //dprintf(("IACapability: Error get HW obj"));
       //PS+++ filling to our parameters as say mmpm2.inf for returning error in this call
       // (for HDA only!!!!!)
@@ -270 +264 @@
    if (p->usIOCtlRequest != AUDIO_CHANGE)
    {
-       dprintf(("IAudioControl: Error support req:%x",p->usIOCtlRequest));
+       rprintf(("IAudioControl: Error support req:%x",p->usIOCtlRequest));
        p->sReturnCode = INVALID_REQUEST;
        prp->usStatus |= RPERR | RPBADCMD;
@@ -284 +278 @@
    if(addr >= 0x10000UL)
    {
-       dprintf(("Invalid MCI_AUDIO_CHANGE pnt %lx!!", (ULONG)pAudChange));
+       rprintf(("Invalid MCI_AUDIO_CHANGE pnt %lx!!", (ULONG)pAudChange));
        p->sReturnCode = INVALID_REQUEST;
        prp->usStatus |= RPERR | RPBADCMD;
@@ -296 +290 @@
    if(addr >= 0x10000UL)
    {
-       dprintf(("Invalid MCI_TRACK_INFO pnt %lx!!", (ULONG)pMasterVol));
+       rprintf(("Invalid MCI_TRACK_INFO pnt %lx!!", (ULONG)pMasterVol));
        p->sReturnCode = INVALID_REQUEST;
        prp->usStatus |= RPERR | RPBADCMD;
@@ -304 +298 @@
    pStream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
    if(pStream == NULL) {
-       dprintf(("IAudioControl stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
+       rprintf(("IAudioControl stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
        DebugInt3();
        return;
@@ -316 +310 @@
        volume = pAudChange->lVolume >> 16UL;
        volume = (volume*OSS32_MAX_VOLUME)/0x7FFFUL;
-//       dprintf(("Set stream volume of %x to %d", prp->s.ioctl.usSysFileNum, volume));
+                //dprintf(("Set stream volume of %x to %d", prp->s.ioctl.usSysFileNum, volume));
        pStream->SetProperty(PROPERTY_VOLUME, MAKE_VOLUME_LR(volume, volume));
    }
@@ -390 +384 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pInit), sizeof(MCI_AUDIO_INIT), OFFSETOF(pInit), VERIFY_READWRITE))
         {
-            dprintf(("Invalid MCI_AUDIO_INIT pnt %lx!!", (ULONG)pInit));
+            rprintf(("Invalid MCI_AUDIO_INIT pnt %lx!!", (ULONG)pInit));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -411 +405 @@
             if (audioCaps.ulSupport != SUPPORT_SUCCESS)
             {
-                dprintf(("IDirectAudio: DevCaps failed"));
+                rprintf(("IDirectAudio: DevCaps failed"));
                 pInit->sReturnCode = INVALID_REQUEST;
                 prp->usStatus |= RPERR;
@@ -419 +413 @@
         else
         {
-            dprintf(("IDirectAudio: HW DevCaps failed"));
+            rprintf(("IDirectAudio: HW DevCaps failed"));
             pInit->sReturnCode = INVALID_REQUEST;
             prp->usStatus |= RPERR;
@@ -427 +421 @@
         pStream = new DWAVESTREAM(AUDIOHW_WAVE_PLAY, pInit,  prp->s.ioctl.usSysFileNum, MixerStreamId);
         if(pStream == NULL) {
-//            dprintf(("IDirectAudio: pStream"));
+                        //dprintf(("IDirectAudio: pStream"));
             DebugInt3();
             pInit->sReturnCode = INVALID_REQUEST;
@@ -437 +431 @@
         {
             delete pStream;
-//            dprintf(("IlDirectAudio: IsEverythingOk"));
+                        //dprintf(("IlDirectAudio: IsEverythingOk"));
             DebugInt3();
             pInit->sReturnCode = INVALID_REQUEST;
@@ -463 +457 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pInit), sizeof(MCI_AUDIO_INIT), OFFSETOF(pInit), VERIFY_READWRITE))
         {
-            dprintf(("Invalid MCI_AUDIO_INIT pnt %lx!!", (ULONG)pInit));
+            rprintf(("Invalid MCI_AUDIO_INIT pnt %lx!!", (ULONG)pInit));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -484 +478 @@
             if (audioCaps.ulSupport != SUPPORT_SUCCESS)
             {
-                dprintf(("IlDirectAudio: DevCaps failed"));
+                rprintf(("IlDirectAudio: DevCaps failed"));
                 prp->usStatus |= RPERR;
                 pInit->sReturnCode = INVALID_REQUEST;
                 return;
             }
-//            dprintf(("IoctlDirectAudio ret0"));
+                        //dprintf(("IoctlDirectAudio ret0"));
             pInit->sReturnCode = 0;
             return;
         }
         else {
-            dprintf(("IoctlDirectAudio err req"));
+            rprintf(("IoctlDirectAudio err req"));
             pInit->sReturnCode = INVALID_REQUEST;
             prp->usStatus |= RPERR;
@@ -508 +502 @@
         if(DevHelp_VerifyAccess(SELECTOROF(lpCaps), sizeof(OSS32_DEVCAPS), OFFSETOF(lpCaps), VERIFY_READWRITE))
         {
-            dprintf(("Invalid OSS32_DEVCAPS pnt %lx!!", (ULONG)lpCaps));
+            rprintf(("Invalid OSS32_DEVCAPS pnt %lx!!", (ULONG)lpCaps));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -519 +513 @@
         {
             pHWobj->DevCaps(lpCaps);
-//            dprintf(("IoctlDirectAudio ret1"));
+                        //dprintf(("IoctlDirectAudio ret1"));
             return;
         }
@@ -525 +519 @@
         {
             prp->usStatus |= RPERR;
-//            dprintf(("IoctlDirectAudio ret err1"));
+                        //dprintf(("IoctlDirectAudio ret err1"));
             return;
         }
@@ -534 +528 @@
     if(pStream == NULL)
     {
-        dprintf(("IDirectAudio stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
+        rprintf(("IDirectAudio stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
         DebugInt3();
         prp->usStatus |= RPERR | RPBADCMD;
@@ -545 +539 @@
     if(DevHelp_VerifyAccess(SELECTOROF(pDAudioCmd), sizeof(DAUDIO_CMD), OFFSETOF(pDAudioCmd), VERIFY_READWRITE))
     {
-        dprintf(("Invalid DAUDIO_CMD pnt %lx!!", (ULONG)pDAudioCmd));
+        rprintf(("Invalid DAUDIO_CMD pnt %lx!!", (ULONG)pDAudioCmd));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
@@ -553 +547 @@
     {
     case DAUDIO_CLOSE:
-//         dprintf(("ID close"));
+                //dprintf(("ID close"));
         delete pStream;
         break;
@@ -559 +553 @@
     case DAUDIO_SETVOLUME:
     {
-//        dprintf(("ID SetVolume"));
+                //dprintf(("ID SetVolume"));
         pStream->SetProperty(PROPERTY_VOLUME, MAKE_VOLUME_LR(pDAudioCmd->Vol.VolumeL, pDAudioCmd->Vol.VolumeR));
         break;
@@ -566 +560 @@
     case DAUDIO_GETVOLUME:
     {
-//        dprintf(("ID GetVolume"));
+                //dprintf(("ID GetVolume"));
         pDAudioCmd->Vol.VolumeL = GET_VOLUME_L(pStream->GetProperty(PROPERTY_VOLUME));
         pDAudioCmd->Vol.VolumeR = GET_VOLUME_R(pStream->GetProperty(PROPERTY_VOLUME));
@@ -582 +576 @@
         else
         {
-              dprintf(("ID Start rc1"));
+              rprintf(("ID Start rc1"));
               rc = 1; //fail
         }
@@ -616 +610 @@
     case DAUDIO_GETPOS:
     {
-//        dprintf(("ID GetPos"));
+                //dprintf(("ID GetPos"));
         pDAudioCmd->Pos.ulCurrentPos = pStream->GetCurrentPos();
         pDAudioCmd->Pos.ulWritePos   = pStream->GetCurrentWritePos();
@@ -624 +618 @@
     case DAUDIO_ADDBUFFER:
     {
-//        dprintf(("ID AddBuffer"));
+                //dprintf(("ID AddBuffer"));
         rc = pStream->Write((PSTREAMBUF)pDAudioCmd->Buffer.lpBuffer, pDAudioCmd->Buffer.ulBufferLength);
         break;
@@ -631 +625 @@
     case DAUDIO_SETPROPERTY:
     {
-//        dprintf(("ID SetProp"));
+                //dprintf(("ID SetProp"));
         rc = pStream->SetProperty((USHORT)pDAudioCmd->SetProperty.type, pDAudioCmd->SetProperty.value);
         break;
@@ -640 +634 @@
         DDCMDREGISTER reg;
 
-//        dprintf(("ID Reg"));
+                //dprintf(("ID Reg"));
         reg.ulFunction     = DDCMD_REG_STREAM;
         reg.hStream        = pDAudioCmd->Thread.hSemaphore;
@@ -651 +645 @@
     case DAUDIO_DEREGISTER_THREAD:
     {
-//        dprintf(("ID DeReg"));
+                //dprintf(("ID DeReg"));
         pStream->DeRegister();
         break;
@@ -657 +651 @@
 
     case DAUDIO_QUERYVERSION:
-//        dprintf(("ID qVer"));
+                //dprintf(("ID qVer"));
         pDAudioCmd->Version.ulVersion = DAUDIO_VERSION;
         break;
@@ -664 +658 @@
     if(rc)
     {
-//        dprintf(("IoctlDirectAudio ret err rc=%ld",rc));
+                //dprintf(("IoctlDirectAudio ret err rc=%ld",rc));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
     }
-//    dprintf(("IoctlDirectAudio ret Ok"));
+        //dprintf(("IoctlDirectAudio ret Ok"));
     return;
 }
@@ -687 +681 @@
 extern "C" void StrategyIoctl(PREQPACKET prp, USHORT LDev)
 {
-#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
         switch (prp->s.ioctl.bCategory) {
         case DAUDIO_IOCTL_CAT: /* 0x91 */
@@ -721 +713 @@
         }
 
-#ifdef DEBUG
-        dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
-#endif
+        //dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
         return;
 }