summaryrefslogtreecommitdiff
path: root/include/media/msp3400.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-03-19 18:35:57 +0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-24 22:26:57 +0300
commit2474ed444b475614ef795523076be7cc8437ae00 (patch)
tree87808b3c7ff145b63a638e6e42ffce9db7db1b8c /include/media/msp3400.h
parent49965a80a4c4f5cbe15fb3bb1f8f8b0ec4ef02bc (diff)
downloadlinux-2474ed444b475614ef795523076be7cc8437ae00.tar.xz
V4L/DVB (3582): Implement correct msp3400 input/output routing
- 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 <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/msp3400.h')
-rw-r--r--include/media/msp3400.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/media/msp3400.h b/include/media/msp3400.h
index 26e26585273f..0be61a021d45 100644
--- a/include/media/msp3400.h
+++ b/include/media/msp3400.h
@@ -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