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

Timestamp:

Aug 8, 2010, 5:32:19 AM (15 years ago)

Author:

David Azarewicz

Message:

debug updates

File:

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

OCO/trunk/drv16/ioctl.cpp

@@ -313 +313 @@
    }
 
-   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;
            }
-//               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))
-           {
+                //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)) {
                    MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_REAR, MAKE_VOLUME_LR(volume, volume));
            }
@@ -664 +661 @@
         return;
 }
+
+#ifdef DEBUG
+void IoctlDebug(PREQPACKET prp) {
+        DEBUGINFO __far *pInfo;
+//      PWAVESTREAM pStream;
+
+        if (prp->s.ioctl.usDLength < sizeof(DEBUGINFO)) {
+                prp->usStatus |= RPERR | RPBADCMD;
+                return;
+        }
+
+        pInfo = (DEBUGINFO __far *)prp->s.ioctl.pvData;
+        pInfo->usValid = 0x2222;
+        pInfo->usInUseCount = usInUseCount;
+#if 0
+        pStream = (PWAVESTREAM)FindFirstActiveStream(STREAM_WAVE_PLAY);
+        while(pStream) {
+                pStream = (PWAVESTREAM)FindNextActiveStream(STREAM_WAVE_PLAY, pStream);
+        }
+#endif
+}
+#endif
+
 //******************************************************************************
 //******************************************************************************
@@ -707 +727 @@
                 break;
 
+#ifdef DEBUG
+        case DEBUG_CAT: /* 0xDD */
+                IoctlDebug(prp);
+                break;
+#endif
+
         default:
                 prp->usStatus |= RPERR | RPBADCMD;