diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-06-21 22:04:13 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-06-21 22:04:13 +0200 |
| commit | c3c161df40114ed8f7c0a3bebd385c173919de18 (patch) | |
| tree | 09179260d43e449a02a610132e4cddcb745c0d7d /linux/drivers | |
| parent | 71f2bbd7d30a3c7ea2e220dd61e37e4e05f56b95 (diff) | |
| download | mediapointer-dvb-s2-c3c161df40114ed8f7c0a3bebd385c173919de18.tar.gz mediapointer-dvb-s2-c3c161df40114ed8f7c0a3bebd385c173919de18.tar.bz2 | |
CX2341X port was always set to 'memory', but 'streaming' is also possible
From: Hans Verkuil <hverkuil@xs4all.nl>
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>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cx2341x.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx2341x.c b/linux/drivers/media/video/cx2341x.c index 33e955f7c..29a5c8e5c 100644 --- a/linux/drivers/media/video/cx2341x.c +++ b/linux/drivers/media/video/cx2341x.c @@ -643,6 +643,7 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p) { static struct cx2341x_mpeg_params default_params = { /* misc */ + .port = CX2341X_PORT_MEMORY, .width = 720, .height = 480, .is_50hz = 0, @@ -718,7 +719,7 @@ int cx2341x_update(void *priv, cx2341x_mbox_func func, int err = 0; - cx2341x_api(priv, func, CX2341X_ENC_SET_OUTPUT_PORT, 1, 0); /* 0 = Memory */ + cx2341x_api(priv, func, CX2341X_ENC_SET_OUTPUT_PORT, 2, new->port, 0); if (old == NULL || old->is_50hz != new->is_50hz) { err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_RATE, 1, new->is_50hz); diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index 1a86d337f..d6d19a71e 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1076,6 +1076,7 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, dev->width = 720; dev->height = 576; cx2341x_fill_defaults(&dev->params); + dev->params.port = CX2341X_PORT_STREAMING; switch (core->board) { case CX88_BOARD_HAUPPAUGE_ROSLYN: |