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

Timestamp:

Nov 4, 2009, 4:21:24 PM (16 years ago)

Author:

pasha

Message:

Rebuild buffers supply, fix DDCMD_WRITE with len=0 in WAVE chain, remove/add debug output, change DebugInt3 for debug/nondebug version, move unused code to unused directore

File:

• OCO/trunk/drv16/ioctl.cpp (modified) (24 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) {
-      pstream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
-      if (pstream)
-         pstream->ulStreamState |= STREAM_IDLE;
-      p->pvReserved = (VOID FAR *) (ULONG)prp->s.ioctl.usSysFileNum;
-      p->sReturnCode = 0;
-      return;
+   if (p->sMode == IDLE) 
+   {
+       pstream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
+       if (pstream)
+           pstream->ulStreamState |= STREAM_IDLE;
+       p->pvReserved = (VOID FAR *) (ULONG)prp->s.ioctl.usSysFileNum;
+       p->sReturnCode = 0;
+       return;
    }
        // call FindStream_fromFile to see if there is already a stream
@@ -182 +183 @@
    //HACK BEGIN
    if(pfnSHD) {
-       dprintf(("Stream was previously registered; reregister it"));
+//       dprintf(("Stream was previously registered; reregister it"));
        pstream->pfnSHD  = pfnSHD;
        pstream->hstream = hstream;
@@ -201 +202 @@
    ULONG ulDevicetype;
 
+#ifdef DEBUG
+//   dprintf(("IACapability: src type: %d, op %d",(USHORT)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(("dev type: %d, ldev %d",ulDevicetype, LDev));
+//   dprintf(("IACapability: dev type: %d, ldev %d",ulDevicetype, LDev));
 #endif
 
@@ -215 +220 @@
    // bailout if no hardware object is returned..
    pHWobj = GetHardwareDevice(ulDevicetype);
-   if (pHWobj) {
+   if (pHWobj) 
+   {
       pHWobj->DevCaps(p);
       if (p->ulSupport != SUPPORT_SUCCESS) {
+         dprintf(("IACapability: Error support"));
          prp->usStatus |= RPERR;
       }
@@ -223 +230 @@
    else {
 #ifdef DEBUG
-       dprintf(("Error getting hardware object"));
+       dprintf(("IACapability: Error get HW obj"));
 #endif
       p->ulSupport = UNSUPPORTED_DATATYPE;
@@ -248 +255 @@
    ULONG               addr;
 
-   if (p->usIOCtlRequest != AUDIO_CHANGE) {
+   if (p->usIOCtlRequest != AUDIO_CHANGE) 
+   {
+       dprintf(("IAudioControl: Error support req:%x",p->usIOCtlRequest));
        p->sReturnCode = INVALID_REQUEST;
        prp->usStatus |= RPERR | RPBADCMD;
@@ -260 +269 @@
    addr  = OFFSETOF(pAudChange);
    addr += sizeof(MCI_AUDIO_CHANGE);
-   if(addr >= 0x10000UL) {
-       dprintf(("Invalid MCI_AUDIO_CHANGE pointer %lx!!", (ULONG)pAudChange));
+   if(addr >= 0x10000UL) 
+   {
+       dprintf(("Invalid MCI_AUDIO_CHANGE pnt %lx!!", (ULONG)pAudChange));
        p->sReturnCode = INVALID_REQUEST;
        prp->usStatus |= RPERR | RPBADCMD;
@@ -271 +281 @@
    addr  = OFFSETOF(pMasterVol);
    addr += sizeof(MCI_TRACK_INFO);
-   if(addr >= 0x10000UL) {
-       dprintf(("Invalid MCI_TRACK_INFO pointer %lx!!", (ULONG)pMasterVol));
+   if(addr >= 0x10000UL) 
+   {
+       dprintf(("Invalid MCI_TRACK_INFO pnt %lx!!", (ULONG)pMasterVol));
        p->sReturnCode = INVALID_REQUEST;
        prp->usStatus |= RPERR | RPBADCMD;
@@ -280 +291 @@
    pStream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
    if(pStream == NULL) {
-       dprintf(("IoctlAudioControl stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
+       dprintf(("IAudioControl stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
        DebugInt3();
        return;
@@ -287 +298 @@
        pStream->SetProperty(PROPERTY_BALANCE, pAudChange->lBalance);
 
-   if(pAudChange->lVolume != AUDIO_IGNORE) {
+   if (pAudChange->lVolume != AUDIO_IGNORE) 
+   {
        // stream volume ranges from 0 to 0x7FFFFFFF (linear)
        volume = pAudChange->lVolume >> 16UL;
@@ -295 +307 @@
    }
 
-   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(("Set mastervolume to %d", 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)) {
+       if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MASTER_REAR)) 
+       {
            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_REAR, MAKE_VOLUME_LR(volume, volume));
        }
@@ -345 +359 @@
            volume = OSS32_MAX_VOLUME;
        }
-//       dprintf(("Set input gain of %x to %d", prp->s.ioctl.usSysFileNum, volume));
+//       dprintf(("IAudioControl:Set IG of %x to %d", prp->s.ioctl.usSysFileNum, volume));
        pStream->SetProperty(PROPERTY_INPUTGAIN, MAKE_VOLUME_LR(volume, volume));
    }
@@ -353 +367 @@
 void IoctlDirectAudio(PREQPACKET prp)
 {
+    dprintf(("IoctlDirectAudio"));
     if(prp->s.ioctl.bCode == DAUDIO_OPEN)
     {
@@ -362 +377 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pInit), sizeof(MCI_AUDIO_INIT), OFFSETOF(pInit), VERIFY_READWRITE))
         {
-            dprintf(("Invalid MCI_AUDIO_INIT pointer %lx!!", (ULONG)pInit));
+            dprintf(("Invalid MCI_AUDIO_INIT pnt %lx!!", (ULONG)pInit));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -382 +397 @@
             pHWobj->DevCaps(&audioCaps);
             if (audioCaps.ulSupport != SUPPORT_SUCCESS) {
-                dprintf(("IoctlDirectAudio: DevCaps failed"));
+                dprintf(("IDirectAudio: DevCaps failed"));
                 pInit->sReturnCode = INVALID_REQUEST;
                 prp->usStatus |= RPERR;
@@ -396 +411 @@
         pStream = new DWAVESTREAM(AUDIOHW_WAVE_PLAY, pInit,  prp->s.ioctl.usSysFileNum, MixerStreamId);
         if(pStream == NULL) {
+            dprintf(("IDirectAudio: pStream"));
             DebugInt3();
             pInit->sReturnCode = INVALID_REQUEST;
@@ -404 +420 @@
         if(!pStream->IsEverythingOk()) {
             delete pStream;
+            dprintf(("IlDirectAudio: IsEverythingOk"));
             DebugInt3();
             pInit->sReturnCode = INVALID_REQUEST;
@@ -429 +446 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pInit), sizeof(MCI_AUDIO_INIT), OFFSETOF(pInit), VERIFY_READWRITE))
         {
-            dprintf(("Invalid MCI_AUDIO_INIT pointer %lx!!", (ULONG)pInit));
+            dprintf(("Invalid MCI_AUDIO_INIT pnt %lx!!", (ULONG)pInit));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -449 +466 @@
             pHWobj->DevCaps(&audioCaps);
             if (audioCaps.ulSupport != SUPPORT_SUCCESS) {
-                dprintf(("IoctlDirectAudio: DevCaps failed"));
+                dprintf(("IlDirectAudio: DevCaps failed"));
                 prp->usStatus |= RPERR;
                 pInit->sReturnCode = INVALID_REQUEST;
@@ -471 +488 @@
         if(DevHelp_VerifyAccess(SELECTOROF(lpCaps), sizeof(OSS32_DEVCAPS), OFFSETOF(lpCaps), VERIFY_READWRITE))
         {
-            dprintf(("Invalid OSS32_DEVCAPS pointer %lx!!", (ULONG)lpCaps));
+            dprintf(("Invalid OSS32_DEVCAPS pnt %lx!!", (ULONG)lpCaps));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -493 +510 @@
     pStream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
     if(pStream == NULL) {
-        dprintf(("IoctlDirectAudio stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
+        dprintf(("IDirectAudio stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
         DebugInt3();
         prp->usStatus |= RPERR | RPBADCMD;
@@ -504 +521 @@
     if(DevHelp_VerifyAccess(SELECTOROF(pDAudioCmd), sizeof(DAUDIO_CMD), OFFSETOF(pDAudioCmd), VERIFY_READWRITE))
     {
-        dprintf(("Invalid DAUDIO_CMD pointer %lx!!", (ULONG)pDAudioCmd));
+        dprintf(("Invalid DAUDIO_CMD pnt %lx!!", (ULONG)pDAudioCmd));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
@@ -627 +644 @@
 {
 #ifdef DEBUG
-//    dprintf(("StrategyIoctl. cat %d, code: %d, dev %d", prp->s.ioctl.bCategory, prp->s.ioctl.bCode, current_device));
+    dprintf(("StrategyIoctl:cat:0x%x, code:0x%x dev %d", prp->s.ioctl.bCategory, prp->s.ioctl.bCode, current_device));
 #endif
-    if(prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT) {
+    if (prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT) 
+    {
         IoctlDirectAudio(prp);
         return;
     }
 
-    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;
         return;
@@ -645 +665 @@
     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;
-    }
+           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;
+    }
+
+#ifdef DEBUG
+    dprintf(("StrategyIoctl:ret:0x%x", (USHORT)prp->usStatus));
+#endif
     return;
 }