mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

asound.h: cosmetic changes for consistency with kernel asound.h

Browse source 
Change some whitespace and comments to remove spurious differences
between the alsa-lib and kernel versions of asound.h.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2011-10-05 10:40:48 +02:00
parent 9736511b36
commit 567cc19a88
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/sound/asound.h
View file

@ -314,7 +314,7 @@ union sndrv_pcm_sync_id {
struct sndrv_pcm_info { struct sndrv_pcm_info {
unsigned int device; /* RO/WR (control): device number */ unsigned int device; /* RO/WR (control): device number */
unsigned int subdevice; /* RO/WR (control): subdevice number */ unsigned int subdevice; /* RO/WR (control): subdevice number */
int stream; /* RO/WR (control): stream number */ int stream; /* RO/WR (control): stream direction */
int card; /* R: card number */ int card; /* R: card number */
unsigned char id[64]; /* ID (user selectable) */ unsigned char id[64]; /* ID (user selectable) */
unsigned char name[80]; /* name of this device */ unsigned char name[80]; /* name of this device */
@ -775,14 +775,14 @@ enum sndrv_ctl_elem_iface {
#define SNDRV_CTL_ELEM_ACCESS_READWRITE (SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE) #define SNDRV_CTL_ELEM_ACCESS_READWRITE (SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE)
#define SNDRV_CTL_ELEM_ACCESS_VOLATILE (1<<2) /* control value may be changed without a notification */ #define SNDRV_CTL_ELEM_ACCESS_VOLATILE (1<<2) /* control value may be changed without a notification */
#define SNDRV_CTL_ELEM_ACCESS_TIMESTAMP (1<<3) /* when was control changed */ #define SNDRV_CTL_ELEM_ACCESS_TIMESTAMP (1<<3) /* when was control changed */
#define SNDRV_CTL_ELEM_ACCESS_TLV_READ (1<<4) /* TLV read is supported */ #define SNDRV_CTL_ELEM_ACCESS_TLV_READ (1<<4) /* TLV read is possible */
#define SNDRV_CTL_ELEM_ACCESS_TLV_WRITE (1<<5) /* TLV write is supported */ #define SNDRV_CTL_ELEM_ACCESS_TLV_WRITE (1<<5) /* TLV write is possible */
#define SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE (SNDRV_CTL_ELEM_ACCESS_TLV_READ|SNDRV_CTL_ELEM_ACCESS_TLV_WRITE) #define SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE (SNDRV_CTL_ELEM_ACCESS_TLV_READ|SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)
#define SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND (1<<6) /* TLV command is possible */ #define SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND (1<<6) /* TLV command is possible */
#define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */ #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */
#define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */ #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_OWNER (1<<10) /* write lock owner */
#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* flag only for kernel */ #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 */ #define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */
/* bits 30 and 31 are obsoleted (for indirect access) */ /* bits 30 and 31 are obsoleted (for indirect access) */
@ -838,30 +838,30 @@ struct sndrv_ctl_elem_info {
} value; } value;
union { union {
unsigned short d[4]; /* dimensions */ unsigned short d[4]; /* dimensions */
unsigned short *d_ptr; /* (obsolete) indirect */ unsigned short *d_ptr; /* indirect - obsoleted */
} dimen; } dimen;
unsigned char reserved[64-4*sizeof(unsigned short)]; unsigned char reserved[64-4*sizeof(unsigned short)];
}; };
struct sndrv_ctl_elem_value { struct sndrv_ctl_elem_value {
struct sndrv_ctl_elem_id id; /* W: element ID */ struct sndrv_ctl_elem_id id; /* W: element ID */
unsigned int indirect: 1; /* (obsolete) W: use indirect pointer (xxx_ptr member) */ unsigned int indirect: 1; /* W: indirect access - obsoleted */
union { union {
union { union {
long value[128]; long value[128];
long *value_ptr; /* obsolete */ long *value_ptr; /* obsoleted */
} integer; } integer;
union { union {
long long value[64]; long long value[64];
long long *value_ptr; /* obsolete */ long long *value_ptr; /* obsoleted */
} integer64; } integer64;
union { union {
unsigned int item[128]; unsigned int item[128];
unsigned int *item_ptr; /* obsolete */ unsigned int *item_ptr; /* obsoleted */
} enumerated; } enumerated;
union { union {
unsigned char data[512]; unsigned char data[512];
unsigned char *data_ptr; /* obsolete */ unsigned char *data_ptr; /* obsoleted */
} bytes; } bytes;
struct sndrv_aes_iec958 iec958; struct sndrv_aes_iec958 iec958;
} value; /* RO */ } value; /* RO */