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

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/asound.h (modified) (13 diffs)

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

@@ -42 +42 @@
 #endif /* __KERNEL__ **/
 
-#ifdef TARGET_OS2
 #ifndef __force
 #define __force
@@ -51 +50 @@
 #endif
 
+#ifdef TARGET_OS2
 #define SNDRV_PCM_VOL_FRONT_LEFT        0
 #define SNDRV_PCM_VOL_FRONT_RIGHT       1
@@ -236 +236 @@
 #define SNDRV_PCM_FORMAT_U18_3LE        ((__force snd_pcm_format_t) 42) /* in three bytes */
 #define SNDRV_PCM_FORMAT_U18_3BE        ((__force snd_pcm_format_t) 43) /* in three bytes */
-#define SNDRV_PCM_FORMAT_LAST           SNDRV_PCM_FORMAT_U18_3BE
+#define SNDRV_PCM_FORMAT_G723_24        ((__force snd_pcm_format_t) 44) /* 8 samples in 3 bytes */
+#define SNDRV_PCM_FORMAT_G723_24_1B     ((__force snd_pcm_format_t) 45) /* 1 sample in 1 byte */
+#define SNDRV_PCM_FORMAT_G723_40        ((__force snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
+#define SNDRV_PCM_FORMAT_G723_40_1B     ((__force snd_pcm_format_t) 47) /* 1 sample in 1 byte */
+#define SNDRV_PCM_FORMAT_LAST           SNDRV_PCM_FORMAT_G723_40_1B
 
 #ifdef SNDRV_LITTLE_ENDIAN
@@ -279 +283 @@
 #define SNDRV_PCM_INFO_JOINT_DUPLEX     0x00200000      /* playback and capture stream are somewhat correlated */
 #define SNDRV_PCM_INFO_SYNC_START       0x00400000      /* pcm support some kind of sync go */
+#define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000      /* period wakeup can be disabled */
 #define SNDRV_PCM_INFO_FIFO_IN_FRAMES   0x80000000      /* internal kernel flag - FIFO size is in frames */
 
@@ -323 +328 @@
 typedef int snd_pcm_hw_param_t;
 #define SNDRV_PCM_HW_PARAM_ACCESS       0       /* Access type */
-#ifndef TARGET_OS2
-#define SNDRV_PCM_HW_PARAM_FORMAT       1       /* Format */
-#define SNDRV_PCM_HW_PARAM_SUBFORMAT    2       /* Subformat */
-#else
+#ifdef TARGET_OS2
 #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
@@ -360 +362 @@
 
 #define SNDRV_PCM_HW_PARAMS_NORESAMPLE  (1<<0)  /* avoid rate resampling */
+#define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER       (1<<1)  /* export buffer */
+#define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP    (1<<2)  /* disable period wakeups */
 
 struct snd_interval {
@@ -574 +578 @@
  */
 
-#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 5)
+#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 6)
 
 enum {
@@ -604 +608 @@
 
 struct snd_timer_id {
-        int dev_class;  
+        int dev_class;
         int dev_sclass;
         int card;
@@ -731 +735 @@
 #define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 6)
 
+/******************** This section used in uniaud.dll interface *********************/
 struct snd_ctl_card_info {
         int card;                       /* card number */
@@ -792 +797 @@
         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 */
 };
@@ -839 +844 @@
         struct snd_ctl_elem_id id;      /* W: element ID */
         unsigned int indirect: 1;       /* W: indirect access - obsoleted */
-        union {
+        union {
                 union {
                         long value[128];
@@ -857 +862 @@
                 } 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)];
 };
 
 struct snd_ctl_tlv {
-        unsigned int numid;     /* control element numeric identification */
-        unsigned int length;    /* in bytes aligned to 4 */
+        unsigned int numid;     /* control element numeric identification */
+        unsigned int length;    /* in bytes aligned to 4 */
 #ifndef TARGET_OS2
-        unsigned int tlv[0];    /* first TLV */
+        unsigned int tlv[0];    /* first TLV */
 #else
-        unsigned int tlv[1];    /* first TLV */
+        unsigned int tlv[1];    /* first TLV */
 #endif
 };
@@ -924 +929 @@
                         struct snd_ctl_elem_id id;
                 } elem;
-                unsigned char data8[60];
-        } data;
+                unsigned char data8[60];
+        } data;
 };