diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 10:40:51 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:37 -0500 |
commit | 35ae6f04ad3e4c3ed8a83382b6511bd9beb5c768 (patch) | |
tree | ac482c50af4af87bab959b6e839a8383811d8daa /drivers/media/video/em28xx/em28xx.h | |
parent | f1990a9c39d957e6896fc506fc5388b7f302c429 (diff) |
V4L/DVB (9670): em28xx: allow specifying audio output
Some boards use different AC97 setups for output. This patch adds the
capability of specifying the output to be used. Currently, only one
output is selected, but the better is to allow user to select it via a
mixer, on alsa driver.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 4fde52bd7e97..89e13c599f8d 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -295,10 +295,19 @@ enum em28xx_amux { | |||
295 | EM28XX_AMUX_PCM_OUT, | 295 | EM28XX_AMUX_PCM_OUT, |
296 | }; | 296 | }; |
297 | 297 | ||
298 | enum em28xx_aout { | ||
299 | EM28XX_AOUT_MASTER = 0, /* should be the default */ | ||
300 | EM28XX_AOUT_LINE, | ||
301 | EM28XX_AOUT_MONO, | ||
302 | EM28XX_AOUT_LFE, | ||
303 | EM28XX_AOUT_SURR, | ||
304 | }; | ||
305 | |||
298 | struct em28xx_input { | 306 | struct em28xx_input { |
299 | enum enum28xx_itype type; | 307 | enum enum28xx_itype type; |
300 | unsigned int vmux; | 308 | unsigned int vmux; |
301 | enum em28xx_amux amux; | 309 | enum em28xx_amux amux; |
310 | enum em28xx_aout aout; | ||
302 | }; | 311 | }; |
303 | 312 | ||
304 | #define INPUT(nr) (&em28xx_boards[dev->model].input[nr]) | 313 | #define INPUT(nr) (&em28xx_boards[dev->model].input[nr]) |
@@ -450,6 +459,7 @@ struct em28xx { | |||
450 | int ctl_freq; /* selected frequency */ | 459 | int ctl_freq; /* selected frequency */ |
451 | unsigned int ctl_input; /* selected input */ | 460 | unsigned int ctl_input; /* selected input */ |
452 | unsigned int ctl_ainput;/* selected audio input */ | 461 | unsigned int ctl_ainput;/* selected audio input */ |
462 | unsigned int ctl_aoutput;/* selected audio output */ | ||
453 | int mute; | 463 | int mute; |
454 | int volume; | 464 | int volume; |
455 | /* frame properties */ | 465 | /* frame properties */ |