diff options
| author | Steven Toth | 2008-08-05 02:38:46 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2008-10-12 13:36:49 +0200 |
| commit | 90a71b1c1ab003dd4524afca44c2ad2519f4420c (patch) | |
| tree | bc5852eaaaac7f9c81778ab95ee90333d552b69a /drivers/media/video/cx23885/cx23885-cards.c | |
| parent | V4L/DVB (8642): cx23885: Factor out common cx23885 tuner callback (diff) | |
| download | kernel-qcow2-linux-90a71b1c1ab003dd4524afca44c2ad2519f4420c.tar.gz kernel-qcow2-linux-90a71b1c1ab003dd4524afca44c2ad2519f4420c.tar.xz kernel-qcow2-linux-90a71b1c1ab003dd4524afca44c2ad2519f4420c.zip | |
V4L/DVB (8643): Switch Hauppauge HVR1400 and HVR1500 to common cx23885 tuner callback
The Hauppauge HVR1400 and HVR1500 can now use the common cx23885 tuner
callback.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-cards.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-cards.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c index e5e688e5e4b0..93ad7f8ce203 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c @@ -26,6 +26,7 @@ #include <media/cx25840.h> #include "cx23885.h" +#include "tuner-xc2028.h" /* ------------------------------------------------------------------ */ /* board config info */ @@ -331,8 +332,10 @@ static int cx23885_tuner_callback(struct cx23885_dev *dev, int port, } switch(dev->board) { + case CX23885_BOARD_HAUPPAUGE_HVR1400: + case CX23885_BOARD_HAUPPAUGE_HVR1500: case CX23885_BOARD_HAUPPAUGE_HVR1500Q: - /* Tuner Reset Command from xc5000 */ + /* Tuner Reset Command */ if (command == 0) bitmask = 0x04; break; @@ -367,6 +370,17 @@ int cx23885_xc5000_tuner_callback(void *priv, int command, int arg) return cx23885_tuner_callback(dev, bus->nr, command, arg); } +int cx23885_xc3028_tuner_callback(void *priv, int command, int arg) +{ + struct cx23885_tsport *port = priv; + struct cx23885_dev *dev = port->dev; + + if (command == XC2028_RESET_CLK) + return 0; + + return cx23885_tuner_callback(dev, port->nr, command, arg); +} + void cx23885_gpio_setup(struct cx23885_dev *dev) { switch(dev->board) { |