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

Timestamp:

May 6, 2010, 3:08:34 AM (15 years ago)

Author:

David Azarewicz

Message:

Rework buffer management

File:

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

OCO/trunk/drv16/ioctl.cpp

@@ -72 +72 @@
       // stream idle bit in the stream state then write the sysfilenum
       // into the request packet, set rc = 0 and return
-   if (p->sMode == IDLE) 
+   if (p->sMode == IDLE)
    {
        pstream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
@@ -117 +117 @@
          //HACK BEGIN
          //SvL: Save stream handle & SHD entrypoint in case MMPM2 reinitializes
-         //     a stream that was already registered 
+         //     a stream that was already registered
          //HACK END
          if(pstream->pfnSHD) {
@@ -145 +145 @@
 
    p->ulFlags = 0;  /* Zero the Flags  */
-   switch (HardwareType) 
+   switch (HardwareType)
    {
       case AUDIOHW_WAVE_PLAY:
@@ -210 +210 @@
 
 #ifdef DEBUG
-   dprintf(("IACapability: dev type: %ld, ldev %d",ulDevicetype, LDev));
+//   dprintf(("IACapability: dev type: %ld, ldev %d",ulDevicetype, LDev));
 #endif
 
@@ -220 +220 @@
    // bailout if no hardware object is returned..
    pHWobj = GetHardwareDevice(ulDevicetype);
-   if (pHWobj) 
+   if (pHWobj)
    {
       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
@@ -237 +237 @@
    else {
 #ifdef DEBUG
-       dprintf(("IACapability: Error get HW obj"));
+//       dprintf(("IACapability: Error get HW obj"));
 #endif
       //PS+++ filling to our parameters as say mmpm2.inf for returning error in this call
@@ -268 +268 @@
    ULONG               addr;
 
-   if (p->usIOCtlRequest != AUDIO_CHANGE) 
+   if (p->usIOCtlRequest != AUDIO_CHANGE)
    {
        dprintf(("IAudioControl: Error support req:%x",p->usIOCtlRequest));
@@ -282 +282 @@
    addr  = OFFSETOF(pAudChange);
    addr += sizeof(MCI_AUDIO_CHANGE);
-   if(addr >= 0x10000UL) 
+   if(addr >= 0x10000UL)
    {
        dprintf(("Invalid MCI_AUDIO_CHANGE pnt %lx!!", (ULONG)pAudChange));
@@ -294 +294 @@
    addr  = OFFSETOF(pMasterVol);
    addr += sizeof(MCI_TRACK_INFO);
-   if(addr >= 0x10000UL) 
+   if(addr >= 0x10000UL)
    {
        dprintf(("Invalid MCI_TRACK_INFO pnt %lx!!", (ULONG)pMasterVol));
@@ -311 +311 @@
        pStream->SetProperty(PROPERTY_BALANCE, pAudChange->lBalance);
 
-   if (pAudChange->lVolume != AUDIO_IGNORE) 
+   if (pAudChange->lVolume != AUDIO_IGNORE)
    {
        // stream volume ranges from 0 to 0x7FFFFFFF (linear)
@@ -320 +320 @@
    }
 
-   if (pMasterVol && pMasterVol->usMasterVolume != AUDIO_IGNORE) 
+   if (pMasterVol && pMasterVol->usMasterVolume != AUDIO_IGNORE)
    {
        // master volume ranges from 0 to 0x7FFF (linear)
        volume = pMasterVol->usMasterVolume;
        volume = (volume*OSS32_MAX_VOLUME)/0x7FFFUL;
-       if (volume > OSS32_MAX_VOLUME) 
+       if (volume > OSS32_MAX_VOLUME)
        {
            volume = OSS32_MAX_VOLUME;
@@ -331 +331 @@
 //       dprintf(("IlAudioControl:Set MV to %d", volume));
        MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_FRONT, MAKE_VOLUME_LR(volume, volume));
-       if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MASTER_REAR)) 
+       if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MASTER_REAR))
        {
            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_REAR, MAKE_VOLUME_LR(volume, volume));
@@ -409 +409 @@
         {
             pHWobj->DevCaps(&audioCaps);
-            if (audioCaps.ulSupport != SUPPORT_SUCCESS) 
+            if (audioCaps.ulSupport != SUPPORT_SUCCESS)
             {
                 dprintf(("IDirectAudio: DevCaps failed"));
@@ -417 +417 @@
             }
         }
-        else 
+        else
         {
             dprintf(("IDirectAudio: HW DevCaps failed"));
@@ -427 +427 @@
         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;
@@ -434 +434 @@
         }
 
-        if(!pStream->IsEverythingOk()) 
+        if(!pStream->IsEverythingOk())
         {
             delete pStream;
-            dprintf(("IlDirectAudio: IsEverythingOk"));
+//            dprintf(("IlDirectAudio: IsEverythingOk"));
             DebugInt3();
             pInit->sReturnCode = INVALID_REQUEST;
@@ -482 +482 @@
         {
             pHWobj->DevCaps(&audioCaps);
-            if (audioCaps.ulSupport != SUPPORT_SUCCESS) 
+            if (audioCaps.ulSupport != SUPPORT_SUCCESS)
             {
                 dprintf(("IlDirectAudio: DevCaps failed"));
@@ -489 +489 @@
                 return;
             }
-            dprintf(("IoctlDirectAudio ret0"));
+//            dprintf(("IoctlDirectAudio ret0"));
             pInit->sReturnCode = 0;
             return;
@@ -500 +500 @@
         }
     }
-    else 
-    if(prp->s.ioctl.bCode == DAUDIO_QUERYCAPS) 
+    else
+    if(prp->s.ioctl.bCode == DAUDIO_QUERYCAPS)
     {
         LPOSS32_DEVCAPS lpCaps = (LPOSS32_DEVCAPS) prp->s.ioctl.pvData;
@@ -519 +519 @@
         {
             pHWobj->DevCaps(lpCaps);
-            dprintf(("IoctlDirectAudio ret1"));
-            return;
-        }
-        else 
+//            dprintf(("IoctlDirectAudio ret1"));
+            return;
+        }
+        else
         {
             prp->usStatus |= RPERR;
-            dprintf(("IoctlDirectAudio ret err1"));
+//            dprintf(("IoctlDirectAudio ret err1"));
             return;
         }
@@ -532 +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));
@@ -553 +553 @@
     {
     case DAUDIO_CLOSE:
-         dprintf(("ID close"));
+//         dprintf(("ID close"));
         delete pStream;
         break;
@@ -559 +559 @@
     case DAUDIO_SETVOLUME:
     {
-        dprintf(("ID SetVolume"));
+//        dprintf(("ID SetVolume"));
         pStream->SetProperty(PROPERTY_VOLUME, MAKE_VOLUME_LR(pDAudioCmd->Vol.VolumeL, pDAudioCmd->Vol.VolumeR));
         break;
@@ -566 +566 @@
     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));
@@ -575 +575 @@
     {
         dprintf(("ID Start NF:%d",(USHORT)numFreeStreams));
-        if(numFreeStreams > 0) 
+        if(numFreeStreams > 0)
         {
               rc = pStream->StartStream();
@@ -631 +631 @@
     case DAUDIO_SETPROPERTY:
     {
-        dprintf(("ID SetProp"));
+//        dprintf(("ID SetProp"));
         rc = pStream->SetProperty((USHORT)pDAudioCmd->SetProperty.type, pDAudioCmd->SetProperty.value);
         break;
@@ -640 +640 @@
         DDCMDREGISTER reg;
 
-        dprintf(("ID Reg"));
+//        dprintf(("ID Reg"));
         reg.ulFunction     = DDCMD_REG_STREAM;
         reg.hStream        = pDAudioCmd->Thread.hSemaphore;
@@ -651 +651 @@
     case DAUDIO_DEREGISTER_THREAD:
     {
-        dprintf(("ID DeReg"));
+//        dprintf(("ID DeReg"));
         pStream->DeRegister();
         break;
@@ -657 +657 @@
 
     case DAUDIO_QUERYVERSION:
-        dprintf(("ID qVer"));
+//        dprintf(("ID qVer"));
         pDAudioCmd->Version.ulVersion = DAUDIO_VERSION;
         break;
     }
 
-    if(rc) 
-    {
-        dprintf(("IoctlDirectAudio ret err rc=%ld",rc));
+    if(rc)
+    {
+//        dprintf(("IoctlDirectAudio ret err rc=%ld",rc));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
@@ -687 +687 @@
 extern "C" void StrategyIoctl(PREQPACKET prp, USHORT LDev)
 {
-    if (prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT) 
+    if (prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT)
     {
         IoctlDirectAudio(prp);
@@ -696 +696 @@
     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 == 0x90) 
+    if (prp->s.ioctl.bCategory == 0x90)
     {
         IoctlMixer(prp, LDev);
         return;
     }
-    if (prp->s.ioctl.bCategory != AUDIO_IOCTL_CAT) 
+    if (prp->s.ioctl.bCategory != AUDIO_IOCTL_CAT)
     {
         prp->usStatus |= RPERR | RPBADCMD;
@@ -724 +724 @@
 
 #ifdef DEBUG
-    dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
+//    dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
 #endif
     return;