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

Timestamp:

May 23, 2010, 10:28:06 PM (15 years ago)

Author:

David Azarewicz

Message:

add ability to set volume on headphone, code cleanup

File:

• OCO/trunk/drv16/ioctl.cpp (modified) (1 diff)

OCO/trunk/drv16/ioctl.cpp

@@ -687 +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 == 0x90)
-    {
+        switch (prp->s.ioctl.bCategory) {
+        case DAUDIO_IOCTL_CAT: /* 0x91 */
+        IoctlDirectAudio(prp);
+        break;
+
+        case MIXER_IOCTL_CAT: /* 0x90 */
         IoctlMixer(prp, LDev);
-        return;
-    }
-    if (prp->s.ioctl.bCategory != AUDIO_IOCTL_CAT)
-    {
-        prp->usStatus |= RPERR | RPBADCMD;
-        return;
-    }
-
-    switch (prp->s.ioctl.bCode)
-    {
-           case AUDIO_INIT:
-                IoctlAudioInit(prp, LDev);
-                break;
-           case AUDIO_CONTROL:
-                IoctlAudioControl(prp);
-                break;
-           case AUDIO_CAPABILITY:
-                IoctlAudioCapability(prp, LDev);
-                break;
-           default:
-                prp->usStatus |= RPERR | RPBADCMD;
-               break;
-    }
+        break;
+
+        case AUDIO_IOCTL_CAT: /* 0x80 */
+                switch (prp->s.ioctl.bCode) {
+                case AUDIO_INIT: /* 0x40 */
+                        IoctlAudioInit(prp, LDev);
+                        break;
+                case AUDIO_CONTROL: /* 0x42 */
+                        IoctlAudioControl(prp);
+                        break;
+                case AUDIO_CAPABILITY: /* 0x48 */
+                        IoctlAudioCapability(prp, LDev);
+                        break;
+                default:
+                        prp->usStatus |= RPERR | RPBADCMD;
+                        break;
+                }
+                break;
+
+        default:
+                prp->usStatus |= RPERR | RPBADCMD;
+                break;
+        }
 
 #ifdef DEBUG
-//    dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
+        dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
 #endif
-    return;
+        return;
 }
+