Changeset 524

Timestamp:

Jul 22, 2010, 8:20:48 PM (15 years ago)

Author:

David Azarewicz

Message:

debug statement cleanup

Location:

OCO/branches/DAZ

Files:

• drv16/audiohw.cpp (modified) (1 diff)
• drv16/dwavestrm.cpp (modified) (11 diffs)
• drv16/fmsynth.cpp (modified) (3 diffs)
• drv16/init.cpp (modified) (1 diff)
• drv16/ioctl.cpp (modified) (32 diffs)
• drv16/maudio.cpp (modified) (14 diffs)
• drv16/midistrm.cpp (modified) (13 diffs)
• drv16/mixer.cpp (modified) (15 diffs)
• drv16/mpu401.cpp (modified) (2 diffs)
• drv16/rtmidi.cpp (modified) (5 diffs)
• drv16/strategy.cpp (modified) (21 diffs)
• drv16/waudio.cpp (modified) (2 diffs)
• drv16/waveplay.cpp (modified) (10 diffs)
• drv16/waverec.cpp (modified) (4 diffs)
• drv16/wavestrm.cpp (modified) (3 diffs)
• drv16/wtsynth.cpp (modified) (5 diffs)
• install/control.scr (modified) (2 diffs)

OCO/branches/DAZ/drv16/audiohw.cpp ¶

@@ -227 +227 @@
     PAUDIOHW pEle = (PAUDIOHW)pAudioHWList->Head();
     while (pEle != NULL) {
-#ifdef DEBUG
-//        dprintf(("dev type: %d",pEle->ulDeviceType));
-#endif
+                //dprintf(("dev type: %d",pEle->ulDeviceType));
        if (pEle->ulDeviceType == Devicetype)
           return(pEle);

OCO/branches/DAZ/drv16/dwavestrm.cpp ¶

@@ -46 +46 @@
     if (pStream == NULL)
     {
-        dprintf(("HookHandler stream %lx not found!", (ULONG) ulSysFileNum));
+        rprintf(("HookHandler stream %lx not found!", (ULONG) ulSysFileNum));
         DebugInt3();
         return;
@@ -56 +56 @@
             rc = DevHelp_PostEventSem(pStream->hSem);
             if(rc != 0) {
-                dprintf(("DevHlp_PostEventSem returned %d", rc));
+                rprintf(("DevHlp_PostEventSem returned %d", rc));
             }
         }
@@ -80 +80 @@
     pStreamBuf = new STREAMBUFFER(uLength, (PSTREAMBUF)0, fLooping);
     if(pStreamBuf == NULL) {
-        dprintf(("DWAVESTREAM::Write StreamBuf"));
+        rprintf(("DWAVESTREAM::Write StreamBuf"));
         DebugInt3();
         return 1;
@@ -89 +89 @@
     rc = DevHelp_VirtToLin(SELECTOROF(pLock), OFFSETOF(pLock), &linLock);
     if(rc) {
-        dprintf(("DWAVESTREAM::Write VirtToLin"));
+        rprintf(("DWAVESTREAM::Write VirtToLin"));
         DebugInt3();
         delete pStreamBuf;
@@ -97 +97 @@
     rc = DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE, (LIN)pbuf, uLength, -1L, linLock, (PULONG)&PageListCount);
     if(rc) {
-        dprintf(("DWAVESTREAM::Write VMLock"));
+        rprintf(("DWAVESTREAM::Write VMLock"));
         DebugInt3();
         delete pStreamBuf;
@@ -105 +105 @@
     rc = DevHelp_VMProcessToGlobal(VMDHGP_WRITE, (LIN)pbuf, uLength, (PLIN)&linAddr);
     if(rc) {
-        dprintf(("DWAVESTREAM::Write ProcToGlob"));
+        rprintf(("DWAVESTREAM::Write ProcToGlob"));
         DebugInt3();
         DevHelp_VMUnLock(linLock);
@@ -143 +143 @@
     hSem = pReg->hStream;
 
-#ifdef DEBUG
     dprintf(("DWAVESTREAM::Register"));
-#endif
     if(DevHelp_OpenEventSem(hSem) != 0) {
-        dprintf(("DevHlp_OpenEventSem %lx failed!", hSem));
+        rprintf(("DevHlp_OpenEventSem %lx failed!", hSem));
         hSem = 0;
         return 1;
@@ -158 +156 @@
 {
     if(DevHelp_CloseEventSem(hSem) != 0) {
-        dprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
+        rprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
         return;
     }
@@ -186 +184 @@
         if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS)
         {
-            dprintf(("DWAVESTREAM::AddBuffers GetPositions"));
+            rprintf(("DWAVESTREAM::AddBuffers GetPositions"));
             DebugInt3();
             return;
@@ -280 +278 @@
    WAVESTREAM(streamtype, pinit, filesysnum, mixerStreamId), fError(FALSE), hCtxHook(0), hSem(0)
 {
-#ifdef DEBUG
         dprintf(("DWS::DWS Init"));
-#endif
     if (DevHelp_AllocateCtxHook((NPFN)HookHandlerAsm, &hCtxHook))
     {
-        dprintf(("DWAVESTREAM::DWAVESTREAM AllocCtx"));
+        rprintf(("DWAVESTREAM::DWAVESTREAM AllocCtx"));
         DebugInt3();
         fError = TRUE;
@@ -303 +299 @@
         APIRET rc = DevHelp_PostEventSem(hSem);
         if(rc != 0) {
-            dprintf(("DevHlp_PostEventSem returned %d", rc));
+            rprintf(("DevHlp_PostEventSem returned %d", rc));
         }
         if(DevHelp_CloseEventSem(hSem) != 0) {
-            dprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
+            rprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
         }
     }

OCO/branches/DAZ/drv16/fmsynth.cpp ¶

@@ -48 +48 @@
         if(OSS16_MidiOpen(current_device, FM_SEND, pStreamId) != OSSERR_SUCCESS)
         {
-            dprintf(("FMSYNTH::Open: OSS16_MidiOpen failed!!"));
+            rprintf(("FMSYNTH::Open: OSS16_MidiOpen failed!!"));
             DebugInt3();
             midiOutStreamId = 0;
@@ -69 +69 @@
 #if 0
     if(OSS16_MidiClose(StreamId) != OSSERR_SUCCESS) {
-        dprintf(("FMSYNTH::close: OSS16_MidiClose failed!!"));
+        rprintf(("FMSYNTH::close: OSS16_MidiClose failed!!"));
         DebugInt3();
         return FALSE;
@@ -121 +121 @@
 {
     if(MixerSetVolume(mixerStreamId, OSS32_MIX_VOLUME_MIDI, ulVolume) != TRUE) {
-        dprintf(("FMSYNTH::SetVolume: MixerSetVolume failed!!"));
+        rprintf(("FMSYNTH::SetVolume: MixerSetVolume failed!!"));
         //not necessarily fatal; maybe there is no volume control for midi
     }

OCO/branches/DAZ/drv16/init.cpp ¶

@@ -110 +110 @@
     //functions have been moved into a seperate code segment)
     if(DevHelp_Lock(SELECTOROF(dbgptr), LOCKTYPE_LONG_ANYMEM, 0, &lockhandle)) {
-            dprintf(("DevHelp_Lock failed on debug selector"));
+            rprintf(("DevHelp_Lock failed on debug selector"));
             DebugInt3();
             return;

OCO/branches/DAZ/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;
 }

OCO/branches/DAZ/drv16/maudio.cpp ¶

@@ -3 +3 @@
 /* SCCSID = %W% %E% */
 /****************************************************************************
- *                                                                          *
- * Copyright (c) IBM Corporation 1994 - 1997.                               *
- *                                                                          *
- * The following IBM OS/2 source code is provided to you solely for the     *
+ *                                                                                                                                                      *
+ * Copyright (c) IBM Corporation 1994 - 1997.                                                           *
+ *                                                                                                                                                      *
+ * The following IBM OS/2 source code is provided to you solely for the         *
  * the purpose of assisting you in your development of OS/2 device drivers. *
- * You may use this code in accordance with the IBM License Agreement       *
- * provided in the IBM Device Driver Source Kit for OS/2.                   *
- *                                                                          *
+ * You may use this code in accordance with the IBM License Agreement           *
+ * provided in the IBM Device Driver Source Kit for OS/2.                                       *
+ *                                                                                                                                                      *
  ****************************************************************************/
 /**@internal %W%
- *  MIDI audio hardware object implementation.
+ *      MIDI audio hardware object implementation.
  * @version %I%
  * @context
- *  Unless otherwise noted, all interfaces are Ring-0, 16-bit, kernel stack.
+ *      Unless otherwise noted, all interfaces are Ring-0, 16-bit, kernel stack.
  * @notes
  * @history
@@ -25 +25 @@
 #include <os2medef.h>
 #include <audio.h>
-#include "midi_idc.h"                    // RTMIDI interfaces
+#include "midi_idc.h"                                    // RTMIDI interfaces
 #include "maudio.hpp"
 #include <dbgos2.h>
@@ -37 +37 @@
 {
 
-   pCaps->ulSupport       = SUPPORT_SUCCESS;
+   pCaps->ulSupport       = SUPPORT_SUCCESS;
    pCaps->ulDataSubType   = SUBTYPE_NONE;
    pCaps->ulResourceUnits = 1;
    pCaps->ulResourceClass = 1;
-   pCaps->fCanRecord      = FALSE;
-   pCaps->ulFlags         = INPUT   |          // Input select is supported
-                            OUTPUT  |          // Output select is supported
-                            MONITOR |          // Monitor is supported
-                            VOLUME;            // Volume control is supported
+   pCaps->fCanRecord      = FALSE;
+   pCaps->ulFlags                 = INPUT       |                  // Input select is supported
+                                                        OUTPUT  |                  // Output select is supported
+                                                        MONITOR |                  // Monitor is supported
+                                                        VOLUME;                    // Volume control is supported
 }
 //******************************************************************************
@@ -59 +59 @@
 {
    for (int iChannel=0; iChannel<16; iChannel++) {
-      writeByte(StreamId, (BYTE) (0xB0 + iChannel));    // channel mode
-      writeByte(StreamId, 123);                         // all notes off
-      writeByte(StreamId, 0);
+          writeByte(StreamId, (BYTE) (0xB0 + iChannel));        // channel mode
+          writeByte(StreamId, 123);                                             // all notes off
+          writeByte(StreamId, 0);
    }
 
@@ -72 +72 @@
 int MIDIAUDIO::writeByte(OSSSTREAMID StreamId, BYTE b)
 {
-   return 0;    // Failure.
+   return 0;    // Failure.
 }
 //******************************************************************************
@@ -78 +78 @@
 int MIDIAUDIO::readByte(OSSSTREAMID StreamId)
 {
-   return -1;   // Failure.
+   return -1;   // Failure.
 }
 //******************************************************************************
@@ -108 +108 @@
 BOOL MIDIAUDIO::SetVolume(OSSSTREAMID StreamId, OSSSTREAMID mixerStreamId, ULONG ulVolume)
 {
-    return FALSE;
+        return FALSE;
 }
 //******************************************************************************
 //******************************************************************************
-int MIDIAUDIO::Pause(OSSSTREAMID StreamId)         // Pause the operation
+int MIDIAUDIO::Pause(OSSSTREAMID StreamId)                 // Pause the operation
 {
-//    dprintf(("DUMMY MIDIAUDIO::Pause"));
-    DebugInt3();
-    return 0;
+        //dprintf(("DUMMY MIDIAUDIO::Pause"));
+        DebugInt3();
+        return 0;
 }
 //******************************************************************************
 //******************************************************************************
-int MIDIAUDIO::Resume(OSSSTREAMID StreamId)        // Resume the operation
+int MIDIAUDIO::Resume(OSSSTREAMID StreamId)        // Resume the operation
 {
-//    dprintf(("DUMMY MIDIAUDIO::Resume"));
-    DebugInt3();
-    return 0;
+        //dprintf(("DUMMY MIDIAUDIO::Resume"));
+        DebugInt3();
+        return 0;
 }
 //******************************************************************************
@@ -130 +130 @@
 void MIDIAUDIO::noteOff(OSSSTREAMID StreamId, BYTE mchan, BYTE note, BYTE velocity )
 {
-//    dprintf2(("MIDIAUDIO::noteOff %d %d %d", mchan, note, velocity));
-    if(OSS16_MidiNoteOff(StreamId, mchan, note, velocity) != OSSERR_SUCCESS) {
-       DebugInt3();
-    }
+        //dprintf2(("MIDIAUDIO::noteOff %d %d %d", mchan, note, velocity));
+        if(OSS16_MidiNoteOff(StreamId, mchan, note, velocity) != OSSERR_SUCCESS) {
+           DebugInt3();
+        }
 }
 //******************************************************************************
@@ -139 +139 @@
 void MIDIAUDIO::noteOn(OSSSTREAMID StreamId, BYTE mchan, BYTE note, BYTE velocity )
 {
-//    dprintf2(("MIDIAUDIO::noteOn %d %d %d", mchan, note, velocity));
-    if(OSS16_MidiNoteOn(StreamId, mchan, note, velocity) != OSSERR_SUCCESS) {
-        DebugInt3();
-    }
+        //dprintf2(("MIDIAUDIO::noteOn %d %d %d", mchan, note, velocity));
+        if(OSS16_MidiNoteOn(StreamId, mchan, note, velocity) != OSSERR_SUCCESS) {
+                DebugInt3();
+        }
 }
 //******************************************************************************
@@ -148 +148 @@
 void MIDIAUDIO::polyphonicPressure(OSSSTREAMID StreamId, BYTE mchan, BYTE note, BYTE value )
 {
-//    dprintf2(("MIDIAUDIO::polyphonicPressure %d %d %d", mchan, note, value));
-    if(OSS16_MidiKeyPressure(StreamId, mchan, note, value) != OSSERR_SUCCESS) {
-        DebugInt3();
-    }
+        //dprintf2(("MIDIAUDIO::polyphonicPressure %d %d %d", mchan, note, value));
+        if(OSS16_MidiKeyPressure(StreamId, mchan, note, value) != OSSERR_SUCCESS) {
+                DebugInt3();
+        }
 }
 //******************************************************************************
@@ -157 +157 @@
 void MIDIAUDIO::controlChange(OSSSTREAMID StreamId, BYTE mchan, BYTE control_number, BYTE value )
 {
-//    dprintf2(("MIDIAUDIO::controlChange %d %d %d", mchan, control_number, value));
-    if(OSS16_MidiControlChange(StreamId, mchan, control_number, value) != OSSERR_SUCCESS) {
-        DebugInt3();
-    }
+        //dprintf2(("MIDIAUDIO::controlChange %d %d %d", mchan, control_number, value));
+        if(OSS16_MidiControlChange(StreamId, mchan, control_number, value) != OSSERR_SUCCESS) {
+                DebugInt3();
+        }
 }
 //******************************************************************************
@@ -166 +166 @@
 void MIDIAUDIO::programChange(OSSSTREAMID StreamId, BYTE mchan, BYTE program_number )
 {
-//    dprintf2(("MIDIAUDIO::programChange %d %d", mchan, program_number));
-    if(OSS16_MidiProgramChange(StreamId, mchan, program_number) != OSSERR_SUCCESS) {
-        DebugInt3();
-    }
+        //dprintf2(("MIDIAUDIO::programChange %d %d", mchan, program_number));
+        if(OSS16_MidiProgramChange(StreamId, mchan, program_number) != OSSERR_SUCCESS) {
+                DebugInt3();
+        }
 }
 //******************************************************************************
@@ -175 +175 @@
 void MIDIAUDIO::channelPressure(OSSSTREAMID StreamId, BYTE mchan, BYTE value )
 {
-//    dprintf2(("MIDIAUDIO::channelPressure %d %d", mchan, value));
-    if(OSS16_MidiChannelPressure(StreamId, mchan, value) != OSSERR_SUCCESS) {
-        DebugInt3();
-    }
+        //dprintf2(("MIDIAUDIO::channelPressure %d %d", mchan, value));
+        if(OSS16_MidiChannelPressure(StreamId, mchan, value) != OSSERR_SUCCESS) {
+                DebugInt3();
+        }
 }
 //******************************************************************************
@@ -184 +184 @@
 void MIDIAUDIO::pitchBend(OSSSTREAMID StreamId, BYTE mchan, BYTE value_lsb, BYTE value_msb)
 {
-//    dprintf2(("MIDIAUDIO::pitchBend %d %d %d", mchan, value_lsb, value_msb));
-    if(OSS16_MidiKeyPressure(StreamId, mchan, value_lsb, value_msb) != OSSERR_SUCCESS) {
-        DebugInt3();
-    }
+        //dprintf2(("MIDIAUDIO::pitchBend %d %d %d", mchan, value_lsb, value_msb));
+        if(OSS16_MidiKeyPressure(StreamId, mchan, value_lsb, value_msb) != OSSERR_SUCCESS) {
+                DebugInt3();
+        }
 }
 //******************************************************************************

OCO/branches/DAZ/drv16/midistrm.cpp ¶

@@ -3 +3 @@
 /* SCCSID = %W% %E% */
 /****************************************************************************
- *                                                                          *
- * Copyright (c) IBM Corporation 1994 - 1997.                               *
- *                                                                          *
- * The following IBM OS/2 source code is provided to you solely for the     *
+ *                                                                                                                                                      *
+ * Copyright (c) IBM Corporation 1994 - 1997.                                                           *
+ *                                                                                                                                                      *
+ * The following IBM OS/2 source code is provided to you solely for the         *
  * the purpose of assisting you in your development of OS/2 device drivers. *
- * You may use this code in accordance with the IBM License Agreement       *
- * provided in the IBM Device Driver Source Kit for OS/2.                   *
- *                                                                          *
+ * You may use this code in accordance with the IBM License Agreement           *
+ * provided in the IBM Device Driver Source Kit for OS/2.                                       *
+ *                                                                                                                                                      *
  ****************************************************************************/
 /**@internal %W%
  * @notes
- *  MIDISTREAM class implementation.  The Midi Stream class is derived
- *  from the Stream class.
+ *      MIDISTREAM class implementation.  The Midi Stream class is derived
+ *      from the Stream class.
  * @version %I%
  * @context Unless otherwise noted, all interfaces are Ring-0, 16-bit,
- *  kernel stack.
+ *      kernel stack.
  * @history
  *
  */
 #define INCL_NOPMAPI
-#define INCL_DOSERRORS            // for ERROR_INVALID_FUNCTION
+#define INCL_DOSERRORS                    // for ERROR_INVALID_FUNCTION
 #include <os2.h>
 #include <os2me.h>
-#include <audio.h>                // for #define MIDI
+#include <audio.h>                                // for #define MIDI
 
 #include <include.h>
@@ -39 +39 @@
 USHORT MIDISTREAM::_usBitNumber[ NUM_MidiChannels ] =
   { 0x0001, 0x0002, 0x0004, 0x0008,
-    0x0010, 0x0020, 0x0040, 0x0080,
-    0x0100, 0x0200, 0x0400, 0x0800,
-    0x1000, 0x2000, 0x4000, 0x8000 };
+        0x0010, 0x0020, 0x0040, 0x0080,
+        0x0100, 0x0200, 0x0400, 0x0800,
+        0x1000, 0x2000, 0x4000, 0x8000 };
 
 
 /**@internal CalcDelay
- * @param    None
- * @return   None
+ * @param        None
+ * @return       None
  * @notes
- *           600,000,000 microseconds/10 minutes
- *----------------------------------------------------------   ==   X microseconds/clock
- *                                    usCPQNnum
- *  (ulTempo beats/10 min) * ( 24 * ------------- clocks/beat )
- *                                    usCPQNden
- *
- *
- *      25,000,000 * usCPQNden
+ *                       600,000,000 microseconds/10 minutes
+ *----------------------------------------------------------   ==       X microseconds/clock
+ *                                                                        usCPQNnum
+ *      (ulTempo beats/10 min) * ( 24 * ------------- clocks/beat )
+ *                                                                        usCPQNden
+ *
+ *
+ *              25,000,000 * usCPQNden
  *==  --------------------------
- *       ulTempo * usCPQNnum
+ *               ulTempo * usCPQNnum
  *
  * where
  * usCPQNden = ((usCPQN & 0x3F) + 1) * 3
- * usCPQNnum = 1                                    if bit 6 of usCPQN is set
- *
- *    or
+ * usCPQNnum = 1                                                                        if bit 6 of usCPQN is set
+ *
+ *        or
  *
  * usCPQNden = 1
- * usCPQNnum = usCPQN + 1                           if bit 6 is not set
+ * usCPQNnum = usCPQN + 1                                                       if bit 6 is not set
  */
 void MIDISTREAM::CalcDelay(void)
@@ -72 +72 @@
    ULONG ul;
 
-   if (usCPQN & 0x40) {          // bit 6 is set if it's a denominator
-      ul = 25000000 * ((usCPQN & 0x3F) + 1);
-      ulPerClock = ul / ulTempo;
-      ulPerClock *= 3;
+   if (usCPQN & 0x40) {                  // bit 6 is set if it's a denominator
+          ul = 25000000 * ((usCPQN & 0x3F) + 1);
+          ulPerClock = ul / ulTempo;
+          ulPerClock *= 3;
    } else {
-      ul = ulTempo * (usCPQN+1);
-      ulPerClock = 25000000 / ul;
+          ul = ulTempo * (usCPQN+1);
+          ulPerClock = 25000000 / ul;
    }
 }
@@ -84 +84 @@
 
 /**@external MIDISTRM::Process
- *  Consume MIDI bytes from the MMPM/2 stream buffers and send
- *  them off to the MIDI parser to be interpreted.
+ *      Consume MIDI bytes from the MMPM/2 stream buffers and send
+ *      them off to the MIDI parser to be interpreted.
  * @param void
  * @return void
  * @notes Runs at Task time on a global context hook;  does not run
- *  on an interrupt level.  Interacts with the Timer object defined
- *  for this stream to obtain current time and to request next Stream
- *  time to be scheduled.
+ *      on an interrupt level.  Interacts with the Timer object defined
+ *      for this stream to obtain current time and to request next Stream
+ *      time to be scheduled.
  */
 void MIDISTREAM::Process( void )
 {
-   ULONG ulNewTime;                    // Time, in mSec, on entry.
-   ULONG ulElapsedTime;                // Elapsed time, last tick to this one.
+   ULONG ulNewTime;                                // Time, in mSec, on entry.
+   ULONG ulElapsedTime;                            // Elapsed time, last tick to this one.
 
    // Update time variables.
    ulNewTime = ((MIDIAUDIO*) pahw)->getTimer()->ulGetTime();
    if ( ulNewTime > _ulLastProcess )
-      ulElapsedTime = ulNewTime - _ulLastProcess;
+          ulElapsedTime = ulNewTime - _ulLastProcess;
    else
-      ulElapsedTime = 0;
+          ulElapsedTime = 0;
 
    _ulLastProcess = ulNewTime;
    ulCurrentTime = ulNewTime;
 
-   if (qhInProcess.IsElements() == 0)   // no buffers to process?
-      return;
-
-   if (ulStreamState == STREAM_PAUSED)    // is the stream paused?
-      return;
+   if (qhInProcess.IsElements() == 0)   // no buffers to process?
+          return;
+
+   if (ulStreamState == STREAM_PAUSED)    // is the stream paused?
+          return;
 
    ProcessEvents();
@@ -123 +123 @@
 
    while (lWait <= 0 && qhInProcess.IsElements()) {
-      parse(*(pbuff + (pstreambuff->ulBuffpos)++));
-
-      if (pstreambuff->ulBuffpos >= buffsz) {
-         qhDone.PushOnTail(qhInProcess.PopHead());
-         pstreambuff = (PSTREAMBUFFER) qhInProcess.Head();
-         pbuff = pstreambuff->pBuffptr;
-         buffsz = pstreambuff->ulBuffsz;
-      }
+          parse(*(pbuff + (pstreambuff->ulBuffpos)++));
+
+          if (pstreambuff->ulBuffpos >= buffsz) {
+                 qhDone.PushOnTail(qhInProcess.PopHead());
+                 pstreambuff = (PSTREAMBUFFER) qhInProcess.Head();
+                 pbuff = pstreambuff->pBuffptr;
+                 buffsz = pstreambuff->ulBuffsz;
+          }
    }
    while (qhDone.IsElements())
-      ReturnBuffer();
+          ReturnBuffer();
 
    // Determine next time to run.  If we submit a time that has already
@@ -163 +163 @@
 }
 /**@internal MIDISTREAM::_allNotesOff
- *  Shut off all notes that are currently playing.
+ *      Shut off all notes that are currently playing.
  * @param None.
  * @return void
  * @notes This function walks the _notesOn array and shuts off any note
- *  that is flagged as being actively played.
+ *      that is flagged as being actively played.
  */
 void MIDISTREAM::_allNotesOff( void )
 {
    for ( USHORT noteNum=0; noteNum < NUM_MidiNotes; ++noteNum)
-      if (_notesOn[noteNum])
-         // This note number is playing on one or more channels.
-         // Shut the note off on all channels on which it is playing.
-         for ( USHORT mchan=0; mchan < NUM_MidiChannels; ++mchan)
-            if (_notesOn[noteNum] & _usBitNumber[mchan]) {
-               pahw->noteOff(StreamId,  (BYTE)mchan, (BYTE)noteNum, 0 );
-               _notesOn[noteNum] &= ~(_usBitNumber[mchan]);
-            }
+          if (_notesOn[noteNum])
+                 // This note number is playing on one or more channels.
+                 // Shut the note off on all channels on which it is playing.
+                 for ( USHORT mchan=0; mchan < NUM_MidiChannels; ++mchan)
+                        if (_notesOn[noteNum] & _usBitNumber[mchan]) {
+                           pahw->noteOff(StreamId,      (BYTE)mchan, (BYTE)noteNum, 0 );
+                           _notesOn[noteNum] &= ~(_usBitNumber[mchan]);
+                        }
 }
 //******************************************************************************
@@ -185 +185 @@
 ULONG  MIDISTREAM::StartStream(void)
 {
-//    dprintf(("MIDISTREAM::StartStream %lx %lx", (void far *)this, StreamId));
-    
-    state = S_Init;                        // Reset parser state.
-    message.clear();                       // Clear current message.
-    lWait = 0;  //SvL, reset this too
-
-    pahw->getTimer()->vSetTime(ulCurrentTime);
-    if (!pahw->Start(StreamId)) {
-        DebugInt3();
-        return ERROR_START_STREAM;
-    }
-
-    ulStreamState = STREAM_STREAMING;
-    pahw->SetVolume(StreamId, getMixerStreamId(), volume);
-    return NO_ERROR;
+        //dprintf(("MIDISTREAM::StartStream %lx %lx", (void far *)this, StreamId));
+
+        state = S_Init;                                            // Reset parser state.
+        message.clear();                                           // Clear current message.
+        lWait = 0;      //SvL, reset this too
+
+        pahw->getTimer()->vSetTime(ulCurrentTime);
+        if (!pahw->Start(StreamId)) {
+                DebugInt3();
+                return ERROR_START_STREAM;
+        }
+
+        ulStreamState = STREAM_STREAMING;
+        pahw->SetVolume(StreamId, getMixerStreamId(), volume);
+        return NO_ERROR;
 }
 //******************************************************************************
@@ -205 +205 @@
 ULONG  MIDISTREAM::StopStream(PCONTROL_PARM pControl)
 {
-    if(ulStreamState == STREAM_STOPPED) {
-//              dprintf(("MIDISTREAM::StopStream %lx (already stopped)", StreamId));
-            pControl->ulTime = GetCurrentTime();
-            return NO_ERROR;
-    }
-
-//    dprintf(("MIDISTREAM::StopStream %lx %lx", (void far *)this, StreamId));
-    ulStreamState = STREAM_STOPPED;
-    pahw->Stop(StreamId);
-    _allNotesOff();
-    ReturnBuffers();
-    pControl->ulTime = GetCurrentTime();
-    return NO_ERROR;
+        if(ulStreamState == STREAM_STOPPED) {
+                //dprintf(("MIDISTREAM::StopStream %lx (already stopped)", StreamId));
+                pControl->ulTime = GetCurrentTime();
+                return NO_ERROR;
+        }
+
+        //dprintf(("MIDISTREAM::StopStream %lx %lx", (void far *)this, StreamId));
+        ulStreamState = STREAM_STOPPED;
+        pahw->Stop(StreamId);
+        _allNotesOff();
+        ReturnBuffers();
+        pControl->ulTime = GetCurrentTime();
+        return NO_ERROR;
 }
 //******************************************************************************
@@ -223 +223 @@
 ULONG  MIDISTREAM::PauseStream(PCONTROL_PARM pControl)
 {
-//    dprintf(("MIDISTREAM::PauseStream %lx %lx", (void far *)this, StreamId));
-    if (ulStreamState == STREAM_PAUSED) {   // is the stream paused?
-        DebugInt3();
-        return ERROR_INVALID_SEQUENCE;
-    }
-
-    pahw->Stop(StreamId);
-    _allNotesOff();
-    pControl->ulTime = GetCurrentTime();
-    ulStreamState = STREAM_PAUSED;
-    return NO_ERROR;
+        //dprintf(("MIDISTREAM::PauseStream %lx %lx", (void far *)this, StreamId));
+        if (ulStreamState == STREAM_PAUSED) {   // is the stream paused?
+                DebugInt3();
+                return ERROR_INVALID_SEQUENCE;
+        }
+
+        pahw->Stop(StreamId);
+        _allNotesOff();
+        pControl->ulTime = GetCurrentTime();
+        ulStreamState = STREAM_PAUSED;
+        return NO_ERROR;
 }
 //******************************************************************************
@@ -239 +239 @@
 ULONG  MIDISTREAM::ResumeStream(void)
 {
-//    dprintf(("MIDISTREAM::ResumeStream %lx %lx", (void far *)this, StreamId));
-    if (ulStreamState != STREAM_PAUSED) {   // is the stream paused?
-        DebugInt3();
-        return ERROR_INVALID_SEQUENCE;
-    }
-
-    state = S_Init;                        // Reset parser state.
-    message.clear();                       // Clear current message.
-    pahw->getTimer()->vSetTime(ulCurrentTime);
-    pahw->Start(StreamId);
-    pahw->SetVolume(StreamId, getMixerStreamId(), volume);
-    ulStreamState = STREAM_STREAMING;
-    return NO_ERROR;
+        //dprintf(("MIDISTREAM::ResumeStream %lx %lx", (void far *)this, StreamId));
+        if (ulStreamState != STREAM_PAUSED) {   // is the stream paused?
+                DebugInt3();
+                return ERROR_INVALID_SEQUENCE;
+        }
+
+        state = S_Init;                                            // Reset parser state.
+        message.clear();                                           // Clear current message.
+        pahw->getTimer()->vSetTime(ulCurrentTime);
+        pahw->Start(StreamId);
+        pahw->SetVolume(StreamId, getMixerStreamId(), volume);
+        ulStreamState = STREAM_STREAMING;
+        return NO_ERROR;
 }
 //******************************************************************************
@@ -257 +257 @@
 BOOL MIDISTREAM::SetProperty(int type, ULONG value, ULONG reserved)
 {
-    switch(type) {
-    case PROPERTY_VOLUME:
-        volume = value; 
-        if(ulStreamState == STREAM_STREAMING) {
-           pahw->SetVolume(StreamId, getMixerStreamId(), volume);
-        }
-        break;
-
-    default:
-        return STREAM::SetProperty(type, value, reserved);
-    }
-    return TRUE;
+        switch(type) {
+        case PROPERTY_VOLUME:
+                volume = value;
+                if(ulStreamState == STREAM_STREAMING) {
+                   pahw->SetVolume(StreamId, getMixerStreamId(), volume);
+                }
+                break;
+
+        default:
+                return STREAM::SetProperty(type, value, reserved);
+        }
+        return TRUE;
 }
 //******************************************************************************
@@ -275 +275 @@
    STREAM(streamtype, filesysnum, mixerStreamId)
 {
-//    dprintf(("MIDISTREAM::ctor"));
-
-    // get the pointer to the hardware object
-    pahw = (MIDIAUDIO *)GetHardwareDevice(streamtype);
-    if(pahw) {
-        if(pahw->Open(0, streamtype, filesysnum, &StreamId) == FALSE) {
-//            dprintf(("MIDISTREAM ctor: open failed!!"));
-            DebugInt3();
-        }
-    }
-    else DebugInt3();
-
-    // Initialize tempo & scheduling information.
-    ulTempo = 1200;
-    usCPQN = 0;
-    CalcDelay();
-    lWait = 0;
-    _ulLastProcess = 0;
-
-    // Reset the parser.
-    state = S_Init;
-    message.clear();
-
-    // Reset our tracking of which notes are currently on.
-    for (int i=0; i<NUM_MidiNotes; ++i)
-        _notesOn[ i ] = 0;
+        //dprintf(("MIDISTREAM::ctor"));
+
+        // get the pointer to the hardware object
+        pahw = (MIDIAUDIO *)GetHardwareDevice(streamtype);
+        if(pahw) {
+                if(pahw->Open(0, streamtype, filesysnum, &StreamId) == FALSE) {
+//                        dprintf(("MIDISTREAM ctor: open failed!!"));
+                        DebugInt3();
+                }
+        }
+        else DebugInt3();
+
+        // Initialize tempo & scheduling information.
+        ulTempo = 1200;
+        usCPQN = 0;
+        CalcDelay();
+        lWait = 0;
+        _ulLastProcess = 0;
+
+        // Reset the parser.
+        state = S_Init;
+        message.clear();
+
+        // Reset our tracking of which notes are currently on.
+        for (int i=0; i<NUM_MidiNotes; ++i)
+                _notesOn[ i ] = 0;
 }
 //******************************************************************************
@@ -306 +306 @@
 MIDISTREAM::~MIDISTREAM()
 {
-    if(StreamId && pahw) {
-        pahw->Close(StreamId);
-    }
-}
-//******************************************************************************
-//******************************************************************************
-
+        if(StreamId && pahw) {
+                pahw->Close(StreamId);
+        }
+}
+//******************************************************************************
+//******************************************************************************
+

OCO/branches/DAZ/drv16/mixer.cpp ¶

@@ -116 +116 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pMixStruct), sizeof(MIXSTRUCT), OFFSETOF(pMixStruct), VERIFY_READWRITE))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -144 +144 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pMixStruct), sizeof(MIXSTRUCT), OFFSETOF(pMixStruct), VERIFY_READONLY))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -192 +192 @@
             //  case I90SRC_RES6:
             default:
-                dprintf(("IoctlMixer: Unk VolL:%lx", (ULONG)pMixStruct->VolumeL));
+                rprintf(("IoctlMixer: Unk VolL:%lx", (ULONG)pMixStruct->VolumeL));
                 break;
             }
@@ -253 +253 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pIoctlData), sizeof(ULONG), OFFSETOF(pIoctlData), VERIFY_READWRITE))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pIoctlData));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pIoctlData));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -263 +263 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pIoctlMap), sizeof(ALSAIOCTLMap), OFFSETOF(pIoctlMap), VERIFY_READWRITE))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -277 +277 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pIoctlData), sizeof(ULONG), OFFSETOF(pIoctlData), VERIFY_READONLY))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pIoctlData));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pIoctlData));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -286 +286 @@
         if(hMixerNotifySem != 0) {
             if(DevHelp_OpenEventSem(hMixerNotifySem) != 0) {
-                dprintf(("CALLBACKREG: DevHlp_OpenEventSem %lx failed!", hMixerNotifySem));
+                rprintf(("CALLBACKREG: DevHlp_OpenEventSem %lx failed!", hMixerNotifySem));
                 prp->usStatus |= RPERR | RPBADCMD;
                 return;
@@ -294 +294 @@
         if(oldsem) {
             if(DevHelp_CloseEventSem(oldsem) != 0) {
-                dprintf(("CALLBACKREG: DevHlp_OpenEventSem %lx failed!", oldsem));
+                rprintf(("CALLBACKREG: DevHlp_OpenEventSem %lx failed!", oldsem));
                 prp->usStatus |= RPERR | RPBADCMD;
                 return;
@@ -304 +304 @@
 //   case MSGBUF:
     default:
-        dprintf(("IoctlMixer: bad code:%lx", (ULONG)prp->s.ioctl.bCode));
+        rprintf(("IoctlMixer: bad code:%lx", (ULONG)prp->s.ioctl.bCode));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
@@ -359 +359 @@
 
     if(OSS16_MixSetVolume(mixerStreamId, (USHORT)ulControl, ulVolume) != OSSERR_SUCCESS) {
-        dprintf(("MixerSetVolume: OSS16_MixSetVolume failed!!"));
+        rprintf(("MixerSetVolume: OSS16_MixSetVolume failed!!"));
         return FALSE;
     }
@@ -507 +507 @@
 
     if(OSS16_MixSetProperty(mixerStreamId, (USHORT)ulControl, ulALSAValue) != OSSERR_SUCCESS) {
-        dprintf(("MixerSetProperty: OSS16_MixSetProperty failed!!"));
+        rprintf(("MixerSetProperty: OSS16_MixSetProperty failed!!"));
         return FALSE;
     }
@@ -593 +593 @@
         rc = DevHelp_PostEventSem(hMixerNotifySem);
         if(rc != 0) {
-            dprintf(("MixerNotifyChange: DevHlp_PostEventSem returned %d", rc));
+            rprintf(("MixerNotifyChange: DevHlp_PostEventSem returned %d", rc));
         }
         rc = DevHelp_VirtToLin(SELECTOROF(pNumPosts), OFFSETOF(pNumPosts), &linaddr);
@@ -603 +603 @@
         rc = DevHelp_ResetEventSem(hMixerNotifySem, linaddr);
         if(rc != 0) {
-            dprintf(("MixerNotifyChange: DevHelp_ResetEventSem returned %d", rc));
+            rprintf(("MixerNotifyChange: DevHelp_ResetEventSem returned %d", rc));
         }
     }
@@ -652 +652 @@
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MIDI)) {
-                dprintf(("MixerInit: MIX_VOLUME_MIDI not processed"));
+                rprintf(("MixerInit: MIX_VOLUME_MIDI not processed"));
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_LINEIN)) {
@@ -730 +730 @@
         mixinfo.VolumeR = mixinfo.VolumeL = 80;
         IoctlMixer(&rp, LDev);
-//              dprintf(("MixerInit: MIX_VOLUME_HEADPHONE not processed"));
+                //dprintf(("MixerInit: MIX_VOLUME_HEADPHONE not processed"));
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_AUX)) {

OCO/branches/DAZ/drv16/mpu401.cpp ¶

@@ -61 +61 @@
    strcpy( szRTMIDI_Name, szName );    // Setup instance name.
    strcat( szRTMIDI_Name, szSuffix );  // Append ASCII number to instance name.
-//   dprintf(("rtmidi name [%s]",szRTMIDI_Name));
+        //dprintf(("rtmidi name [%s]",szRTMIDI_Name));
    ulRTMIDI_Caps = MIDICAPSA_INPUT | MIDICAPSA_OUTPUT;    // Set RTMIDI caps.
    midiOutStreamId = 0;
@@ -72 +72 @@
 {
 //    dprintf(("MPU_401::open"));
-    if(midiOutStreamId == 0) 
+    if(midiOutStreamId == 0)
     {
         //vladest        if(OSS16_MidiOpen(OSS32_DEFAULT_MPU401_DEVICE, MPU401_SEND, pStreamId) != OSSERR_SUCCESS)

OCO/branches/DAZ/drv16/rtmidi.cpp ¶

@@ -61 +61 @@
 
    if (DevHelp_AttachDD((NPSZ) "MIDI$   ", (NPBYTE) &DDTable)) {
-       dprintf(("rtmidi: error attaching to MIDI.SYS"));
+       rprintf(("rtmidi: error attaching to MIDI.SYS"));
        return;
    }
@@ -74 +74 @@
    DDTable.pfn( &reg );
    if (SELECTOROF(reg.pfnRegisterA) != SELECTOROF(DDTable.pfn)) {
-       dprintf(("rtmidi: invalid selector for pfnRegisterA"));
+       rprintf(("rtmidi: invalid selector for pfnRegisterA"));
       return;
    }
@@ -136 +136 @@
         return MIDIERRA_HW_FAILED;
     }
-#ifdef DEBUG
 //    dprintf(("rtmidi: Open. Mode: %d",usMode));
-#endif
     switch (usMode) {
         case MIDIMODE_OPEN_RECEIVE:
@@ -144 +142 @@
             pma->midiOutStreamId = pma->RTMIDI_OpenReceive();
             if(!pma->midiOutStreamId) return MIDIERRA_HW_FAILED;
-#ifdef DEBUG
 //            dprintf(("rtmidi: Receive openened. stream: %d",pma->midiOutStreamId));
-#endif
             return 0;
         }
@@ -153 +149 @@
             pma->midiInStreamId = pma->RTMIDI_OpenSend();
             if(!pma->midiInStreamId) return MIDIERRA_HW_FAILED;
-#ifdef DEBUG
 //            dprintf(("rtmidi: Send openened. stream: %d",pma->midiInStreamId));
-#endif
             return 0;
         }

OCO/branches/DAZ/drv16/strategy.cpp ¶

@@ -3 +3 @@
 /* SCCSID = %W% %E% */
 /****************************************************************************
- *                                                                          *
- * Copyright (c) IBM Corporation 1994 - 1997.                               *
- *                                                                          *
- * The following IBM OS/2 source code is provided to you solely for the     *
+ *                                                                                                                                                      *
+ * Copyright (c) IBM Corporation 1994 - 1997.                                                           *
+ *                                                                                                                                                      *
+ * The following IBM OS/2 source code is provided to you solely for the         *
  * the purpose of assisting you in your development of OS/2 device drivers. *
- * You may use this code in accordance with the IBM License Agreement       *
- * provided in the IBM Device Driver Source Kit for OS/2.                   *
- *                                                                          *
+ * You may use this code in accordance with the IBM License Agreement           *
+ * provided in the IBM Device Driver Source Kit for OS/2.                                       *
+ *                                                                                                                                                      *
  ****************************************************************************/
 /**@internal %W%
@@ -17 +17 @@
  * @version %I%
  * @context Unless otherwise noted, all interfaces are Ring-0, 16-bit,
- *  kernel stack.
+ *      kernel stack.
  * @history
  *
  */
-extern "C" {               // 16-bit header files are not C++ aware
+extern "C" {                       // 16-bit header files are not C++ aware
 #define INCL_NOPMAPI
 #define INCL_DOSINFOSEG
@@ -33 +33 @@
 #include <devhelp.h>
 #include "strategy.h"
-#include "rtmidi.hpp"                  // Object definition
+#include "rtmidi.hpp"                              // Object definition
 #include "end.h"
 
@@ -84 +84 @@
 extern "C" char szAZX[];
 
-static char *pszIntelICH        = (char *)szINTEL_ICH;
+static char *pszIntelICH                = (char *)szINTEL_ICH;
 static char *pszSigmatel9721_23 = (char *)szSIGMATEL_9721_23;
-static char *pszSBLive          = (char *)szSBLIVE;
-static char *pszCMedia          = (char *)szCMEDIA;
-static char *pszCrystal4281     = (char *)szCS4281;
-static char *pszALS4000         = (char *)szALS4000;
-static char *pszCrystal46XX     = (char *)szCS46XX;
-static char *pszVIA82XX         = (char *)szVIA82XX;
-static char *pszESS1938         = (char *)szESS1938;
-static char *pszVORTEX          = (char *)szVORTEX;
-static char *pszES1371          = (char *)szES1371;
-static char *pszES1370          = (char *)szES1370;
-static char *pszYAMAHA          = (char *)szYAMAHA;
-static char *pszMAESTRO         = (char *)szMAESTRO;
-static char *pszMAESTRO3        = (char *)szMAESTRO3;
-static char *pszALLEGRO         = (char *)szALLEGRO;
-static char *pszALI5451         = (char *)szALI5451;
-static char *pszSI7012          = (char *)szSI7012;
-static char *pszALI5455         = (char *)szALI5455;
-static char *pszNVIDIA          = (char *)szNVIDIA;
-static char *pszAMD             = (char *)szAMD;
-static char *pszTRIDENT         = (char *)szTRIDENT;
-static char *pszNEOMAGIC        = (char *)szNEOMAGIC;
-static char *pszFM801           = (char *)szFM801;
-static char *pszATIIXP          = (char *)szATIIXP;
-static char *pszAUDIGYLS        = (char *)szAUDIGYLS;
-static char *pszBT87X           = (char *)szBT87X;
-static char *pszAZX             = (char *)szAZX;
+static char *pszSBLive                  = (char *)szSBLIVE;
+static char *pszCMedia                  = (char *)szCMEDIA;
+static char *pszCrystal4281     = (char *)szCS4281;
+static char *pszALS4000                 = (char *)szALS4000;
+static char *pszCrystal46XX     = (char *)szCS46XX;
+static char *pszVIA82XX                 = (char *)szVIA82XX;
+static char *pszESS1938                 = (char *)szESS1938;
+static char *pszVORTEX                  = (char *)szVORTEX;
+static char *pszES1371                  = (char *)szES1371;
+static char *pszES1370                  = (char *)szES1370;
+static char *pszYAMAHA                  = (char *)szYAMAHA;
+static char *pszMAESTRO                 = (char *)szMAESTRO;
+static char *pszMAESTRO3                = (char *)szMAESTRO3;
+static char *pszALLEGRO                 = (char *)szALLEGRO;
+static char *pszALI5451                 = (char *)szALI5451;
+static char *pszSI7012                  = (char *)szSI7012;
+static char *pszALI5455                 = (char *)szALI5455;
+static char *pszNVIDIA                  = (char *)szNVIDIA;
+static char *pszAMD                     = (char *)szAMD;
+static char *pszTRIDENT                 = (char *)szTRIDENT;
+static char *pszNEOMAGIC                = (char *)szNEOMAGIC;
+static char *pszFM801                   = (char *)szFM801;
+static char *pszATIIXP                  = (char *)szATIIXP;
+static char *pszAUDIGYLS                = (char *)szAUDIGYLS;
+static char *pszBT87X                   = (char *)szBT87X;
+static char *pszAZX                     = (char *)szAZX;
 #endif /* ENABLE_HW_CERTIFICATION */
 
-       BOOL fNoHardware         = FALSE;
+           BOOL fNoHardware             = FALSE;
 
 extern void DBGCALLCONV APM_Init();
@@ -126 +126 @@
   int d;
   for (;;)
-    {
-//       d = (int)(unsigned char)*string1 - (int)(unsigned char)(*string2 ^ 0x81);
-       d = (int)(unsigned char)*string1 - (int)(unsigned char)*string2;
-       if (d != 0 || *string1 == 0 || *string2 == 0)
-         return d;
-       ++string1; ++string2;
-    }
+        {
+//               d = (int)(unsigned char)*string1 - (int)(unsigned char)(*string2 ^ 0x81);
+           d = (int)(unsigned char)*string1 - (int)(unsigned char)*string2;
+           if (d != 0 || *string1 == 0 || *string2 == 0)
+                 return d;
+           ++string1; ++string2;
+        }
 }
 //******************************************************************************
@@ -141 +141 @@
 
   while (count != 0)
-    {
-        //      d = (int)(unsigned char)*string1 - (int)(unsigned char)(*string2 ^ 0x81);
-      d = (int)(unsigned char)*string1 - (int)(unsigned char)*string2;
-      if (d != 0 || *string1 == 0 || *string2 == 0)
-        return d;
-      ++string1; ++string2;
-      --count;
-    }
+        {
+                //              d = (int)(unsigned char)*string1 - (int)(unsigned char)(*string2 ^ 0x81);
+          d = (int)(unsigned char)*string1 - (int)(unsigned char)*string2;
+          if (d != 0 || *string1 == 0 || *string2 == 0)
+                return d;
+          ++string1; ++string2;
+          --count;
+        }
   return 0;
 }
@@ -160 +160 @@
    if(OSS16_AttachToPdd() != OSSERR_SUCCESS)
    {
-       DebugInt3();
-//       DevHelp_Beep(500, 100);
-       goto failure;
+           DebugInt3();
+//               DevHelp_Beep(500, 100);
+           goto failure;
    }
 
@@ -168 +168 @@
    if(OSS16_QueryDevCaps(current_device, &devCaps[0]) != OSSERR_SUCCESS)
    {
-       DebugInt3();
-       //       DevHelp_Beep(2000, 100);
-       goto failure;
+           DebugInt3();
+           //           DevHelp_Beep(2000, 100);
+           goto failure;
    }
    dprintf(("Device 0 name: %s", (char FAR *)devCaps[0].szDeviceName));
    if(devCaps[0].nrDevices > OSS32_MAX_AUDIOCARDS)
    {
-       DebugInt3();
-       devCaps[0].nrDevices = OSS32_MAX_AUDIOCARDS;
+           DebugInt3();
+           devCaps[0].nrDevices = OSS32_MAX_AUDIOCARDS;
    }
    //Get caps of other devices (if present)
    for(i=1;i<devCaps[0].nrDevices;i++)
    {
-       if(OSS16_QueryDevCaps(i, &devCaps[i]) != OSSERR_SUCCESS) {
-           DebugInt3();
-           goto failure;
-       }
+           if(OSS16_QueryDevCaps(i, &devCaps[i]) != OSSERR_SUCCESS) {
+                   DebugInt3();
+                   goto failure;
+           }
    }
 
@@ -191 +191 @@
    //Check for certified audiocard/chipsets
    if(!xorstrncmp(devCaps[0].szDeviceName, pszIntelICH, 6) ||
-      !xorstrcmp(devCaps[0].szDeviceName, pszSI7012) ||
-      !xorstrcmp(devCaps[0].szDeviceName, pszALI5455) ||
-      !xorstrncmp(devCaps[0].szDeviceName, pszNVIDIA, 6) ||
-      !xorstrcmp(devCaps[0].szDeviceName, pszAMD))
-   {
-       soundCard = INTELICH;
+          !xorstrcmp(devCaps[0].szDeviceName, pszSI7012) ||
+          !xorstrcmp(devCaps[0].szDeviceName, pszALI5455) ||
+          !xorstrncmp(devCaps[0].szDeviceName, pszNVIDIA, 6) ||
+          !xorstrcmp(devCaps[0].szDeviceName, pszAMD))
+   {
+           soundCard = INTELICH;
    }
    else
    if(!xorstrcmp(devCaps[0].szDeviceName, pszSBLive))
    {
-       soundCard = SBLIVE;
+           soundCard = SBLIVE;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszCMedia, 11))
    {
-       soundCard = CMEDIA;
+           soundCard = CMEDIA;
    }
    else
    if(!xorstrcmp(devCaps[0].szDeviceName, pszCrystal4281))
    {
-       soundCard = CS4281;
+           soundCard = CS4281;
    }
    else
    if(!xorstrcmp(devCaps[0].szDeviceName, pszALS4000))
    {
-       //hardware not completely full duplex; sample rates must be identical if
-       //both playback & recording active
-       devCaps[0].waveInCaps.ulRateFlags  |= OSS32_CAPS_PCM_RATE_HALFDUPLEX;
-       devCaps[0].waveOutCaps.ulRateFlags |= OSS32_CAPS_PCM_RATE_HALFDUPLEX;
-       soundCard = ALS4000;
+           //hardware not completely full duplex; sample rates must be identical if
+           //both playback & recording active
+           devCaps[0].waveInCaps.ulRateFlags  |= OSS32_CAPS_PCM_RATE_HALFDUPLEX;
+           devCaps[0].waveOutCaps.ulRateFlags |= OSS32_CAPS_PCM_RATE_HALFDUPLEX;
+           soundCard = ALS4000;
    }
    else
    if(!xorstrcmp(devCaps[0].szDeviceName, pszCrystal46XX))
    {
-       soundCard = CS46XX;
+           soundCard = CS46XX;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszVIA82XX, 6))
    {
-       soundCard = VIA82XX;
+           soundCard = VIA82XX;
    }
    else
    if(!xorstrcmp(devCaps[0].szDeviceName, pszESS1938))
    {
-       soundCard = ESS1938;
+           soundCard = ESS1938;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszVORTEX, 6))
    {
-       soundCard = VORTEX;
+           soundCard = VORTEX;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszYAMAHA,6))
    {
-       soundCard = YAMAHA;
+           soundCard = YAMAHA;
    }
    else
    if(!xorstrcmp(devCaps[0].szDeviceName, pszMAESTRO))
    {
-       soundCard = MAESTRO;
-   }
-   else
-       if(!xorstrcmp(devCaps[0].szDeviceName, pszMAESTRO3) ||
-          !xorstrcmp(devCaps[0].szDeviceName, pszALLEGRO))
-   {
-       soundCard = MAESTRO3;
-   }
-   else
-       if(!xorstrncmp(devCaps[0].szDeviceName, pszES1371, 6) ||
-          !xorstrncmp(devCaps[0].szDeviceName, pszES1370, 6))
-   {
-       soundCard = ENSONIQ;
+           soundCard = MAESTRO;
+   }
+   else
+           if(!xorstrcmp(devCaps[0].szDeviceName, pszMAESTRO3) ||
+                  !xorstrcmp(devCaps[0].szDeviceName, pszALLEGRO))
+   {
+           soundCard = MAESTRO3;
+   }
+   else
+           if(!xorstrncmp(devCaps[0].szDeviceName, pszES1371, 6) ||
+                  !xorstrncmp(devCaps[0].szDeviceName, pszES1370, 6))
+   {
+           soundCard = ENSONIQ;
    }
    else
    if(!xorstrcmp(devCaps[0].szDeviceName, pszALI5451))
    {
-       soundCard = ALI5451;
+           soundCard = ALI5451;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszTRIDENT,7))
    {
-       soundCard = TRIDENT;
+           soundCard = TRIDENT;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszNEOMAGIC,5))
    {
-       soundCard = NEOMAGIC;
+           soundCard = NEOMAGIC;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszFM801,5))
    {
-       soundCard = FM801;
+           soundCard = FM801;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszATIIXP,7))
    {
-       soundCard = ATIIXP;
+           soundCard = ATIIXP;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszAUDIGYLS,6))
    {
-       soundCard = AUDIGYLS;
+           soundCard = AUDIGYLS;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszBT87X,5))
    {
-       soundCard = BT87X;
+           soundCard = BT87X;
    }
    else
    if(!xorstrncmp(devCaps[0].szDeviceName, pszAZX,9))
    {
-       soundCard = AZX;
+           soundCard = AZX;
    }
    else {
-//       printk("Soundcard %s not supported", (char FAR *)devCaps[0].szDeviceName);
-       dprintf(("Soundcard %s not supported", (char FAR *)devCaps[0].szDeviceName));
-//       DevHelp_Beep(1000, 50);
-       DebugInt3();
-       goto failure;
+           rprintf(("Soundcard %s not supported", (char FAR *)devCaps[0].szDeviceName));
+                //DevHelp_Beep(1000, 50);
+           DebugInt3();
+           goto failure;
    }
 #endif /* ENABLE_HW_CERTIFICATION */
@@ -315 +314 @@
 
 failure:
-//    DevHelp_Beep(1000, 50);
-    fNoHardware = TRUE;
-    return FALSE;
+//        DevHelp_Beep(1000, 50);
+        fNoHardware = TRUE;
+        return FALSE;
 }
 
@@ -329 +328 @@
 {
    if(InitializeAudio() == FALSE) {
-       return;
+           return;
    }
    if(fNoHardware) return;
@@ -338 +337 @@
    if(devCaps[0].ulCaps & OSS32_CAPS_FMSYNTH_PLAYBACK)
    {
-       dprintf(("Creating FM Synthesizer device"));
-
-       // Build a FMSYNTH object.  First create a timer, then the HW object.
-       TIMER* pFMSynthTimer =
-           new TIMER( NULL, MIDI_TimerInterval, STREAM_FMSYNTH_PLAY );
-       if (pFMSynthTimer->eState() != TIMER_Disabled)
-           new FMSYNTH( pFMSynthTimer );
-
-       SetHardwareType(AUDIOHW_FMSYNTH_PLAY, MIDI, OPERATION_PLAY, 1);
-       SetHardwareType(AUDIOHW_FMSYNTH_PLAY, DATATYPE_MIDI, OPERATION_PLAY, 1);
-       // MIDI on Warp 3
-       SetHardwareType(AUDIOHW_FMSYNTH_PLAY, DATATYPE_NULL, OPERATION_PLAY, 1);
+           dprintf(("Creating FM Synthesizer device"));
+
+           // Build a FMSYNTH object.  First create a timer, then the HW object.
+           TIMER* pFMSynthTimer =
+                   new TIMER( NULL, MIDI_TimerInterval, STREAM_FMSYNTH_PLAY );
+           if (pFMSynthTimer->eState() != TIMER_Disabled)
+                   new FMSYNTH( pFMSynthTimer );
+
+           SetHardwareType(AUDIOHW_FMSYNTH_PLAY, MIDI, OPERATION_PLAY, 1);
+           SetHardwareType(AUDIOHW_FMSYNTH_PLAY, DATATYPE_MIDI, OPERATION_PLAY, 1);
+           // MIDI on Warp 3
+           SetHardwareType(AUDIOHW_FMSYNTH_PLAY, DATATYPE_NULL, OPERATION_PLAY, 1);
    }
 
    if((devCaps[0].ulCaps & OSS32_CAPS_MPU401_PLAYBACK) &&
-      (devCaps[0].ulCaps & OSS32_CAPS_MPU401_CAPTURE))
-   {
-       dprintf(("Creating MPU401 device"));
-
-       // Build the MPU401 object. First create a timer, then the HW object.
-       TIMER* pMPUTimer =
-           // vladest      new TIMER(NULL, MIDI_TimerInterval, STREAM_MPU401_PLAY );
-           new TIMER(NULL, MIDI_TimerInterval, STREAM_MPU401_CAPTURE );
-
-       if (pMPUTimer->eState() != TIMER_Disabled)
-           new MPU_401(pMPUTimer);
-
-//       SetHardwareType(AUDIOHW_MPU401_PLAY, MIDI, OPERATION_PLAY, 0);
-//       SetHardwareType(AUDIOHW_MPU401_PLAY, DATATYPE_MIDI, OPERATION_PLAY, 0);
-
-       SetHardwareType(AUDIOHW_MPU401_CAPTURE, MIDI, OPERATION_RECORD, 0);
-       SetHardwareType(AUDIOHW_MPU401_CAPTURE, DATATYPE_MIDI, OPERATION_RECORD, 0);
-
-       RTMIDI::vConnect();
+          (devCaps[0].ulCaps & OSS32_CAPS_MPU401_CAPTURE))
+   {
+           dprintf(("Creating MPU401 device"));
+
+           // Build the MPU401 object. First create a timer, then the HW object.
+           TIMER* pMPUTimer =
+                   // vladest      new TIMER(NULL, MIDI_TimerInterval, STREAM_MPU401_PLAY );
+                   new TIMER(NULL, MIDI_TimerInterval, STREAM_MPU401_CAPTURE );
+
+           if (pMPUTimer->eState() != TIMER_Disabled)
+                   new MPU_401(pMPUTimer);
+
+//               SetHardwareType(AUDIOHW_MPU401_PLAY, MIDI, OPERATION_PLAY, 0);
+//               SetHardwareType(AUDIOHW_MPU401_PLAY, DATATYPE_MIDI, OPERATION_PLAY, 0);
+
+           SetHardwareType(AUDIOHW_MPU401_CAPTURE, MIDI, OPERATION_RECORD, 0);
+           SetHardwareType(AUDIOHW_MPU401_CAPTURE, DATATYPE_MIDI, OPERATION_RECORD, 0);
+
+           RTMIDI::vConnect();
    }
    APM_Init();
@@ -380 +379 @@
  * Purpose:  Worker rountine for the Strategy Open function.
  *
- * Notes:    The Strategy Open doesn't require allocation of any resources,
- *           and the function is treated as a NOP.  The first allocation of
- *           resources happens at Strategy IOCtl time, in the handler for
- *           the AudioInit IOCtl.
- *           Check to see if the VDD has claimed the hardware and return with
- *           the busy bit on the the request packet.
- *           Increment the InUseCount so we know that an OS/2 app has an
- *           instance open and we don't let the VDD take the hardware..
+ * Notes:        The Strategy Open doesn't require allocation of any resources,
+ *                       and the function is treated as a NOP.  The first allocation of
+ *                       resources happens at Strategy IOCtl time, in the handler for
+ *                       the AudioInit IOCtl.
+ *                       Check to see if the VDD has claimed the hardware and return with
+ *                       the busy bit on the the request packet.
+ *                       Increment the InUseCount so we know that an OS/2 app has an
+ *                       instance open and we don't let the VDD take the hardware..
  *
  *
@@ -395 +394 @@
 {
    if (usVDDHasHardware) {
-      prp->usStatus = RPDONE | RPERR | RPBUSY;
+          prp->usStatus = RPDONE | RPERR | RPBUSY;
    }
    else {
-      ++usInUseCount;
+          ++usInUseCount;
    }
 }
@@ -405 +404 @@
 void StrategyClose(PREQPACKET prp)
 {
-    --usInUseCount;
-    PSTREAM pstream = FindStream_fromFile( prp->s.open_close.usSysFileNum );
-    if (pstream)
-        delete pstream;
-    else
-        dprintf(("Close NULL stream"));;         //### Log unexpected condition.
+        --usInUseCount;
+        PSTREAM pstream = FindStream_fromFile( prp->s.open_close.usSysFileNum );
+        if (pstream)
+                delete pstream;
+        else
+                dprintf(("Close NULL stream"));;                 //### Log unexpected condition.
 }
 //******************************************************************************
@@ -416 +415 @@
 void StrategyDeinstall(PREQPACKET prp)
 {
-    while (pAudioHWList->IsElements())
-        pAudioHWList->DestroyElement(pAudioHWList->PopHead());
+        while (pAudioHWList->IsElements())
+                pAudioHWList->DestroyElement(pAudioHWList->PopHead());
 }
 //******************************************************************************
@@ -423 +422 @@
 void StrategyShutdown(PREQPACKET prp)
 {
-    dprintf(("StrategyShutdown %d", prp->s.shutdown.Function));
+        dprintf(("StrategyShutdown %d", prp->s.shutdown.Function));
 }
 //******************************************************************************
@@ -446 +445 @@
 
    if(fNoHardware) {
-       prp->usStatus = RPDONE | RPERR | RPGENFAIL;
-       return;
+           prp->usStatus = RPDONE | RPERR | RPGENFAIL;
+           return;
    }
 
@@ -455 +454 @@
 
    switch (prp->bCommand) {
-      case STRATEGY_INIT:
-         StrategyInit(prp);
-         break;
-      case STRATEGY_OPEN:
-         StrategyOpen(prp);
-         break;
-      case STRATEGY_CLOSE:
-         StrategyClose(prp);
-         break;
-      case STRATEGY_GENIOCTL:
-         StrategyIoctl(prp, 0);
-         break;
-      case STRATEGY_DEINSTALL:
-         StrategyDeinstall(prp);
-         break;
-      case STRATEGY_INITCOMPLETE:
-         StrategyInitComplete(prp);
-         break;
-      case STRATEGY_SHUTDOWN:
-         StrategyShutdown(prp);
-         break;
-      default:
-         dprintf(("Strategy Unk:0x%x", prp->bCommand));
-         prp->usStatus = RPDONE | RPERR | RPGENFAIL;
+          case STRATEGY_INIT:
+                 StrategyInit(prp);
+                 break;
+          case STRATEGY_OPEN:
+                 StrategyOpen(prp);
+                 break;
+          case STRATEGY_CLOSE:
+                 StrategyClose(prp);
+                 break;
+          case STRATEGY_GENIOCTL:
+                 StrategyIoctl(prp, 0);
+                 break;
+          case STRATEGY_DEINSTALL:
+                 StrategyDeinstall(prp);
+                 break;
+          case STRATEGY_INITCOMPLETE:
+                 StrategyInitComplete(prp);
+                 break;
+          case STRATEGY_SHUTDOWN:
+                 StrategyShutdown(prp);
+                 break;
+          default:
+                 rprintf(("Strategy Unk:0x%x", prp->bCommand));
+                 prp->usStatus = RPDONE | RPERR | RPGENFAIL;
    }
 #ifdef DEBUG
@@ -493 +492 @@
 
    if(fNoHardware) {
-       prp->usStatus = RPDONE | RPERR | RPGENFAIL;
-       if(prp->bCommand == STRATEGY_INIT) {
-           prp->s.init_out.usCodeEnd = 0;
-           prp->s.init_out.usDataEnd = 0;
-       }
-       return;
+           prp->usStatus = RPDONE | RPERR | RPGENFAIL;
+           if(prp->bCommand == STRATEGY_INIT) {
+                   prp->s.init_out.usCodeEnd = 0;
+                   prp->s.init_out.usDataEnd = 0;
+           }
+           return;
    }
 
@@ -506 +505 @@
 
    switch (prp->bCommand) {
-      case STRATEGY_INIT:
-         prp->usStatus = RPDONE;
-         prp->s.init_out.usCodeEnd = (USHORT) &end_of_text;
-         prp->s.init_out.usDataEnd = (USHORT) &end_of_heap;
-         break;
-      case STRATEGY_OPEN:
-         StrategyOpen(prp);
-         break;
-      case STRATEGY_CLOSE:
-         StrategyClose(prp);
-         break;
-      case STRATEGY_GENIOCTL:
-         StrategyIoctl(prp, 1);
-         break;
-      case STRATEGY_DEINSTALL:
-         StrategyDeinstall(prp);
-         break;
-      case STRATEGY_INITCOMPLETE:
-         prp->usStatus = RPDONE;
-         break;
-      default:
-         prp->usStatus = RPDONE | RPERR | RPGENFAIL;
+          case STRATEGY_INIT:
+                 prp->usStatus = RPDONE;
+                 prp->s.init_out.usCodeEnd = (USHORT) &end_of_text;
+                 prp->s.init_out.usDataEnd = (USHORT) &end_of_heap;
+                 break;
+          case STRATEGY_OPEN:
+                 StrategyOpen(prp);
+                 break;
+          case STRATEGY_CLOSE:
+                 StrategyClose(prp);
+                 break;
+          case STRATEGY_GENIOCTL:
+                 StrategyIoctl(prp, 1);
+                 break;
+          case STRATEGY_DEINSTALL:
+                 StrategyDeinstall(prp);
+                 break;
+          case STRATEGY_INITCOMPLETE:
+                 prp->usStatus = RPDONE;
+                 break;
+          default:
+                 prp->usStatus = RPDONE | RPERR | RPGENFAIL;
    }
 #ifdef DEBUG

OCO/branches/DAZ/drv16/waudio.cpp ¶

@@ -407 +407 @@
 
    default:
-           dprintf(("DataFormat wrong:%x",ulBitsPerSample));
+           rprintf(("DataFormat wrong:%x",ulBitsPerSample));
            DebugInt3();
            return 0;
@@ -829 +829 @@
         {
                 pConfigInfo->ulHwSampleRate = pConfigInfo->ulFixedSampleRate;
-#ifdef DEBUG
                 dprintf(("WA::QuerySampleFormat: SampleRate1 %d", pConfigInfo->ulHwSampleRate));
-#endif
         }
         else
         {
                 pConfigInfo->ulHwSampleRate = pConfigInfo->ulSampleRate;
-#ifdef DEBUG
                 dprintf(("WA::QuerySampleFormat: SampleRate2 %d", pConfigInfo->ulHwSampleRate));
-#endif
         }
 

OCO/branches/DAZ/drv16/waveplay.cpp ¶

@@ -71 +71 @@
                 if((ret = OSS16_WaveOpen(ulDevice, ulStreamType, ulSysFileNum, pStreamId)) != OSSERR_SUCCESS)
                 {
-                        dprintf(("OSS16_WaveOpen failed!!"));
+                        rprintf(("OSS16_WaveOpen failed!!"));
                         DebugInt3();
                         //StreamId = 0;
@@ -163 +163 @@
                 if (StreamId == NULL)
                 {
-                        dprintf(("WAVEPLAY::ConfigDev. Error reopening stream"));
+                        rprintf(("WAVEPLAY::ConfigDev. Error reopening stream"));
                         return FALSE;
                 }
@@ -177 +177 @@
                         DebugInt3();
                         ulFirstBufSize = 8192; //should never happen!
-                        dprintf(("Arg - shouldn't happen"));
+                        rprintf(("Arg - shouldn't happen"));
                 }
         }
@@ -268 +268 @@
                 if (AddBuffer(StreamId, pConfigInfo, pUserBuffer, ulBytesToTransfer, pulBytesTransferred) == FALSE)
                 {
-                        dprintf(("Transfer.False. NoConv ulB %ld tr:%ld",ulBytesToTransfer,*pulBytesTransferred));
+                        rprintf(("Transfer failed. NoConv ulB %ld tr:%ld",ulBytesToTransfer,*pulBytesTransferred));
                         *pulBytesTransferred = 0;
                         return FALSE;
@@ -309 +309 @@
                 else
                 {
-                        dprintf(("Transfer Zero pConfigInfo->pfnConvert"));
+                        rprintf(("Transfer Zero pConfigInfo->pfnConvert"));
                         //DebugInt3();
                         return FALSE;
@@ -372 +372 @@
                         if(rc == OSSERR_BUFFER_FULL) {
                                  GetSpace(StreamId, pConfigInfo, &Space);
-                                 dprintf(("WPLAY::AddBuffer; %ld %x failed due to full buffer free space:%ld", ulCvtBufferSize, (USHORT)rc,Space));
+                                 rprintf(("WPLAY::AddBuffer; %ld %x failed due to full buffer free space:%ld", ulCvtBufferSize, (USHORT)rc,Space));
                         } else {
-                                dprintf(("WPLAY::AddBuffer; %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
+                                rprintf(("WPLAY::AddBuffer; %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
                         }
                         *pulBytesTransferred = 0;
@@ -410 +410 @@
            {
                         *pulBytesTransferred = 0;
-                        dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer failed due to an error rc=%x",(USHORT)rc));
+                        rprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer failed due to an error rc=%x",(USHORT)rc));
                         dprintf(("StreamID:%x PUB:%lx BtTr:%ld",(USHORT)StreamId, pUserBuffer, ulBytesToTransfer));
                         return FALSE;
@@ -428 +428 @@
         if(OSS16_WaveGetPos(StreamId, &ulCurBytesProcessed) != OSSERR_SUCCESS) {
                 *pulStreamPosition = 0;
-                dprintf(("WAVEPLAY::GetPosition: Failed"));
+                rprintf(("WAVEPLAY::GetPosition: Failed"));
                 return FALSE;
         }
@@ -449 +449 @@
         {
                 *pulStreamSpace = 0;
-                dprintf(("WAVEPLAY::GetSpace: Failed"));
+                rprintf(("WAVEPLAY::GetSpace: Failed"));
                 return FALSE;
         }
@@ -469 +469 @@
         {
                 *pulHwPtr = 0;
-                dprintf(("WAVEPLAY::WaveGetHwPtr: Failed"));
+                rprintf(("WAVEPLAY::WaveGetHwPtr: Failed"));
                 return FALSE;
         }

OCO/branches/DAZ/drv16/waverec.cpp ¶

@@ -45 +45 @@
         if(OSS16_WaveOpen(ulDevice, ulStreamType, ulSysFileNum, pStreamId) != OSSERR_SUCCESS)
         {
-            dprintf(("OSS16_WaveOpen failed!!"));
+            rprintf(("OSS16_WaveOpen failed!!"));
             DebugInt3();
             StreamId = 0;
@@ -139 +139 @@
     hwparam.ulDataType      = QueryOSSDataFormat(OPERATION_RECORD, pConfigInfo->ulDataType, pConfigInfo->ulHwBitsPerSample);
     if(OSS16_WaveSetFormat(StreamId, &hwparam) != OSSERR_SUCCESS) {
-                dprintf(("WAVEREC::ConfigDev: WaveSetFormat failed"));
+                rprintf(("WAVEREC::ConfigDev: WaveSetFormat failed"));
         DebugInt3();
         return FALSE;
@@ -152 +152 @@
                        ULONG FAR *pulBytesTransferred)
 {
-#ifdef DEBUG
     //dprintf(("WAVEREC::Transfer %lx bytes", ulBytesToTransfer));
-#endif
     if(pConfigInfo->usConversion == CONVERT_NONE)
     {
@@ -308 +306 @@
     if(OSS16_WaveGetHwPtr(StreamId, &space) != OSSERR_SUCCESS) {
         *pulHwPtr = 0;
-        #ifdef DEBUG
-        dprintf(("OSS16_WAVEREC::WaveGetHwPtr: Failed"));
-        #endif /* DEBUG */
+        rprintf(("OSS16_WAVEREC::WaveGetHwPtr: Failed"));
         return FALSE;
     }

OCO/branches/DAZ/drv16/wavestrm.cpp ¶

@@ -188 +188 @@
 // if this is a write stream call _vFillAudioBuf
 //******************************************************************************
-short sDbgInProcess = 0;
-short sDbgSave;
+static short sAddBuffersInProcess = 0;
+static short sDbgSave;
 #pragma off (unreferenced)
 void WAVESTREAM::AddBuffers(SHORT sFirst)
@@ -200 +200 @@
         //dprintf(("WS:AddBuffers First=%d, SampleSize=%lx", sFirst, _configinfo.ulSampleSize));
 
-        if (sDbgInProcess) {
+        if (sAddBuffersInProcess) {
+                // This routine cannot be reentered
+                // Some systems generate an extra interrupt causing this routine to be reentered
+                // so we ignore the call that causes us to be reentered
                 rprintf(("WS::ABS InProcess Now=%x Save=%x", sFirst, sDbgSave));
                 return;
         }
-        sDbgInProcess++;
+        sAddBuffersInProcess++;
         sDbgSave = sFirst;
 
@@ -258 +261 @@
 //              }
         }
-        sDbgInProcess--;
+        sAddBuffersInProcess--;
 }
 

OCO/branches/DAZ/drv16/wtsynth.cpp ¶

@@ -42 +42 @@
 {
     if(OSS16_MidiOpen(current_device, WAVETABLE_SEND, pStreamId) != OSSERR_SUCCESS) {
-        dprintf(("WTSYNTH::Open: OSS16_MidiOpen failed!!"));
+        rprintf(("WTSYNTH::Open: OSS16_MidiOpen failed!!"));
         DebugInt3();
         return FALSE;
@@ -53 +53 @@
 {
     if(OSS16_MidiClose(StreamId) != OSSERR_SUCCESS) {
-        dprintf(("WTSYNTH::Close: OSS16_MidiClose failed!!"));
+        rprintf(("WTSYNTH::Close: OSS16_MidiClose failed!!"));
         DebugInt3();
         return FALSE;
@@ -65 +65 @@
 //******************************************************************************
 int WTSYNTH::writeByte(OSSSTREAMID StreamId, BYTE b)
-{ 
-    int dummy = b; 
-    return 0; 
+{
+    int dummy = b;
+    return 0;
 }
 //******************************************************************************
@@ -76 +76 @@
 //******************************************************************************
 int WTSYNTH::readByte(OSSSTREAMID StreamId)
-{ 
+{
     DebugInt3();
-    return -1; 
+    return -1;
 }
 //******************************************************************************
@@ -102 +102 @@
 {
     if(MixerSetVolume(mixerStreamId, OSS32_MIX_VOLUME_MIDI, ulVolume) != TRUE) {
-        dprintf(("WTSYNTH::SetVolume: MixerSetVolume failed!!"));
+        rprintf(("WTSYNTH::SetVolume: MixerSetVolume failed!!"));
         //not necessarily fatal; maybe there is no volume control for midi
     }

OCO/branches/DAZ/install/control.scr ¶

@@ -25 +25 @@
 ssgroup=0
 ssname="mmbase"
-ssversion="1.9.3-BETA SVNr512"
+ssversion="1.9.3-BETA SVNr513"
 sstermdll="ITERM.DLL"
 sstermdllentry="ITermEntry"
@@ -43 +43 @@
 ssgroup=17
 ssname="OS/2 Universal Audio: Wave"
-ssversion="1.9.3-BETA SVNr512"
+ssversion="1.9.3-BETA SVNr513"
 sssize=680
 ssdll="genin.dll"