aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx2341x.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-06-21 16:04:13 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:05:23 -0400
commit45ad9f8b44b06bf1e91b4b3c338406c2233f0482 (patch)
treeb2cccb49543bcb7289d084a803c44354fcb64115 /drivers/media/video/cx2341x.c
parent54aa9a21ca03cf41d911ada969e86f27ce58bab9 (diff)
V4L/DVB (4202): allow selecting CX2341x port mode
CX2341X port was always set to 'memory', but 'streaming' is also possible ivtv uses the memory (DMA) interface with the CX2341X, while pvrusb2 and cx88-blackbird use the streaming interface. This setting is now selectable by the driver. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx2341x.c')
-rw-r--r--drivers/media/video/cx2341x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c
index 7cd1c4cf5aec..554813e6f65d 100644
--- a/drivers/media/video/cx2341x.c
+++ b/drivers/media/video/cx2341x.c
@@ -639,6 +639,7 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p)
639{ 639{
640 static struct cx2341x_mpeg_params default_params = { 640 static struct cx2341x_mpeg_params default_params = {
641 /* misc */ 641 /* misc */
642 .port = CX2341X_PORT_MEMORY,
642 .width = 720, 643 .width = 720,
643 .height = 480, 644 .height = 480,
644 .is_50hz = 0, 645 .is_50hz = 0,
@@ -714,7 +715,7 @@ int cx2341x_update(void *priv, cx2341x_mbox_func func,
714 715
715 int err = 0; 716 int err = 0;
716 717
717 cx2341x_api(priv, func, CX2341X_ENC_SET_OUTPUT_PORT, 1, 0); /* 0 = Memory */ 718 cx2341x_api(priv, func, CX2341X_ENC_SET_OUTPUT_PORT, 2, new->port, 0);
718 719
719 if (old == NULL || old->is_50hz != new->is_50hz) { 720 if (old == NULL || old->is_50hz != new->is_50hz) {
720 err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_RATE, 1, new->is_50hz); 721 err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_RATE, 1, new->is_50hz);