Changeset 542

Timestamp:

Sep 22, 2010, 8:52:19 PM (15 years ago)

Author:

David Azarewicz

Message:

changes to debug statements for api debugging

Location:

GPL/trunk

Files:

• alsa-kernel/core/pcm_lib.c (modified) (4 diffs)
• alsa-kernel/include/sound/asound.h (modified) (5 diffs)
• drv32/dispatch.c (modified) (2 diffs)
• lib32/ioctl.c (modified) (20 diffs)
• uniaud.inc (modified) (1 diff)

GPL/trunk/alsa-kernel/core/pcm_lib.c

@@ -302 +302 @@
         if (!xrun_debug(substream, 4))
                 goto no_jiffies_check;
-#endif
         /* Skip the jiffies check for hardwares with BATCH flag.
          * Such hardware usually just increases the position at each IRQ,
@@ -336 +335 @@
         }
  no_jiffies_check:
+#endif
         if (delta > runtime->period_size + runtime->period_size / 2) {
                 hw_ptr_error(substream,
@@ -418 +418 @@
         if (!xrun_debug(substream, 4))
                 goto no_jiffies_check;
-#endif
         if (delta < runtime->delay)
                 goto no_jiffies_check;
@@ -432 +431 @@
         }
  no_jiffies_check:
+#endif
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
             runtime->silence_size > 0)

GPL/trunk/alsa-kernel/include/sound/asound.h

@@ -374 +374 @@
 struct snd_pcm_hw_params {
         unsigned int flags;
-        struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 
+        struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK -
                                SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];
         struct snd_mask mres[5];        /* reserved masks */
@@ -772 +772 @@
 #define SNDRV_CTL_ELEM_ACCESS_LOCK              (1<<9)  /* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER             (1<<10) /* write lock owner */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK      (1<<28) /* kernel use a TLV callback */ 
+#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK      (1<<28) /* kernel use a TLV callback */
 #define SNDRV_CTL_ELEM_ACCESS_USER              (1<<29) /* user space element */
 /* bits 30 and 31 are obsoleted (for indirect access) */
@@ -789 +789 @@
         unsigned int device;            /* device/client number */
         unsigned int subdevice;         /* subdevice (substream) number */
-        unsigned char name[44];         /* ASCII name of item */
+    unsigned char name[44];             /* ASCII name of item */
         unsigned int index;             /* index of item */
 };
@@ -836 +836 @@
         struct snd_ctl_elem_id id;      /* W: element ID */
         unsigned int indirect: 1;       /* W: indirect access - obsoleted */
-        union {
+    union {
                 union {
                         long value[128];
@@ -854 +854 @@
                 } bytes;
                 struct snd_aes_iec958 iec958;
-        } value;                /* RO */
+    } value;                /* RO */
         struct timespec tstamp;
-        unsigned char reserved[128-sizeof(struct timespec)];
+    unsigned char reserved[128-sizeof(struct timespec)];
 };
 

GPL/trunk/drv32/dispatch.c

@@ -27 +27 @@
 #include <os2.h>
 
+#include <dbgos2.h>
 #include <devhelp.h>
 #include <devtype.h>
@@ -375 +376 @@
         {
 
-            if (rp->DataLength < sizeof(ULONG))
-            {
-                // invalid Data Pkt
-                rc = RPERR_PARAMETER | RPDONE;
-                break;
-            }
-
-            if (rp->ParmLength < sizeof(ULONG))
-            {
-                // invalid Data Pkt
-                rc = RPERR_PARAMETER | RPDONE;
-                break;
-            }
-
-            pData = (ULONG *) linData;
+            if (rp->DataLength < sizeof(ULONG)) {
+                // invalid Data Pkt
+                rc = RPERR_PARAMETER | RPDONE;
+                break;
+            }
+
+            if (rp->ParmLength < sizeof(ULONG)) {
+                // invalid Data Pkt
+                rc = RPERR_PARAMETER | RPDONE;
+                break;
+            }
+
+            pData = (ULONG *)linData;
             ULONG id = *((ULONG *)linParm);
             card_id = (id >> 16) & 0x0000FFFF;

GPL/trunk/lib32/ioctl.c

@@ -139 +139 @@
                 if (j++ > timeout)
                 {
-                        printk("j with tout =%i. handle: %x\n",j, pHandle);
+                        dprintf(("WaitForPCMInterrupt: Timeout j=%i handle=%x\n", j, pHandle));
                         return -ETIME;
                 }
@@ -548 +548 @@
 //        struct snd_ctl_card_info *pinfo;
 
+        dprintf(("GetUniaudCardInfo"));
+
         if(alsa_fops == NULL) {
                 ret = OSSERR_NO_DEVICE_AVAILABLE;
@@ -600 +602 @@
         mixerhandle *pHandle = NULL;
         int              ret, i, j, sz;
+
+        dprintf(("GetUniaudControlNum"));
 
         if(alsa_fops == NULL) {
@@ -665 +669 @@
         mixerhandle *pHandle = NULL;
         int              ret, i, j, sz;
+
+        dprintf(("GetUniaudControls"));
 
         if(alsa_fops == NULL) {
@@ -756 +762 @@
         int              ret, i, j, sz;
 
+        dprintf(("GetUniaudControlInfo"));
+
         if(alsa_fops == NULL) {
                 ret = OSSERR_NO_DEVICE_AVAILABLE;
@@ -811 +819 @@
 {
         struct snd_ctl_elem_value *pElem = NULL;
-        struct snd_ctl_elem_info  *pElemInfo = NULL;
+        //struct snd_ctl_elem_info  *pElemInfo = NULL;
         mixerhandle *pHandle = NULL;
         int              ret, i, j, sz;
@@ -848 +856 @@
                 goto failure;
         }
-
-//        printk("sizeof elem_info %i\n",sizeof(struct snd_ctl_elem_info));
 
         pElem->id.numid = id;
@@ -857 +863 @@
         if(pHandle) kfree(pHandle);
 
+        dprintf(("GetUniaudControlValueGet: id=%x 0=%x 1=%x", pElem->id.numid, pElem->value.integer.value[0], pElem->value.integer.value[1]));
+
         return OSSERR_SUCCESS;
 failure:
@@ -869 +877 @@
 {
         struct snd_ctl_elem_value *pElem = NULL;
-        struct snd_ctl_elem_info  *pElemInfo = NULL;
+        //struct snd_ctl_elem_info  *pElemInfo = NULL;
         mixerhandle *pHandle = NULL;
         int              ret, i, j, sz;
@@ -907 +915 @@
         }
 
-//        printk("sizeof elem_info %i\n",sizeof(struct snd_ctl_elem_info));
-
         pElem->id.numid = id;
         pElem->indirect = 0;
+
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
         ret = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
@@ -930 +937 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
         struct snd_pcm_hw_params *params = NULL;
-        printk("PS UniaudIoctlHWRefine\n");
         params = (struct snd_pcm_hw_params *)pHwParams;
+
+        dprintf(("UniaudIoctlHWRefine"));
 
         if (!params) return -1001;
@@ -947 +955 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
         struct snd_pcm_hw_params *params = NULL;
-        printk("PS UniaudIoctlHWParamSet\n");
         params = (struct snd_pcm_hw_params *)pHwParams;
+
+        dprintf(("UniaudIoctlHWParamSet"));
 
         if (!params) return -1001;
@@ -963 +972 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
         struct snd_pcm_sw_params *params = NULL;
-        printk("PS UniaudIoctlSWParamSet\n");
+
         params = (struct snd_pcm_sw_params *)pSwParams;
+
+        dprintf(("UniaudIoctlSWParamSet"));
 
         if (!params) return -1001;
@@ -981 +992 @@
         struct snd_pcm_status   *status = (struct snd_pcm_status *)pstatus;
 
+        dprintf(("UniaudIoctlPCMStatus"));
+
         if (!status) return -1001;
         if (!pHandle) return -1002;
@@ -995 +1008 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
+        dprintf(("UniaudIoctlPCMWrite"));
+
         if (!buf) return -1001;
         if (!pHandle) return -1002;
@@ -1013 +1028 @@
         if (!pHandle) return -1002;
 
+        dprintf(("UniaudIoctlPCMRead"));
+
         pHandle->file.f_flags = O_NONBLOCK;
 
@@ -1025 +1042 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
+        dprintf(("UniaudIoctlPCMPrepare"));
+
         if (!pHandle) return -1002;
 
@@ -1038 +1057 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
+        dprintf(("UniaudIoctlPCMResume: %x", pause));
+
         if (!pHandle) return -1002;
 
@@ -1052 +1073 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
 
+        dprintf(("UniaudIoctlPCMStart"));
+
         if (!pHandle) return -1002;
 
@@ -1065 +1088 @@
         int ret;
         soundhandle        *pHandle = (soundhandle *)streamid;
+
+        dprintf(("UniaudIoctlPCMDrop"));
 
         if (!pHandle) return -1002;

GPL/trunk/uniaud.inc

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