aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/tea6330t.h16
-rw-r--r--sound/i2c/tea6330t.c12
2 files changed, 14 insertions, 14 deletions
diff --git a/include/sound/tea6330t.h b/include/sound/tea6330t.h
index 3896c0a50907..1b265bf24ee1 100644
--- a/include/sound/tea6330t.h
+++ b/include/sound/tea6330t.h
@@ -22,21 +22,9 @@
22 * 22 *
23 */ 23 */
24 24
25#include "control.h"
26#include "i2c.h" /* generic i2c support */ 25#include "i2c.h" /* generic i2c support */
27 26
28typedef struct { 27int snd_tea6330t_detect(snd_i2c_bus_t *bus, int equalizer);
29 snd_i2c_device_t *device; 28int snd_tea6330t_update_mixer(snd_card_t * card, snd_i2c_bus_t * bus, int equalizer, int fader);
30 snd_i2c_bus_t *bus;
31 int equalizer;
32 int fader;
33 unsigned char regs[8];
34 unsigned char mleft, mright;
35 unsigned char bass, treble;
36 unsigned char max_bass, max_treble;
37} tea6330t_t;
38
39extern int snd_tea6330t_detect(snd_i2c_bus_t *bus, int equalizer);
40extern int snd_tea6330t_update_mixer(snd_card_t * card, snd_i2c_bus_t * bus, int equalizer, int fader);
41 29
42#endif /* __SOUND_TEA6330T_H */ 30#endif /* __SOUND_TEA6330T_H */
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c
index 4fdd1fb57dfe..7bd4948c2a3b 100644
--- a/sound/i2c/tea6330t.c
+++ b/sound/i2c/tea6330t.c
@@ -24,6 +24,7 @@
24#include <linux/init.h> 24#include <linux/init.h>
25#include <linux/slab.h> 25#include <linux/slab.h>
26#include <sound/core.h> 26#include <sound/core.h>
27#include <sound/control.h>
27#include <sound/tea6330t.h> 28#include <sound/tea6330t.h>
28 29
29MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); 30MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -43,6 +44,17 @@ MODULE_LICENSE("GPL");
43#define TEA6330T_GMU 0x80 /* mute control, general mute */ 44#define TEA6330T_GMU 0x80 /* mute control, general mute */
44#define TEA6330T_EQN 0x40 /* equalizer switchover (0=equalizer-on) */ 45#define TEA6330T_EQN 0x40 /* equalizer switchover (0=equalizer-on) */
45 46
47typedef struct {
48 snd_i2c_device_t *device;
49 snd_i2c_bus_t *bus;
50 int equalizer;
51 int fader;
52 unsigned char regs[8];
53 unsigned char mleft, mright;
54 unsigned char bass, treble;
55 unsigned char max_bass, max_treble;
56} tea6330t_t;
57
46int snd_tea6330t_detect(snd_i2c_bus_t *bus, int equalizer) 58int snd_tea6330t_detect(snd_i2c_bus_t *bus, int equalizer)
47{ 59{
48 int res; 60 int res;