diff options
-rw-r--r-- | include/sound/asound.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h index 098595500632..9f1eecf99e6b 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h | |||
@@ -574,7 +574,7 @@ enum { | |||
574 | #define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */ | 574 | #define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */ |
575 | 575 | ||
576 | struct snd_timer_id { | 576 | struct snd_timer_id { |
577 | int dev_class; | 577 | int dev_class; |
578 | int dev_sclass; | 578 | int dev_sclass; |
579 | int card; | 579 | int card; |
580 | int device; | 580 | int device; |
@@ -762,7 +762,7 @@ struct snd_ctl_elem_id { | |||
762 | snd_ctl_elem_iface_t iface; /* interface identifier */ | 762 | snd_ctl_elem_iface_t iface; /* interface identifier */ |
763 | unsigned int device; /* device/client number */ | 763 | unsigned int device; /* device/client number */ |
764 | unsigned int subdevice; /* subdevice (substream) number */ | 764 | unsigned int subdevice; /* subdevice (substream) number */ |
765 | unsigned char name[44]; /* ASCII name of item */ | 765 | unsigned char name[44]; /* ASCII name of item */ |
766 | unsigned int index; /* index of item */ | 766 | unsigned int index; /* index of item */ |
767 | }; | 767 | }; |
768 | 768 | ||
@@ -809,7 +809,7 @@ struct snd_ctl_elem_info { | |||
809 | struct snd_ctl_elem_value { | 809 | struct snd_ctl_elem_value { |
810 | struct snd_ctl_elem_id id; /* W: element ID */ | 810 | struct snd_ctl_elem_id id; /* W: element ID */ |
811 | unsigned int indirect: 1; /* W: indirect access - obsoleted */ | 811 | unsigned int indirect: 1; /* W: indirect access - obsoleted */ |
812 | union { | 812 | union { |
813 | union { | 813 | union { |
814 | long value[128]; | 814 | long value[128]; |
815 | long *value_ptr; /* obsoleted */ | 815 | long *value_ptr; /* obsoleted */ |
@@ -827,15 +827,15 @@ struct snd_ctl_elem_value { | |||
827 | unsigned char *data_ptr; /* obsoleted */ | 827 | unsigned char *data_ptr; /* obsoleted */ |
828 | } bytes; | 828 | } bytes; |
829 | struct snd_aes_iec958 iec958; | 829 | struct snd_aes_iec958 iec958; |
830 | } value; /* RO */ | 830 | } value; /* RO */ |
831 | struct timespec tstamp; | 831 | struct timespec tstamp; |
832 | unsigned char reserved[128-sizeof(struct timespec)]; | 832 | unsigned char reserved[128-sizeof(struct timespec)]; |
833 | }; | 833 | }; |
834 | 834 | ||
835 | struct snd_ctl_tlv { | 835 | struct snd_ctl_tlv { |
836 | unsigned int numid; /* control element numeric identification */ | 836 | unsigned int numid; /* control element numeric identification */ |
837 | unsigned int length; /* in bytes aligned to 4 */ | 837 | unsigned int length; /* in bytes aligned to 4 */ |
838 | unsigned int tlv[0]; /* first TLV */ | 838 | unsigned int tlv[0]; /* first TLV */ |
839 | }; | 839 | }; |
840 | 840 | ||
841 | #define SNDRV_CTL_IOCTL_PVERSION _IOR('U', 0x00, int) | 841 | #define SNDRV_CTL_IOCTL_PVERSION _IOR('U', 0x00, int) |
@@ -886,8 +886,8 @@ struct snd_ctl_event { | |||
886 | unsigned int mask; | 886 | unsigned int mask; |
887 | struct snd_ctl_elem_id id; | 887 | struct snd_ctl_elem_id id; |
888 | } elem; | 888 | } elem; |
889 | unsigned char data8[60]; | 889 | unsigned char data8[60]; |
890 | } data; | 890 | } data; |
891 | }; | 891 | }; |
892 | 892 | ||
893 | /* | 893 | /* |