Changeset 84 for GPL/trunk/alsa-kernel/include/sound/control.h

Timestamp:

Oct 23, 2006, 11:07:11 PM (19 years ago)

Author:

vladest

Message:

SB code update
HDA code update
Some other updates

File:

• GPL/trunk/alsa-kernel/include/sound/control.h (modified) (4 diffs)

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

@@ -28 +28 @@
 typedef int (snd_kcontrol_get_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
 typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
+typedef int (snd_kcontrol_tlv_rw_t)(struct snd_kcontrol *kcontrol,
+                                    int op_flag, /* 0=read,1=write,-1=command */
+                                    unsigned int size,
+                                    unsigned int __user *tlv);
 
 struct snd_kcontrol_new {
@@ -40 +44 @@
     snd_kcontrol_get_t *get;
     snd_kcontrol_put_t *put;
-    unsigned int *tlv;
+    union {
+        snd_kcontrol_tlv_rw_t *c;
+        unsigned int *p;
+    } tlv;
     unsigned long private_value;
 };
@@ -57 +64 @@
         snd_kcontrol_get_t *get;
         snd_kcontrol_put_t *put;
-        unsigned int *tlv;
+        union {
+                snd_kcontrol_tlv_rw_t *c;
+                unsigned int *p;
+        } tlv;
         unsigned long private_value;
 #ifdef TARGET_OS2
@@ -140 +150 @@
 }
 
+static inline struct snd_ctl_elem_id *snd_ctl_build_ioff(struct snd_ctl_elem_id *dst_id,
+                                                    struct snd_kcontrol *src_kctl,
+                                                    unsigned int offset)
+{
+        *dst_id = src_kctl->id;
+        dst_id->index += offset;
+        dst_id->numid += offset;
+        return dst_id;
+}
+
 #endif                          /* __CONTROL_H */