Changeset 587 for GPL/trunk/alsa-kernel/include/sound/asound.h

Timestamp:

Jun 9, 2016, 10:38:13 PM (9 years ago)

Author:

David Azarewicz

Message:

Rearrange directory structure
rework makefiles
cleanup files

File:

• GPL/trunk/alsa-kernel/include/sound/asound.h (modified) (7 diffs)

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

@@ -42 +42 @@
 #endif /* __KERNEL__ **/
 
+#ifdef TARGET_OS2
 #ifndef __force
 #define __force
@@ -50 +51 @@
 #endif
 
-#ifdef TARGET_OS2
 #define SNDRV_PCM_VOL_FRONT_LEFT        0
 #define SNDRV_PCM_VOL_FRONT_RIGHT       1
@@ -323 +323 @@
 typedef int snd_pcm_hw_param_t;
 #define SNDRV_PCM_HW_PARAM_ACCESS       0       /* Access type */
-#ifdef TARGET_OS2
+#ifndef TARGET_OS2
+#define SNDRV_PCM_HW_PARAM_FORMAT       1       /* Format */
+#define SNDRV_PCM_HW_PARAM_SUBFORMAT    2       /* Subformat */
+#else
 #define SNDRV_PCM_HW_PARAM_RATE_MASK    1 /* Format */
-#endif
 #define SNDRV_PCM_HW_PARAM_FORMAT       2       /* Format */
 #define SNDRV_PCM_HW_PARAM_SUBFORMAT    3       /* Subformat */
+#endif
 #define SNDRV_PCM_HW_PARAM_FIRST_MASK   SNDRV_PCM_HW_PARAM_ACCESS
 #define SNDRV_PCM_HW_PARAM_LAST_MASK    SNDRV_PCM_HW_PARAM_SUBFORMAT
@@ -356 +359 @@
 #define SNDRV_PCM_HW_PARAM_LAST_INTERVAL        SNDRV_PCM_HW_PARAM_TICK_TIME
 
-#define SNDRV_PCM_HW_PARAMS_NORESAMPLE          (1<<0)  /* avoid rate resampling */
+#define SNDRV_PCM_HW_PARAMS_NORESAMPLE  (1<<0)  /* avoid rate resampling */
 
 struct snd_interval {
@@ -789 +792 @@
         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 +839 @@
         struct snd_ctl_elem_id id;      /* W: element ID */
         unsigned int indirect: 1;       /* W: indirect access - obsoleted */
-    union {
+        union {
                 union {
                         long value[128];
@@ -854 +857 @@
                 } 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)];
 };