diff options
| author | Michael Hunold <devnull@localhost> | 2003-01-13 10:15:06 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-01-13 10:15:06 +0000 |
| commit | c7314221f7c3eee1de6ebad0e371547d2608348e (patch) | |
| tree | 3ec5151ae4f4c5c76718e304affd990f7db19199 /linux | |
| parent | fc5c5844077c7478f7d0b67a1a7967f79d9376ba (diff) | |
| download | mediapointer-dvb-s2-c7314221f7c3eee1de6ebad0e371547d2608348e.tar.gz mediapointer-dvb-s2-c7314221f7c3eee1de6ebad0e371547d2608348e.tar.bz2 | |
Add NTSC mode back to av7110 driver.
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 24ff9d7ba..42fd26107 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -4377,7 +4377,7 @@ static struct saa7146_standard standard[] = { { "PAL", V4L2_STD_PAL, 0x15, 288, 576, 0x4a, 708, 709, 576, 768 }, // { "PAL", V4L2_STD_PAL, 0x15, 288, 576, 0x3a, 720, 721, 576, 768 }, -/* FIXME: more to come here */ + { "NTSC", V4L2_STD_NTSC, 0x10, 244, 480, 0x40, 708, 709, 480, 640 }, }; static @@ -4487,6 +4487,29 @@ struct pci_device_id pci_tbl[] = { } }; +static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std) +{ + av7110_t *av7110 = (av7110_t*)dev->ext_priv; + printk("std_callback\n"); + switch( std->id ) { + case V4L2_STD_PAL: { + av7110->vidmode = VIDEO_MODE_PAL; + SetMode(av7110, av7110->vidmode); + break; + } + case V4L2_STD_NTSC: { + av7110->vidmode = VIDEO_MODE_NTSC; + SetMode(av7110, av7110->vidmode); + break; + } + default: { + return -1; + } + } + return 0; +} + + static struct saa7146_ext_vv av7110_vv_data = { .inputs = 1, @@ -4496,7 +4519,7 @@ struct saa7146_ext_vv av7110_vv_data = { .stds = &standard[0], .num_stds = sizeof(standard)/sizeof(struct saa7146_standard), - .std_callback = NULL, + .std_callback = &std_callback, .ioctls = &ioctls[0], .ioctl = av7110_ioctl, |