summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorMichael Hunold <devnull@localhost>2003-05-27 08:42:57 +0000
committerMichael Hunold <devnull@localhost>2003-05-27 08:42:57 +0000
commitf2cf1ceacd9087ad8fedb426cb15bfc7ba60c6fd (patch)
treeb88031bcda5cf147bcef635a8634ef65c230e472 /linux/drivers/media/dvb
parentad0373531b89bbe79715e18bc36f7660d1f2b882 (diff)
downloadmediapointer-dvb-s2-f2cf1ceacd9087ad8fedb426cb15bfc7ba60c6fd.tar.gz
mediapointer-dvb-s2-f2cf1ceacd9087ad8fedb426cb15bfc7ba60c6fd.tar.bz2
Use C99 initializers.
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/frontends/alps_bsrv2.c30
-rw-r--r--linux/drivers/media/dvb/frontends/alps_tdlb7.c32
-rw-r--r--linux/drivers/media/dvb/frontends/alps_tdmb7.c32
-rw-r--r--linux/drivers/media/dvb/frontends/at76c651.c8
-rw-r--r--linux/drivers/media/dvb/frontends/dvb_dummy_fe.c62
-rw-r--r--linux/drivers/media/dvb/frontends/grundig_29504-401.c32
-rw-r--r--linux/drivers/media/dvb/frontends/grundig_29504-491.c30
-rw-r--r--linux/drivers/media/dvb/frontends/nxt6000.c12
-rw-r--r--linux/drivers/media/dvb/frontends/stv0299.c54
-rw-r--r--linux/drivers/media/dvb/frontends/ves1820.c20
10 files changed, 156 insertions, 156 deletions
diff --git a/linux/drivers/media/dvb/frontends/alps_bsrv2.c b/linux/drivers/media/dvb/frontends/alps_bsrv2.c
index 5557e4014..2d540742e 100644
--- a/linux/drivers/media/dvb/frontends/alps_bsrv2.c
+++ b/linux/drivers/media/dvb/frontends/alps_bsrv2.c
@@ -35,17 +35,17 @@ static int debug = 0;
static
struct dvb_frontend_info bsrv2_info = {
- name: "Alps BSRV2",
- type: FE_QPSK,
- frequency_min: 950000,
- frequency_max: 2150000,
- frequency_stepsize: 250, /* kHz for QPSK frontends */
- frequency_tolerance: 29500,
- symbol_rate_min: 1000000,
- symbol_rate_max: 45000000,
-/* symbol_rate_tolerance: ???,*/
- notifier_delay: 50, /* 1/20 s */
- caps: FE_CAN_INVERSION_AUTO |
+ .name = "Alps BSRV2",
+ .type = FE_QPSK,
+ .frequency_min = 950000,
+ .frequency_max = 2150000,
+ .frequency_stepsize = 250, /* kHz for QPSK frontends */
+ .frequency_tolerance = 29500,
+ .symbol_rate_min = 1000000,
+ .symbol_rate_max = 45000000,
+/* . symbol_rate_tolerance = ???,*/
+ .notifier_delay = 50, /* 1/20 s */
+ .caps = FE_CAN_INVERSION_AUTO |
FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
FE_CAN_QPSK
@@ -79,7 +79,7 @@ static
int ves1893_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
u8 buf [] = { 0x00, reg, data };
- struct i2c_msg msg = { addr: 0x08, flags: 0, buf: buf, len: 3 };
+ struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = buf, .len = 3 };
int err;
if ((err = i2c->xfer (i2c, &msg, 1)) != 1) {
@@ -97,8 +97,8 @@ u8 ves1893_readreg (struct dvb_i2c_bus *i2c, u8 reg)
int ret;
u8 b0 [] = { 0x00, reg };
u8 b1 [] = { 0 };
- struct i2c_msg msg [] = { { addr: 0x08, flags: 0, buf: b0, len: 2 },
- { addr: 0x08, flags: I2C_M_RD, buf: b1, len: 1 } };
+ struct i2c_msg msg [] = { { .addr = 0x08, .flags = 0, .buf = b0, .len = 2 },
+ { .addr = 0x08, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
ret = i2c->xfer (i2c, msg, 2);
@@ -113,7 +113,7 @@ static
int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
int ret;
- struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+ struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
ret = i2c->xfer (i2c, &msg, 1);
diff --git a/linux/drivers/media/dvb/frontends/alps_tdlb7.c b/linux/drivers/media/dvb/frontends/alps_tdlb7.c
index 40640300c..45677c1e8 100644
--- a/linux/drivers/media/dvb/frontends/alps_tdlb7.c
+++ b/linux/drivers/media/dvb/frontends/alps_tdlb7.c
@@ -72,19 +72,19 @@ static int errno;
static
struct dvb_frontend_info tdlb7_info = {
- name: "Alps TDLB7",
- type: FE_OFDM,
- frequency_min: 470000000,
- frequency_max: 860000000,
- frequency_stepsize: 166666,
+ .name = "Alps TDLB7",
+ .type = FE_OFDM,
+ .frequency_min = 470000000,
+ .frequency_max = 860000000,
+ .frequency_stepsize = 166666,
#if 0
- frequency_tolerance: ???,
- symbol_rate_min: ???,
- symbol_rate_max: ???,
- symbol_rate_tolerance: ???,
- notifier_delay: 0,
+ .frequency_tolerance = ???,
+ .symbol_rate_min = ???,
+ .symbol_rate_max = ???,
+ .symbol_rate_tolerance = ???,
+ .notifier_delay = 0,
#endif
- caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64
};
@@ -94,7 +94,7 @@ static
int sp8870_writereg (struct dvb_i2c_bus *i2c, u16 reg, u16 data)
{
u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
- struct i2c_msg msg = { addr: 0x71, flags: 0, buf: buf, len: 4 };
+ struct i2c_msg msg = { .addr = 0x71, .flags = 0, .buf = buf, .len = 4 };
int err;
if ((err = i2c->xfer (i2c, &msg, 1)) != 1) {
@@ -112,8 +112,8 @@ u16 sp8870_readreg (struct dvb_i2c_bus *i2c, u16 reg)
int ret;
u8 b0 [] = { reg >> 8 , reg & 0xff };
u8 b1 [] = { 0, 0 };
- struct i2c_msg msg [] = { { addr: 0x71, flags: 0, buf: b0, len: 2 },
- { addr: 0x71, flags: I2C_M_RD, buf: b1, len: 2 } };
+ struct i2c_msg msg [] = { { .addr = 0x71, .flags = 0, .buf = b0, .len = 2 },
+ { .addr = 0x71, .flags = I2C_M_RD, .buf = b1, .len = 2 } };
ret = i2c->xfer (i2c, msg, 2);
@@ -128,7 +128,7 @@ static
int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
int ret;
- struct i2c_msg msg = { addr: 0x60, flags: 0, buf: data, len: 4 };
+ struct i2c_msg msg = { .addr = 0x60, .flags = 0, .buf = data, .len = 4 };
ret = i2c->xfer (i2c, &msg, 1);
@@ -419,7 +419,7 @@ static
int tdlb7_attach (struct dvb_i2c_bus *i2c)
{
- struct i2c_msg msg = { addr: 0x71, flags: 0, buf: NULL, len: 0 };
+ struct i2c_msg msg = { .addr = 0x71, .flags = 0, .buf = NULL, .len = 0 };
dprintk ("%s\n", __FUNCTION__);
diff --git a/linux/drivers/media/dvb/frontends/alps_tdmb7.c b/linux/drivers/media/dvb/frontends/alps_tdmb7.c
index 45b96ba4e..f44db8e20 100644
--- a/linux/drivers/media/dvb/frontends/alps_tdmb7.c
+++ b/linux/drivers/media/dvb/frontends/alps_tdmb7.c
@@ -37,19 +37,19 @@ static int debug = 0;
static
struct dvb_frontend_info tdmb7_info = {
- name: "Alps TDMB7",
- type: FE_OFDM,
- frequency_min: 470000000,
- frequency_max: 860000000,
- frequency_stepsize: 166667,
+ .name = "Alps TDMB7",
+ .type = FE_OFDM,
+ .frequency_min = 470000000,
+ .frequency_max = 860000000,
+ .frequency_stepsize = 166667,
#if 0
- frequency_tolerance: ???,
- symbol_rate_min: ???,
- symbol_rate_max: ???,
- symbol_rate_tolerance: 500, /* ppm */
- notifier_delay: 0,
+ .frequency_tolerance = ???,
+ .symbol_rate_min = ???,
+ .symbol_rate_max = ???,
+ .symbol_rate_tolerance = 500, /* ppm */
+ .notifier_delay = 0,
#endif
- caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
FE_CAN_CLEAN_SETUP | FE_CAN_RECOVER
@@ -84,7 +84,7 @@ int cx22700_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
- struct i2c_msg msg = { addr: 0x43, flags: 0, buf: buf, len: 2 };
+ struct i2c_msg msg = { .addr = 0x43, .flags = 0, .buf = buf, .len = 2 };
dprintk ("%s\n", __FUNCTION__);
@@ -104,8 +104,8 @@ u8 cx22700_readreg (struct dvb_i2c_bus *i2c, u8 reg)
int ret;
u8 b0 [] = { reg };
u8 b1 [] = { 0 };
- struct i2c_msg msg [] = { { addr: 0x43, flags: 0, buf: b0, len: 1 },
- { addr: 0x43, flags: I2C_M_RD, buf: b1, len: 1 } };
+ struct i2c_msg msg [] = { { .addr = 0x43, .flags = 0, .buf = b0, .len = 1 },
+ { .addr = 0x43, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
dprintk ("%s\n", __FUNCTION__);
@@ -121,7 +121,7 @@ u8 cx22700_readreg (struct dvb_i2c_bus *i2c, u8 reg)
static
int pll_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
- struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+ struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
int ret;
cx22700_writereg (i2c, 0x0a, 0x00); /* open i2c bus switch */
@@ -417,7 +417,7 @@ int tdmb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static
int tdmb7_attach (struct dvb_i2c_bus *i2c)
{
- struct i2c_msg msg = { addr: 0x43, flags: 0, buf: NULL, len: 0 };
+ struct i2c_msg msg = { .addr = 0x43, .flags = 0, .buf = NULL,. len = 0 };
dprintk ("%s\n", __FUNCTION__);
diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c
index 0e4647bc5..bd2a29599 100644
--- a/linux/drivers/media/dvb/frontends/at76c651.c
+++ b/linux/drivers/media/dvb/frontends/at76c651.c
@@ -96,7 +96,7 @@ at76c651_writereg(struct dvb_i2c_bus *i2c, u8 reg, u8 data)
int ret;
u8 buf[] = { reg, data };
- struct i2c_msg msg = { addr:0x1a >> 1, flags:0, buf:buf, len:2 };
+ struct i2c_msg msg = { .addr = 0x1a >> 1, .flags = 0, .buf = buf, .len = 2 };
ret = i2c->xfer(i2c, &msg, 1);
@@ -118,8 +118,8 @@ at76c651_readreg(struct dvb_i2c_bus *i2c, u8 reg)
int ret;
u8 b0[] = { reg };
u8 b1[] = { 0 };
- struct i2c_msg msg[] = { {addr: 0x1a >> 1, flags: 0, buf: b0, len:1},
- {addr: 0x1a >> 1, flags: I2C_M_RD, buf: b1, len:1} };
+ struct i2c_msg msg[] = { {.addr = 0x1a >> 1, .flags = 0, .buf = b0, .len = 1},
+ {.addr = 0x1a >> 1, .flags = I2C_M_RD, .buf = b1, .len = 1} };
ret = i2c->xfer(i2c, msg, 2);
@@ -194,7 +194,7 @@ dat7021_write(struct dvb_i2c_bus *i2c, u32 tw)
int ret;
struct i2c_msg msg =
- { addr:0xc2 >> 1, flags:0, buf:(u8 *) & tw, len:sizeof (tw) };
+ { .addr = 0xc2 >> 1, .flags = 0, .buf = (u8 *) & tw, .len = sizeof (tw) };
at76c651_switch_tuner_i2c(i2c, 1);
diff --git a/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c b/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c
index a5ef8d830..984e089ce 100644
--- a/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -32,17 +32,17 @@ static int sct = 0;
static
struct dvb_frontend_info dvb_s_dummyfe_info = {
- name: "DVB-S dummy frontend",
- type: FE_QPSK,
- frequency_min: 950000,
- frequency_max: 2150000,
- frequency_stepsize: 250, /* kHz for QPSK frontends */
- frequency_tolerance: 29500,
- symbol_rate_min: 1000000,
- symbol_rate_max: 45000000,
-/* symbol_rate_tolerance: ???,*/
- notifier_delay: 50, /* 1/20 s */
- caps: FE_CAN_INVERSION_AUTO |
+ .name = "DVB-S dummy frontend",
+ .type = FE_QPSK,
+ .frequency_min = 950000,
+ .frequency_max = 2150000,
+ .frequency_stepsize = 250, /* kHz for QPSK frontends */
+ .frequency_tolerance = 29500,
+ .symbol_rate_min = 1000000,
+ .symbol_rate_max = 45000000,
+/* .symbol_rate_tolerance = ???,*/
+ .notifier_delay = 50, /* 1/20 s */
+ .caps = FE_CAN_INVERSION_AUTO |
FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
FE_CAN_QPSK
@@ -50,17 +50,17 @@ struct dvb_frontend_info dvb_s_dummyfe_info = {
static
struct dvb_frontend_info dvb_c_dummyfe_info = {
- .name = "DVB-C dummy frontend",
- .type = FE_QAM,
- .frequency_stepsize = 62500,
- .frequency_min = 51000000,
- .frequency_max = 858000000,
- .symbol_rate_min = (57840000/2)/64, /* SACLK/64 == (XIN/2)/64 */
- .symbol_rate_max = (57840000/2)/4, /* SACLK/4 */
+ .name = "DVB-C dummy frontend",
+ .type = FE_QAM,
+ .frequency_stepsize = 62500,
+ .frequency_min = 51000000,
+ .frequency_max = 858000000,
+ .symbol_rate_min = (57840000/2)/64, /* SACLK/64 == (XIN/2)/64 */
+ .symbol_rate_max = (57840000/2)/4, /* SACLK/4 */
#if 0
- frequency_tolerance: ???,
- symbol_rate_tolerance: ???, /* ppm */ /* == 8% (spec p. 5) */
- notifier_delay: ?,
+ .frequency_tolerance = ???,
+ .symbol_rate_tolerance = ???, /* ppm */ /* == 8% (spec p. 5) */
+ .notifier_delay = ?,
#endif
.caps = FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |
FE_CAN_QAM_128 | FE_CAN_QAM_256 |
@@ -69,16 +69,16 @@ struct dvb_frontend_info dvb_c_dummyfe_info = {
};
static struct dvb_frontend_info dvb_t_dummyfe_info = {
- .name = "DVB-T dummy frontend",
- .type = FE_OFDM,
- .frequency_min = 0,
- .frequency_max = 863250000,
- .frequency_stepsize = 62500,
- /*.frequency_tolerance = */ /* FIXME: 12% of SR */
- .symbol_rate_min = 0, /* FIXME */
- .symbol_rate_max = 9360000, /* FIXME */
- .symbol_rate_tolerance = 4000,
- .notifier_delay = 0,
+ .name = "DVB-T dummy frontend",
+ .type = FE_OFDM,
+ .frequency_min = 0,
+ .frequency_max = 863250000,
+ .frequency_stepsize = 62500,
+ /*.frequency_tolerance = */ /* FIXME: 12% of SR */
+ .symbol_rate_min = 0, /* FIXME */
+ .symbol_rate_max = 9360000, /* FIXME */
+ .symbol_rate_tolerance = 4000,
+ .notifier_delay = 0,
.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-401.c b/linux/drivers/media/dvb/frontends/grundig_29504-401.c
index 0c3cb3316..bb4338434 100644
--- a/linux/drivers/media/dvb/frontends/grundig_29504-401.c
+++ b/linux/drivers/media/dvb/frontends/grundig_29504-401.c
@@ -38,15 +38,15 @@ static int debug = 0;
struct dvb_frontend_info grundig_29504_401_info = {
- name: "Grundig 29504-401",
- type: FE_OFDM,
-/* frequency_min: ???,*/
-/* frequency_max: ???,*/
- frequency_stepsize: 166666,
-/* frequency_tolerance: ???,*/
-/* symbol_rate_tolerance: ???,*/
- notifier_delay: 0,
- caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ .name = "Grundig 29504-401",
+ .type = FE_OFDM,
+/* .frequency_min = ???,*/
+/* .frequency_max = ???,*/
+ .frequency_stepsize = 166666,
+/* .frequency_tolerance = ???,*/
+/* .symbol_rate_tolerance = ???,*/
+ .notifier_delay = 0,
+ .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
FE_CAN_MUTE_TS /*| FE_CAN_CLEAN_SETUP*/
@@ -58,7 +58,7 @@ int l64781_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
- struct i2c_msg msg = { addr: 0x55, flags: 0, buf: buf, len: 2 };
+ struct i2c_msg msg = { .addr = 0x55, .flags = 0, .buf = buf, .len = 2 };
if ((ret = i2c->xfer (i2c, &msg, 1)) != 1)
dprintk ("%s: write_reg error (reg == %02x) = %02x!\n",
@@ -74,8 +74,8 @@ u8 l64781_readreg (struct dvb_i2c_bus *i2c, u8 reg)
int ret;
u8 b0 [] = { reg };
u8 b1 [] = { 0 };
- struct i2c_msg msg [] = { { addr: 0x55, flags: 0, buf: b0, len: 1 },
- { addr: 0x55, flags: I2C_M_RD, buf: b1, len: 1 } };
+ struct i2c_msg msg [] = { { .addr = 0x55, .flags = 0, .buf = b0, .len = 1 },
+ { .addr = 0x55, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
ret = i2c->xfer (i2c, msg, 2);
@@ -90,7 +90,7 @@ static
int tsa5060_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
int ret;
- struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+ struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
if ((ret = i2c->xfer (i2c, &msg, 1)) != 1)
dprintk ("%s: write_reg error == %02x!\n", __FUNCTION__, ret);
@@ -280,7 +280,7 @@ static
void reset_and_configure (struct dvb_i2c_bus *i2c)
{
u8 buf [] = { 0x06 };
- struct i2c_msg msg = { addr: 0x00, flags: 0, buf: buf, len: 1 };
+ struct i2c_msg msg = { .addr = 0x00, .flags = 0, .buf = buf, .len = 1 };
i2c->xfer (i2c, &msg, 1);
}
@@ -431,8 +431,8 @@ int l64781_attach (struct dvb_i2c_bus *i2c)
{
u8 b0 [] = { 0x1a };
u8 b1 [] = { 0x00 };
- struct i2c_msg msg [] = { { addr: 0x55, flags: 0, buf: b0, len: 1 },
- { addr: 0x55, flags: I2C_M_RD, buf: b1, len: 1 } };
+ struct i2c_msg msg [] = { { .addr = 0x55, .flags = 0, .buf = b0, .len = 1 },
+ { .addr = 0x55, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
if (i2c->xfer (i2c, msg, 2) == 2) /* probably an EEPROM... */
return -ENODEV;
diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-491.c b/linux/drivers/media/dvb/frontends/grundig_29504-491.c
index 313782339..88307b702 100644
--- a/linux/drivers/media/dvb/frontends/grundig_29504-491.c
+++ b/linux/drivers/media/dvb/frontends/grundig_29504-491.c
@@ -40,17 +40,17 @@ static int debug = 0;
static
struct dvb_frontend_info grundig_29504_491_info = {
- name: "Grundig 29504-491, (TDA8083 based)",
- type: FE_QPSK,
- frequency_min: 950000, /* FIXME: guessed! */
- frequency_max: 1400000, /* FIXME: guessed! */
- frequency_stepsize: 125, /* kHz for QPSK frontends */
-/* frequency_tolerance: ???,*/
- symbol_rate_min: 1000000, /* FIXME: guessed! */
- symbol_rate_max: 45000000, /* FIXME: guessed! */
-/* symbol_rate_tolerance: ???,*/
- notifier_delay: 0,
- caps: FE_CAN_INVERSION_AUTO |
+ .name = "Grundig 29504-491, (TDA8083 based)",
+ .type = FE_QPSK,
+ .frequency_min = 950000, /* FIXME: guessed! */
+ .frequency_max = 1400000, /* FIXME: guessed! */
+ .frequency_stepsize = 125, /* kHz for QPSK frontends */
+/* .frequency_tolerance = ???,*/
+ .symbol_rate_min = 1000000, /* FIXME: guessed! */
+ .symbol_rate_max = 45000000, /* FIXME: guessed! */
+/* .symbol_rate_tolerance = ???,*/
+ .notifier_delay = 0,
+ .caps = FE_CAN_INVERSION_AUTO |
FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
@@ -77,7 +77,7 @@ int tda8083_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
- struct i2c_msg msg = { addr: 0x68, flags: 0, buf: buf, len: 2 };
+ struct i2c_msg msg = { .addr = 0x68, .flags = 0, .buf = buf, .len = 2 };
ret = i2c->xfer (i2c, &msg, 1);
@@ -93,8 +93,8 @@ static
int tda8083_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
{
int ret;
- struct i2c_msg msg [] = { { addr: 0x68, flags: 0, buf: &reg1, len: 1 },
- { addr: 0x68, flags: I2C_M_RD, buf: b, len: len } };
+ struct i2c_msg msg [] = { { .addr = 0x68, .flags = 0, .buf = &reg1, .len = 1 },
+ { .addr = 0x68, .flags = I2C_M_RD, .buf = b, .len = len } };
ret = i2c->xfer (i2c, msg, 2);
@@ -121,7 +121,7 @@ static
int tsa5522_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
int ret;
- struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+ struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
ret = i2c->xfer (i2c, &msg, 1);
diff --git a/linux/drivers/media/dvb/frontends/nxt6000.c b/linux/drivers/media/dvb/frontends/nxt6000.c
index d377c224f..39453abc9 100644
--- a/linux/drivers/media/dvb/frontends/nxt6000.c
+++ b/linux/drivers/media/dvb/frontends/nxt6000.c
@@ -89,11 +89,11 @@ static int nxt6000_write(struct dvb_i2c_bus *i2c, u8 addr, u8 reg, u8 data)
{
u8 buf[] = {reg, data};
- struct i2c_msg msg = {addr: addr >> 1, flags: 0, buf: buf, len: 2};
+ struct i2c_msg msg = {.addr = addr >> 1, .flags = 0, .buf = buf, .len = 2};
int ret;
if ((ret = i2c->xfer(i2c, &msg, 1)) != 1)
- dprintk("nxt6000: nxt6000_write error (addr: 0x%02X, reg: 0x%02X, data: 0x%02X, ret: %d)\n", addr, reg, data, ret);
+ dprintk("nxt6000: nxt6000_write error (.addr = 0x%02X, reg: 0x%02X, data: 0x%02X, ret: %d)\n", addr, reg, data, ret);
return (ret != 1) ? -EFAULT : 0;
@@ -114,13 +114,13 @@ static u8 nxt6000_read(struct dvb_i2c_bus *i2c, u8 addr, u8 reg)
int ret;
u8 b0[] = {reg};
u8 b1[] = {0};
- struct i2c_msg msgs[] = {{addr: addr >> 1, flags: 0, buf: b0, len: 1},
- {addr: addr >> 1, flags: I2C_M_RD, buf: b1, len: 1}};
+ struct i2c_msg msgs[] = {{.addr = addr >> 1, .flags = 0, .buf = b0, .len = 1},
+ {.addr = addr >> 1, .flags = I2C_M_RD, .buf = b1, .len = 1}};
ret = i2c->xfer(i2c, msgs, 2);
if (ret != 2)
- dprintk("nxt6000: nxt6000_read error (addr: 0x%02X, reg: 0x%02X, ret: %d)\n", addr, reg, ret);
+ dprintk("nxt6000: nxt6000_read error (.addr = 0x%02X, reg: 0x%02X, ret: %d)\n", addr, reg, ret);
return b1[0];
@@ -138,7 +138,7 @@ static u8 nxt6000_readreg(struct dvb_frontend *fe, u8 reg)
static int pll_write(struct dvb_i2c_bus *i2c, u8 demod_addr, u8 tuner_addr, u8 *buf, u8 len)
{
- struct i2c_msg msg = {addr: tuner_addr >> 1, flags: 0, buf: buf, len: len};
+ struct i2c_msg msg = {.addr = tuner_addr >> 1, .flags = 0, .buf = buf, .len = len};
int ret;
nxt6000_write(i2c, demod_addr, ENABLE_TUNER_IIC, 0x01); /* open i2c bus switch */
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c
index f3868ead7..0ebcb8fc1 100644
--- a/linux/drivers/media/dvb/frontends/stv0299.c
+++ b/linux/drivers/media/dvb/frontends/stv0299.c
@@ -63,17 +63,17 @@
static
struct dvb_frontend_info uni0299_info = {
- name: "STV0299/TSA5059/SL1935 based",
- type: FE_QPSK,
- frequency_min: 950000,
- frequency_max: 2150000,
- frequency_stepsize: 125, /* kHz for QPSK frontends */
- frequency_tolerance: M_CLK/2000,
- symbol_rate_min: 1000000,
- symbol_rate_max: 45000000,
- symbol_rate_tolerance: 500, /* ppm */
- notifier_delay: 0,
- caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ .name = "STV0299/TSA5059/SL1935 based",
+ .type = FE_QPSK,
+ .frequency_min = 950000,
+ .frequency_max = 2150000,
+ .frequency_stepsize = 125, /* kHz for QPSK frontends */
+ .frequency_tolerance = M_CLK/2000,
+ .symbol_rate_min = 1000000,
+ .symbol_rate_max = 45000000,
+ .symbol_rate_tolerance = 500, /* ppm */
+ .notifier_delay = 0,
+ .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
FE_CAN_QPSK |
FE_CAN_FEC_AUTO | FE_CAN_INVERSION_AUTO |
@@ -150,7 +150,7 @@ int stv0299_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
- struct i2c_msg msg = { addr: 0x68, flags: 0, buf: buf, len: 2 };
+ struct i2c_msg msg = { .addr = 0x68, .flags = 0, .buf = buf, .len = 2 };
ret = i2c->xfer (i2c, &msg, 1);
@@ -168,8 +168,8 @@ u8 stv0299_readreg (struct dvb_i2c_bus *i2c, u8 reg)
int ret;
u8 b0 [] = { reg };
u8 b1 [] = { 0 };
- struct i2c_msg msg [] = { { addr: 0x68, flags: 0, buf: b0, len: 1 },
- { addr: 0x68, flags: I2C_M_RD, buf: b1, len: 1 } };
+ struct i2c_msg msg [] = { { .addr = 0x68, .flags = 0, .buf = b0, .len = 1 },
+ { .addr = 0x68, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
ret = i2c->xfer (i2c, msg, 2);
@@ -184,8 +184,8 @@ static
int stv0299_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
{
int ret;
- struct i2c_msg msg [] = { { addr: 0x68, flags: 0, buf: &reg1, len: 1 },
- { addr: 0x68, flags: I2C_M_RD, buf: b, len: len } };
+ struct i2c_msg msg [] = { { .addr = 0x68, .flags = 0, .buf = &reg1, .len = 1 },
+ { .addr = 0x68, .flags = I2C_M_RD, .buf = b, .len = len } };
ret = i2c->xfer (i2c, msg, 2);
@@ -202,9 +202,9 @@ int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len)
int ret;
u8 rpt1 [] = { 0x05, 0xb5 }; /* enable i2c repeater on stv0299 */
u8 rpt2 [] = { 0x05, 0x35 }; /* disable i2c repeater on stv0299 */
- struct i2c_msg msg [] = {{ addr: 0x68, flags: 0, buf: rpt1, len: 2 },
- { addr: addr, flags: 0, buf: data, len: len },
- { addr: 0x68, flags: 0, buf: rpt2, len: 2 }};
+ struct i2c_msg msg [] = {{ .addr = 0x68, .flags = 0, .buf = rpt1, .len = 2 },
+ { addr: addr, .flags = 0, .buf = data, .len = len },
+ { .addr = 0x68, .flags = 0, .buf = rpt2, .len = 2 }};
ret = i2c->xfer (i2c, msg, 3);
@@ -412,8 +412,8 @@ int tsa5059_read_status (struct dvb_i2c_bus *i2c)
u8 rpt1 [] = { 0x05, 0xb5 };
u8 stat [] = { 0 };
- struct i2c_msg msg [] = {{ addr: 0x68, flags: 0, buf: rpt1, len: 2 },
- { addr: 0x60, flags: I2C_M_RD, buf: stat, len: 1 }};
+ struct i2c_msg msg [] = {{ .addr = 0x68, .flags = 0, .buf = rpt1, .len = 2 },
+ { .addr = 0x60, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
dprintk ("%s\n", __FUNCTION__);
@@ -890,12 +890,12 @@ long probe_tuner (struct dvb_i2c_bus *i2c)
u8 stat [] = { 0 };
u8 tda6100_buf [] = { 0, 0 };
int ret;
- struct i2c_msg msg1 [] = {{ addr: 0x68, flags: 0, buf: rpt, len: 2 },
- { addr: 0x60, flags: I2C_M_RD, buf: stat, len: 1 }};
- struct i2c_msg msg2 [] = {{ addr: 0x68, flags: 0, buf: rpt, len: 2 },
- { addr: 0x61, flags: I2C_M_RD, buf: stat, len: 1 }};
- struct i2c_msg msg3 [] = {{ addr: 0x68, flags: 0, buf: rpt, len: 2 },
- { addr: 0x60, flags: 0, buf: tda6100_buf, len: 2 }};
+ struct i2c_msg msg1 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt, len: 2 },
+ { .addr = 0x60, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
+ struct i2c_msg msg2 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt, len: 2 },
+ { .addr = 0x61, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
+ struct i2c_msg msg3 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt, len: 2 },
+ { .addr = 0x60, .flags = 0, .buf = tda6100_buf, .len = 2 }};
stv0299_writereg (i2c, 0x01, 0x15);
stv0299_writereg (i2c, 0x02, 0x30);
diff --git a/linux/drivers/media/dvb/frontends/ves1820.c b/linux/drivers/media/dvb/frontends/ves1820.c
index 0d637f438..d5d1303be 100644
--- a/linux/drivers/media/dvb/frontends/ves1820.c
+++ b/linux/drivers/media/dvb/frontends/ves1820.c
@@ -112,7 +112,7 @@ int ves1820_writereg (struct dvb_frontend *fe, u8 reg, u8 data)
{
u8 addr = GET_DEMOD_ADDR(fe->data);
u8 buf[] = { 0x00, reg, data };
- struct i2c_msg msg = { addr: addr, flags: 0, buf: buf, len: 3 };
+ struct i2c_msg msg = { addr: addr, .flags = 0, .buf = buf, .len = 3 };
struct dvb_i2c_bus *i2c = fe->i2c;
int ret;
@@ -134,8 +134,8 @@ u8 ves1820_readreg (struct dvb_frontend *fe, u8 reg)
u8 b0 [] = { 0x00, reg };
u8 b1 [] = { 0 };
u8 addr = GET_DEMOD_ADDR(fe->data);
- struct i2c_msg msg [] = { { addr: addr, flags: 0, buf: b0, len: 2 },
- { addr: addr, flags: I2C_M_RD, buf: b1, len: 1 } };
+ struct i2c_msg msg [] = { { addr: addr, .flags = 0, .buf = b0, .len = 2 },
+ { addr: addr, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
struct dvb_i2c_bus *i2c = fe->i2c;
int ret;
@@ -152,7 +152,7 @@ static
int tuner_write (struct dvb_i2c_bus *i2c, u8 addr, u8 data [4])
{
int ret;
- struct i2c_msg msg = { addr: addr, flags: 0, buf: data, len: 4 };
+ struct i2c_msg msg = { addr: addr, .flags = 0, .buf = data, .len = 4 };
ret = i2c->xfer (i2c, &msg, 1);
@@ -454,9 +454,9 @@ static
long probe_tuner (struct dvb_i2c_bus *i2c)
{
static const
- struct i2c_msg msg1 = { addr: 0x61, flags: 0, buf: NULL, len: 0 };
+ struct i2c_msg msg1 = { .addr = 0x61, .flags = 0, .buf = NULL, .len = 0 };
static const
- struct i2c_msg msg2 = { addr: 0x62, flags: 0, buf: NULL, len: 0 };
+ struct i2c_msg msg2 = { .addr = 0x62, .flags = 0, .buf = NULL, .len = 0 };
int type;
if (i2c->xfer(i2c, &msg1, 1) == 1) {
@@ -481,8 +481,8 @@ u8 read_pwm (struct dvb_i2c_bus *i2c)
{
u8 b = 0xff;
u8 pwm;
- struct i2c_msg msg [] = { { addr: 0x50, flags: 0, buf: &b, len: 1 },
- { addr: 0x50, flags: I2C_M_RD, buf: &pwm, len: 1 } };
+ struct i2c_msg msg [] = { { .addr = 0x50, .flags = 0, .buf = &b, .len = 1 },
+ { .addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1 } };
i2c->xfer (i2c, msg, 2);
@@ -500,8 +500,8 @@ long probe_demod_addr (struct dvb_i2c_bus *i2c)
{
u8 b [] = { 0x00, 0x1a };
u8 id;
- struct i2c_msg msg [] = { { addr: 0x08, flags: 0, buf: b, len: 2 },
- { addr: 0x08, flags: I2C_M_RD, buf: &id, len: 1 } };
+ struct i2c_msg msg [] = { { .addr = 0x08, .flags = 0, .buf = b, .len = 2 },
+ { .addr = 0x08, .flags = I2C_M_RD, .buf = &id, .len = 1 } };
if (i2c->xfer(i2c, msg, 2) == 2 && (id & 0xf0) == 0x70)
return msg[0].addr;