Changeset 534

Timestamp:

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

Author:

David Azarewicz

Message:

debug updates

Location:

OCO/trunk

Files:

• drv16/init.cpp (modified) (1 diff)
• drv16/ioctl.cpp (modified) (3 diffs)
• drv16/mixer.cpp (modified) (3 diffs)
• drv16/strategy.cpp (modified) (2 diffs)
• drv16/waudio.cpp (modified) (3 diffs)
• drv16/wavestrm.cpp (modified) (1 diff)
• include/dbgos2.h (modified) (2 diffs)
• install/control.scr (modified) (2 diffs)
• uniaud.inc (modified) (1 diff)

OCO/trunk/drv16/init.cpp

@@ -60 +60 @@
 #include "mixer.h"
 
-
+#ifdef DEBUG
+static char szALSA[]      = "OS/2 Universal Audio MMPM/2 Driver v"UNIAUD_VERSION"-DEBUG";
+#else
 static char szALSA[]      = "OS/2 Universal Audio MMPM/2 Driver v"UNIAUD_VERSION;
+#endif
 static char szCopyRight1[]= "Copyright 2000-2002 InnoTek Systemberatung GmbH";
 static char szCopyRight2[]= "Copyright 2002 IBM Corporation";
 static char szCopyRight3[]= "Maintained by Netlabs http://www.netlabs.org";
 static char szParamError[]= "Parameter parsing error!!";
-#if 0 // fixme to be gone?
-static char szInitError[] = "Unable to initialize audio hardware";
-#endif
 static char szHeapError[] = "Heap creation failed!!";
 static char szAlsaError[] = "Unable to open 32-bit driver. Make sure that UNIAUD32.SYS placed before UNIAUD16.SYS";
 static char szAlsaAttachError[] = "Unable to attach 32-bit driver";
-#if 0 // fixme to be gone?
-static char szDevice[] = "Device name: ";
-#endif
 static char NEWLINE[]     = "\r\n";
 

OCO/trunk/drv16/ioctl.cpp

@@ -313 +313 @@
    }
 
-   if (pMasterVol && pMasterVol->usMasterVolume != AUDIO_IGNORE)
-   {
+   if (pMasterVol && pMasterVol->usMasterVolume != AUDIO_IGNORE) {
            // master volume ranges from 0 to 0x7FFF (linear)
            volume = pMasterVol->usMasterVolume;
            volume = (volume*OSS32_MAX_VOLUME)/0x7FFFUL;
-           if (volume > OSS32_MAX_VOLUME)
-           {
+           if (volume > OSS32_MAX_VOLUME) {
                    volume = OSS32_MAX_VOLUME;
            }
-//               dprintf(("IlAudioControl:Set MV to %d", volume));
-           MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_FRONT, MAKE_VOLUME_LR(volume, volume));
-           if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MASTER_REAR))
-           {
+                //dprintf(("IlAudioControl:Set MV to %d", volume));
+                MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_FRONT, MAKE_VOLUME_LR(volume, volume));
+                if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MASTER_REAR)) {
                    MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_MASTER_REAR, MAKE_VOLUME_LR(volume, volume));
            }
@@ -664 +661 @@
         return;
 }
+
+#ifdef DEBUG
+void IoctlDebug(PREQPACKET prp) {
+        DEBUGINFO __far *pInfo;
+//      PWAVESTREAM pStream;
+
+        if (prp->s.ioctl.usDLength < sizeof(DEBUGINFO)) {
+                prp->usStatus |= RPERR | RPBADCMD;
+                return;
+        }
+
+        pInfo = (DEBUGINFO __far *)prp->s.ioctl.pvData;
+        pInfo->usValid = 0x2222;
+        pInfo->usInUseCount = usInUseCount;
+#if 0
+        pStream = (PWAVESTREAM)FindFirstActiveStream(STREAM_WAVE_PLAY);
+        while(pStream) {
+                pStream = (PWAVESTREAM)FindNextActiveStream(STREAM_WAVE_PLAY, pStream);
+        }
+#endif
+}
+#endif
+
 //******************************************************************************
 //******************************************************************************
@@ -707 +727 @@
                 break;
 
+#ifdef DEBUG
+        case DEBUG_CAT: /* 0xDD */
+                IoctlDebug(prp);
+                break;
+#endif
+
         default:
                 prp->usStatus |= RPERR | RPBADCMD;

OCO/trunk/drv16/mixer.cpp

@@ -329 +329 @@
     BOOL fInputGainHack = FALSE;
 
-    dprintf(("MixerSetVolume Ctl=%lx Vol=%lx", ulControl, ulVolume));
+    dprintf(("MixerSetVolume Ctl=%lx Vol=%lx Flags=%lx", ulControl, ulVolume, fFlags));
     if(!(fFlags & MIXFLAG_FORCE_UPDATE) && fRecGainIOCTL90 && ulControl == OSS32_MIX_VOLUME_CAPTURE)
         return TRUE;    //locked
@@ -443 +443 @@
     int i;
 
-        //dprintf(("MixerSuspend"));
-
     for(i=0;i<=OSS32_MIX_VOLUME_MAX;i++) {
         if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(i)) {
@@ -474 +472 @@
     int i;
 
-        //dprintf(("MixerRestoreState"));
-
     //restore mixer control volume
     for(i=0;i<=OSS32_MIX_VOLUME_MAX;i++) {

OCO/trunk/drv16/strategy.cpp

@@ -40 +40 @@
 #include <ossidc16.h>
 #include <dbgos2.h>
+#include <version.h>
 #include "mixer.h"
 #include "timer.hpp"
@@ -164 +165 @@
            goto failure;
    }
+#ifdef DEBUG
+        rprintf(("Uniaud16 v"UNIAUD_VERSION"-DEBUG"));
+#else
+        rprintf(("Uniaud16 v"UNIAUD_VERSION));
+#endif
 
    //Get nr of detected devices + capabilities of first device

OCO/trunk/drv16/waudio.cpp

@@ -38 +38 @@
 
 #ifdef DEBUG
-char FAR *szCapsFlags[32] = {
+char *szCapsFlags[32] = {
 "FIXED",
 "LEFT_ALIGNED",
@@ -72 +72 @@
 "LOAD_CODE",
 };
+char DbgBuf[512];
 #endif
 
@@ -1274 +1275 @@
         dprintf(("Data type %ld, data subtype %ld", pCaps->ulDataType, pCaps->ulDataSubType));
 #ifdef DEBUG
-        dprintf(("Flags:"));
-
+        strcpy(DbgBuf, "Flags:");
         for(int i=0;i<32;i++) {
                 if(pCaps->ulFlags & (1UL << (ULONG)i)) {
-                        dprintf(("%s", szCapsFlags[i]));
-                }
-        }
+                        strcat(DbgBuf, " ");
+                        strcat(DbgBuf, szCapsFlags[i]);
+                }
+        }
+        dprintf((DbgBuf));
 #endif
 }

OCO/trunk/drv16/wavestrm.cpp

@@ -710 +710 @@
         case PROPERTY_VOLUME:
                 volume = value;
-                dprintf(("WS::SetProperty() Vol: %0lx",value));
+                dprintf(("WS::SetProperty() Vol: %0lx", value));
                 if(ulStreamState == STREAM_STREAMING && ulStreamType == STREAM_WAVE_PLAY) {
                         MixerSetWaveVolume(getMixerStreamId(), StreamId, volume);

OCO/trunk/include/dbgos2.h

@@ -14 +14 @@
 void far cdecl PrintfOut(char far *DbgStr , ...);
 extern int dbglevel;
+extern USHORT usInUseCount;
 
 #ifdef __cplusplus
@@ -48 +49 @@
 #endif
 
+#define DEBUG_CAT 0xDD
+typedef struct _DEBUGINFO {
+        USHORT usValid;
+        USHORT usInUseCount;
+} DEBUGINFO;
+
 #endif //__DBGOS2_H__

OCO/trunk/install/control.scr

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

OCO/trunk/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVNr533
+FIXPACK = SVNr534
 
 # ALSA BUILD VERSION