A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

V4L/DVB (3582): Implement correct msp3400 input/output routing

Browse source 
- implement VIDIOC_INT_S_AUDIO_ROUTING for msp3400 and tvaudio
- use the new command in bttv, pvrusb2 and em28xx.
- remove the now obsolete MSP_SET_MATRIX from msp3400 (yeah!)
- remove the obsolete VIDIOC_S_AUDIO from msp3400.

Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
This commit is contained in:
Hans Verkuil 2006-03-19 12:35:57 -03:00 • committed by Mauro Carvalho Chehab
commit 2474ed444b
10 changed files with 181 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/media/msp3400.h
View file

@ -145,9 +145,14 @@
MSP_DSP_TO_SCART1(sc_i2s_src) | \
MSP_DSP_TO_SCART2(sc_i2s_src) | \
MSP_DSP_TO_I2S(sc_i2s_src))
#define MSP_INPUT_DEFAULT MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1, \
MSP_DSP_OUT_TUNER, MSP_DSP_OUT_TUNER)
#define MSP_OUTPUT(sc) \
(MSP_OUT_TO_SCART1(sc) | \
MSP_OUT_TO_SCART2(sc))
/* This equals the RESET position of the msp3400 ACB register */
#define MSP_OUTPUT_DEFAULT (MSP_OUT_TO_SCART1(MSP_OUT_SCART3) | \
MSP_OUT_TO_SCART2(MSP_OUT_SCART1_DA))
/* Tuner inputs vs. msp version */
/* Chip TUNER_1 TUNER_2

8
include/media/v4l2-common.h
View file

@ -123,14 +123,6 @@ enum v4l2_chip_ident {
/* v4l device was opened in Radio mode, to be replaced by VIDIOC_INT_S_TUNER_MODE */
#define AUDC_SET_RADIO _IO('d',88)
/* msp3400 ioctl: will be removed in the near future, to be replaced by
VIDIOC_INT_S_AUDIO_ROUTING. */
struct msp_matrix {
int input;
int output;
};
#define MSP_SET_MATRIX _IOW('m',17,struct msp_matrix)
/* tuner ioctls */
/* Sets tuner type and its I2C addr */