diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-18 19:31:00 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 14:26:56 -0500 |
commit | 8bf2f8e747700419cc5bbc56c4496774eb8f2f1f (patch) | |
tree | 94e9b7e99d2e95d4515d48247ce549540374a989 /drivers/media/video/bt8xx/bttv-i2c.c | |
parent | ae62e3d4a8194680023b47ab778bf1dcea8d6b42 (diff) |
V4L/DVB (3577): Cleanup audio input handling
Cleanup audio input handling in bttv and tvaudio:
- inputs were specified that were never used
- mute was handled as a special input which led to confusing code
- confusing naming made it difficult to see if the setting was for
i2c or gpio.
The old audiochip.h input names moved to tvaudio.h. Currently this
is used both by tvaudio and msp3400 until the msp3400 implements the
new msp3400-specific inputs.
Detect in bttv the tvaudio and msp3400 i2c clients and use these
client pointers to set the inputs directly instead of broadcasting the
command.
Removed AUDC_SET_INPUT. Now replaced by VIDIOC_S_AUDIO. This will be
replaced again later by the new ROUTING commands.
Removed VIDIOC_G_AUDIO implementations in i2c drivers: this command is
a user level command and not to be used internally. It wasn't called at
all anyway.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-i2c.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-i2c.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c index 614c12018557..4b562b386fcf 100644 --- a/drivers/media/video/bt8xx/bttv-i2c.c +++ b/drivers/media/video/bt8xx/bttv-i2c.c | |||
@@ -302,6 +302,10 @@ static int attach_inform(struct i2c_client *client) | |||
302 | if (!client->driver->command) | 302 | if (!client->driver->command) |
303 | return 0; | 303 | return 0; |
304 | 304 | ||
305 | if (client->driver->id == I2C_DRIVERID_MSP3400) | ||
306 | btv->i2c_msp34xx_client = client; | ||
307 | if (client->driver->id == I2C_DRIVERID_TVAUDIO) | ||
308 | btv->i2c_tvaudio_client = client; | ||
305 | if (btv->tuner_type != UNSET) { | 309 | if (btv->tuner_type != UNSET) { |
306 | struct tuner_setup tun_setup; | 310 | struct tuner_setup tun_setup; |
307 | 311 | ||