Changeset 542 for GPL/trunk/alsa-kernel

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/alsa-kernel

Files:

• core/pcm_lib.c (modified) (4 diffs)
• include/sound/asound.h (modified) (5 diffs)

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)];
 };