diff options
| author | Michael Hunold <devnull@localhost> | 2003-07-16 07:24:27 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-07-16 07:24:27 +0000 |
| commit | 7f3701fc616562f067ad81bf592c30ec93eebc9d (patch) | |
| tree | b5c3cd2594022fbef84f55a538e45eee3380d8ee | |
| parent | 30fc1765bec73a3e808041aaf0a81b78eb870c01 (diff) | |
| download | mediapointer-dvb-s2-7f3701fc616562f067ad81bf592c30ec93eebc9d.tar.gz mediapointer-dvb-s2-7f3701fc616562f067ad81bf592c30ec93eebc9d.tar.bz2 | |
- Use c99 initializers
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 59 |
1 files changed, 50 insertions, 9 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 2a6f2be9e..06465be8d 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -2609,8 +2609,23 @@ void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, ****************************************************************************/ static struct v4l2_input inputs[2] = { - { 0, "DVB", V4L2_INPUT_TYPE_CAMERA, 1, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 }, - { 1, "ANALOG", V4L2_INPUT_TYPE_TUNER, 2, 1, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 }, + { + .index = 0, + .name = "DVB", + .type = V4L2_INPUT_TYPE_CAMERA, + .audioset = 1, + .tuner = 0, /* ignored */ + .std = V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, + .status = 0, + }, { + .index = 1, + .name = "ANALOG", + .type = V4L2_INPUT_TYPE_TUNER, + .audioset = 2, + .tuner = 0, + .std = V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, + .status = 0, + } }; /* taken from ves1820.c */ @@ -4630,19 +4645,45 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr) /* FIXME: these values are experimental values that look better than the values from the latest "official" driver -- at least for me... (MiHu) */ 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 }, - { "NTSC", V4L2_STD_NTSC, 0x10, 244, 480, 0x40, 708, 709, 480, 640 }, + { + .name = "PAL", .id = V4L2_STD_PAL_BG, + .v_offset = 0x15, .v_field = 288, .v_calc = 576, + .h_offset = 0x4a, .h_pixels = 708, .h_calc = 709, + .v_max_out = 576, .h_max_out = 768, + }, { + .name = "NTSC", .id = V4L2_STD_NTSC, + .v_offset = 0x10, .v_field = 244, .v_calc = 480, + .h_offset = 0x40, .h_pixels = 708, .h_calc = 709, + .v_max_out = 480, .h_max_out = 640, + } }; static struct saa7146_standard analog_standard[] = { - { "PAL", V4L2_STD_PAL, 0x18, 288, 576, 0x08, 708, 709, 576, 768 }, - { "NTSC", V4L2_STD_NTSC, 0x10, 244, 480, 0x40, 708, 709, 480, 640 }, + { + .name = "PAL", .id = V4L2_STD_PAL_BG, + .v_offset = 0x18, .v_field = 288, .v_calc = 576, + .h_offset = 0x08, .h_pixels = 708, .h_calc = 709, + .v_max_out = 576, .h_max_out = 768, + }, { + .name = "NTSC", .id = V4L2_STD_NTSC, + .v_offset = 0x10, .v_field = 244, .v_calc = 480, + .h_offset = 0x40, .h_pixels = 708, .h_calc = 709, + .v_max_out = 480, .h_max_out = 640, + } }; static struct saa7146_standard dvb_standard[] = { - { "PAL", V4L2_STD_PAL, 0x14, 288, 576, 0x4a, 708, 709, 576, 768 }, - { "NTSC", V4L2_STD_NTSC, 0x10, 244, 480, 0x40, 708, 709, 480, 640 }, + { + .name = "PAL", .id = V4L2_STD_PAL_BG, + .v_offset = 0x14, .v_field = 288, .v_calc = 576, + .h_offset = 0x4a, .h_pixels = 708, .h_calc = 709, + .v_max_out = 576, .h_max_out = 768, + }, { + .name = "NTSC", .id = V4L2_STD_NTSC, + .v_offset = 0x10, .v_field = 244, .v_calc = 480, + .h_offset = 0x40, .h_pixels = 708, .h_calc = 709, + .v_max_out = 480, .h_max_out = 640, + } }; static struct saa7146_extension av7110_extension; |