diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-01 16:03:23 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 03:56:11 -0400 |
| commit | 07151724a35e8e70f1aa64ce30a5a3f5c1ad49a3 (patch) | |
| tree | 49ad31b5f559bd43d05fc7d9ceff6135bdce8d98 /drivers/media/video/bt8xx | |
| parent | ab4cecf9c4e4a69cf2161f8a2424be14984430f8 (diff) | |
V4L/DVB (3702): Make msp3400 routing defines more consistent
Renamed various msp3400 routing defines to be more consistent and less
confusing. Esp. the MSP_DSP_OUT defines were confusing since it is really
a DSP input.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 692dc69f691d..423e954948be 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
| @@ -973,12 +973,12 @@ audio_mux(struct bttv *btv, int input, int mute) | |||
| 973 | For now this is sufficient. */ | 973 | For now this is sufficient. */ |
| 974 | switch (input) { | 974 | switch (input) { |
| 975 | case TVAUDIO_INPUT_RADIO: | 975 | case TVAUDIO_INPUT_RADIO: |
| 976 | route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1, | 976 | route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1, |
| 977 | MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART); | 977 | MSP_DSP_IN_SCART, MSP_DSP_IN_SCART); |
| 978 | break; | 978 | break; |
| 979 | case TVAUDIO_INPUT_EXTERN: | 979 | case TVAUDIO_INPUT_EXTERN: |
| 980 | route.input = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1, | 980 | route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, |
| 981 | MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART); | 981 | MSP_DSP_IN_SCART, MSP_DSP_IN_SCART); |
| 982 | break; | 982 | break; |
| 983 | case TVAUDIO_INPUT_INTERN: | 983 | case TVAUDIO_INPUT_INTERN: |
| 984 | /* Yes, this is the same input as for RADIO. I doubt | 984 | /* Yes, this is the same input as for RADIO. I doubt |
| @@ -986,8 +986,8 @@ audio_mux(struct bttv *btv, int input, int mute) | |||
| 986 | input is the BTTV_BOARD_AVERMEDIA98. I wonder how | 986 | input is the BTTV_BOARD_AVERMEDIA98. I wonder how |
| 987 | that was tested. My guess is that the whole INTERN | 987 | that was tested. My guess is that the whole INTERN |
| 988 | input does not work. */ | 988 | input does not work. */ |
| 989 | route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1, | 989 | route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1, |
| 990 | MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART); | 990 | MSP_DSP_IN_SCART, MSP_DSP_IN_SCART); |
| 991 | break; | 991 | break; |
| 992 | case TVAUDIO_INPUT_TUNER: | 992 | case TVAUDIO_INPUT_TUNER: |
| 993 | default: | 993 | default: |