mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
commit
bd8dc70507
File diff suppressed because it is too large
Load Diff
@ -1,502 +0,0 @@
|
||||
From: https://github.com/crazycat69/linux_media/
|
||||
Date: Wed, 28 Sep 2016 01:29:23 +0300
|
||||
Subject: [PATCH] cxusb: Geniatech T230C support.
|
||||
|
||||
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
|
||||
index 20b4a65..28f3bbe 100644
|
||||
--- a/drivers/media/dvb-frontends/si2168.c
|
||||
+++ b/drivers/media/dvb-frontends/si2168.c
|
||||
@@ -674,6 +674,9 @@ static int si2168_probe(struct i2c_client *client,
|
||||
case SI2168_CHIP_ID_B40:
|
||||
dev->firmware_name = SI2168_B40_FIRMWARE;
|
||||
break;
|
||||
+ case SI2168_CHIP_ID_D60:
|
||||
+ dev->firmware_name = SI2168_D60_FIRMWARE;
|
||||
+ break;
|
||||
default:
|
||||
dev_dbg(&client->dev, "unknown chip version Si21%d-%c%c%c\n",
|
||||
cmd.args[2], cmd.args[1], cmd.args[3], cmd.args[4]);
|
||||
@@ -761,3 +764,4 @@ static int si2168_remove(struct i2c_client *client)
|
||||
MODULE_FIRMWARE(SI2168_A20_FIRMWARE);
|
||||
MODULE_FIRMWARE(SI2168_A30_FIRMWARE);
|
||||
MODULE_FIRMWARE(SI2168_B40_FIRMWARE);
|
||||
+MODULE_FIRMWARE(SI2168_D60_FIRMWARE);
|
||||
diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
|
||||
index 7843ccb..4baa95b 100644
|
||||
--- a/drivers/media/dvb-frontends/si2168_priv.h
|
||||
+++ b/drivers/media/dvb-frontends/si2168_priv.h
|
||||
@@ -25,6 +25,7 @@
|
||||
#define SI2168_A20_FIRMWARE "dvb-demod-si2168-a20-01.fw"
|
||||
#define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw"
|
||||
#define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw"
|
||||
+#define SI2168_D60_FIRMWARE "dvb-demod-si2168-d60-01.fw"
|
||||
#define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-02.fw"
|
||||
|
||||
/* state struct */
|
||||
@@ -37,6 +38,7 @@ struct si2168_dev {
|
||||
#define SI2168_CHIP_ID_A20 ('A' << 24 | 68 << 16 | '2' << 8 | '0' << 0)
|
||||
#define SI2168_CHIP_ID_A30 ('A' << 24 | 68 << 16 | '3' << 8 | '0' << 0)
|
||||
#define SI2168_CHIP_ID_B40 ('B' << 24 | 68 << 16 | '4' << 8 | '0' << 0)
|
||||
+ #define SI2168_CHIP_ID_D60 ('D' << 24 | 68 << 16 | '6' << 8 | '0' << 0)
|
||||
unsigned int chip_id;
|
||||
unsigned int version;
|
||||
const char *firmware_name;
|
||||
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
|
||||
index 57b2508..69fd21e 100644
|
||||
--- a/drivers/media/tuners/si2157.c
|
||||
+++ b/drivers/media/tuners/si2157.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver
|
||||
+ * Silicon Labs Si2141/2146/2147/2148/2151/2157/2158 silicon tuner driver
|
||||
*
|
||||
* Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
|
||||
*
|
||||
@@ -84,7 +84,7 @@ static int si2157_init(struct dvb_frontend *fe)
|
||||
struct si2157_cmd cmd;
|
||||
const struct firmware *fw;
|
||||
const char *fw_name;
|
||||
- unsigned int uitmp, chip_id;
|
||||
+ unsigned int uitmp, chip_id, count;
|
||||
|
||||
dev_dbg(&client->dev, "\n");
|
||||
|
||||
@@ -102,14 +102,46 @@ static int si2157_init(struct dvb_frontend *fe)
|
||||
if (uitmp == dev->if_frequency / 1000)
|
||||
goto warm;
|
||||
|
||||
+ if (dev->chiptype == SI2157_CHIPTYPE_SI2141) {
|
||||
+ count = 0;
|
||||
+ do {
|
||||
+ if (count > 10)
|
||||
+ goto err;
|
||||
+
|
||||
+ /* reset */
|
||||
+ memcpy(cmd.args, "\xc0\x05\x00\x00", 4);
|
||||
+ cmd.wlen = 4;
|
||||
+ cmd.rlen = 1;
|
||||
+ ret = si2157_cmd_execute(client, &cmd);
|
||||
+ if (ret)
|
||||
+ goto err;
|
||||
+
|
||||
+ memcpy(cmd.args, "\xc0\x00\x0d\x0e\x00\x01\x01\x01\x01\x03", 10);
|
||||
+ cmd.wlen = 10;
|
||||
+ cmd.rlen = 1;
|
||||
+ ret = si2157_cmd_execute(client, &cmd);
|
||||
+ if (ret)
|
||||
+ goto err;
|
||||
+ count++;
|
||||
+ } while (cmd.args[0] == 0xfe);
|
||||
+ dev_info(&client->dev, "Si2141/2151 reset attempts %d\n", count);
|
||||
+ }
|
||||
+
|
||||
/* power up */
|
||||
- if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
|
||||
+ switch (dev->chiptype) {
|
||||
+ case SI2157_CHIPTYPE_SI2146:
|
||||
memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
|
||||
cmd.wlen = 9;
|
||||
- } else {
|
||||
+ break;
|
||||
+ case SI2157_CHIPTYPE_SI2141:
|
||||
+ memcpy(cmd.args, "\xc0\x08\x01\x02\x00\x08\x01", 7);
|
||||
+ cmd.wlen = 7;
|
||||
+ break;
|
||||
+ default:
|
||||
memcpy(cmd.args, "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
|
||||
cmd.wlen = 15;
|
||||
}
|
||||
+
|
||||
cmd.rlen = 1;
|
||||
ret = si2157_cmd_execute(client, &cmd);
|
||||
if (ret)
|
||||
@@ -131,6 +163,8 @@ static int si2157_init(struct dvb_frontend *fe)
|
||||
#define SI2157_A30 ('A' << 24 | 57 << 16 | '3' << 8 | '0' << 0)
|
||||
#define SI2147_A30 ('A' << 24 | 47 << 16 | '3' << 8 | '0' << 0)
|
||||
#define SI2146_A10 ('A' << 24 | 46 << 16 | '1' << 8 | '0' << 0)
|
||||
+ #define SI2141_A10 ('A' << 24 | 41 << 16 | '1' << 8 | '0' << 0)
|
||||
+ #define SI2151_A10 ('A' << 24 | 51 << 16 | '1' << 8 | '0' << 0)
|
||||
|
||||
switch (chip_id) {
|
||||
case SI2158_A20:
|
||||
@@ -142,6 +176,10 @@ static int si2157_init(struct dvb_frontend *fe)
|
||||
case SI2146_A10:
|
||||
fw_name = NULL;
|
||||
break;
|
||||
+ case SI2141_A10:
|
||||
+ case SI2151_A10:
|
||||
+ fw_name = SI2141_A10_FIRMWARE;
|
||||
+ break;
|
||||
default:
|
||||
dev_err(&client->dev, "unknown chip version Si21%d-%c%c%c\n",
|
||||
cmd.args[2], cmd.args[1],
|
||||
@@ -214,6 +252,23 @@ static int si2157_init(struct dvb_frontend *fe)
|
||||
|
||||
dev_info(&client->dev, "firmware version: %c.%c.%d\n",
|
||||
cmd.args[6], cmd.args[7], cmd.args[8]);
|
||||
+
|
||||
+ if (dev->chiptype == SI2157_CHIPTYPE_SI2141) {
|
||||
+ /* set clock */
|
||||
+ memcpy(cmd.args, "\xc0\x00\x0d", 3);
|
||||
+ cmd.wlen = 3;
|
||||
+ cmd.rlen = 1;
|
||||
+ ret = si2157_cmd_execute(client, &cmd);
|
||||
+ if (ret)
|
||||
+ goto err;
|
||||
+ /* setup PIN */
|
||||
+ memcpy(cmd.args, "\x12\x80\x80\x85\x00\x81\x00", 7);
|
||||
+ cmd.wlen = 7;
|
||||
+ cmd.rlen = 7;
|
||||
+ ret = si2157_cmd_execute(client, &cmd);
|
||||
+ if (ret)
|
||||
+ goto err;
|
||||
+ }
|
||||
warm:
|
||||
/* init statistics in order signal app which are supported */
|
||||
c->strength.len = 1;
|
||||
@@ -471,7 +526,8 @@ static int si2157_probe(struct i2c_client *client,
|
||||
#endif
|
||||
|
||||
dev_info(&client->dev, "Silicon Labs %s successfully attached\n",
|
||||
- dev->chiptype == SI2157_CHIPTYPE_SI2146 ?
|
||||
+ dev->chiptype == SI2157_CHIPTYPE_SI2141 ?
|
||||
+ "Si2141/2151" : dev->chiptype == SI2157_CHIPTYPE_SI2146 ?
|
||||
"Si2146" : "Si2147/2148/2157/2158");
|
||||
|
||||
return 0;
|
||||
@@ -508,6 +564,8 @@ static int si2157_remove(struct i2c_client *client)
|
||||
static const struct i2c_device_id si2157_id_table[] = {
|
||||
{"si2157", SI2157_CHIPTYPE_SI2157},
|
||||
{"si2146", SI2157_CHIPTYPE_SI2146},
|
||||
+ {"si2141", SI2157_CHIPTYPE_SI2141},
|
||||
+ {"si2151", SI2157_CHIPTYPE_SI2141},
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, si2157_id_table);
|
||||
@@ -524,7 +582,8 @@ static int si2157_remove(struct i2c_client *client)
|
||||
|
||||
module_i2c_driver(si2157_driver);
|
||||
|
||||
-MODULE_DESCRIPTION("Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver");
|
||||
+MODULE_DESCRIPTION("Silicon Labs Si2141/2146/2147/2148/2151/2157/2158 silicon tuner driver");
|
||||
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_FIRMWARE(SI2158_A20_FIRMWARE);
|
||||
+MODULE_FIRMWARE(SI2141_A10_FIRMWARE);
|
||||
diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h
|
||||
index d6b2c7b..e6436f7 100644
|
||||
--- a/drivers/media/tuners/si2157_priv.h
|
||||
+++ b/drivers/media/tuners/si2157_priv.h
|
||||
@@ -42,6 +42,7 @@ struct si2157_dev {
|
||||
|
||||
#define SI2157_CHIPTYPE_SI2157 0
|
||||
#define SI2157_CHIPTYPE_SI2146 1
|
||||
+#define SI2157_CHIPTYPE_SI2141 2
|
||||
|
||||
/* firmware command struct */
|
||||
#define SI2157_ARGLEN 30
|
||||
@@ -52,5 +53,6 @@ struct si2157_cmd {
|
||||
};
|
||||
|
||||
#define SI2158_A20_FIRMWARE "dvb-tuner-si2158-a20-01.fw"
|
||||
+#define SI2141_A10_FIRMWARE "dvb-tuner-si2141-a10-01.fw"
|
||||
|
||||
#endif
|
||||
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
|
||||
index 0f6ace4..4bf4c68 100644
|
||||
--- a/drivers/media/usb/dvb-usb/cxusb.c
|
||||
+++ b/drivers/media/usb/dvb-usb/cxusb.c
|
||||
@@ -369,6 +369,26 @@ static int cxusb_aver_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int cxusb_read_status(struct dvb_frontend *fe,
|
||||
+ enum fe_status *status)
|
||||
+{
|
||||
+ struct dvb_usb_adapter *adap = (struct dvb_usb_adapter *)fe->dvb->priv;
|
||||
+ struct cxusb_state *state = (struct cxusb_state *)adap->dev->priv;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = state->fe_read_status(fe, status);
|
||||
+
|
||||
+ /* it need resync slave fifo when signal change from unlock to lock.*/
|
||||
+ if ((*status & FE_HAS_LOCK) && (!state->last_lock)) {
|
||||
+ mutex_lock(&state->stream_mutex);
|
||||
+ cxusb_streaming_ctrl(adap, 1);
|
||||
+ mutex_unlock(&state->stream_mutex);
|
||||
+ }
|
||||
+
|
||||
+ state->last_lock = (*status & FE_HAS_LOCK) ? 1 : 0;
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
static void cxusb_d680_dmb_drain_message(struct dvb_usb_device *d)
|
||||
{
|
||||
int ep = d->props.generic_bulk_ctrl_endpoint;
|
||||
@@ -633,6 +653,44 @@ static struct rc_map_table rc_map_d680_dmb_table[] = {
|
||||
{ 0x0025, KEY_POWER },
|
||||
};
|
||||
|
||||
+static struct rc_map_table rc_map_t230_table[] = {
|
||||
+ { 0x0000, KEY_0 },
|
||||
+ { 0x0001, KEY_1 },
|
||||
+ { 0x0002, KEY_2 },
|
||||
+ { 0x0003, KEY_3 },
|
||||
+ { 0x0004, KEY_4 },
|
||||
+ { 0x0005, KEY_5 },
|
||||
+ { 0x0006, KEY_6 },
|
||||
+ { 0x0007, KEY_7 },
|
||||
+ { 0x0008, KEY_8 },
|
||||
+ { 0x0009, KEY_9 },
|
||||
+ { 0x000a, KEY_MUTE },
|
||||
+ { 0x000b, KEY_STOP }, /* Stop */
|
||||
+ { 0x000c, KEY_POWER2 }, /* Turn on/off application */
|
||||
+ { 0x000d, KEY_OK }, /* OK */
|
||||
+ { 0x000e, KEY_CAMERA }, /* Snapshot */
|
||||
+ { 0x000f, KEY_ZOOM }, /* Full Screen/Restore */
|
||||
+ { 0x0010, KEY_RIGHT }, /* Right arrow */
|
||||
+ { 0x0011, KEY_LEFT }, /* Left arrow */
|
||||
+ { 0x0012, KEY_CHANNELUP },
|
||||
+ { 0x0013, KEY_CHANNELDOWN },
|
||||
+ { 0x0014, KEY_SHUFFLE },
|
||||
+ { 0x0016, KEY_PAUSE },
|
||||
+ { 0x0017, KEY_PLAY }, /* Play */
|
||||
+ { 0x001e, KEY_TIME }, /* Time Shift */
|
||||
+ { 0x001f, KEY_RECORD },
|
||||
+ { 0x0020, KEY_UP },
|
||||
+ { 0x0021, KEY_DOWN },
|
||||
+ { 0x0025, KEY_POWER }, /* Turn off computer */
|
||||
+ { 0x0026, KEY_REWIND }, /* FR << */
|
||||
+ { 0x0027, KEY_FASTFORWARD }, /* FF >> */
|
||||
+ { 0x0029, KEY_ESC },
|
||||
+ { 0x002b, KEY_VOLUMEUP },
|
||||
+ { 0x002c, KEY_VOLUMEDOWN },
|
||||
+ { 0x002d, KEY_CHANNEL }, /* CH Surfing */
|
||||
+ { 0x0038, KEY_VIDEO }, /* TV/AV/S-Video/YPbPr */
|
||||
+};
|
||||
+
|
||||
static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)
|
||||
{
|
||||
static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x28 };
|
||||
@@ -1346,6 +1404,8 @@ static int cxusb_mygica_t230_frontend_attach(struct dvb_usb_adapter *adap)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
+ st->i2c_client_demod = client_demod;
|
||||
+
|
||||
/* attach tuner */
|
||||
memset(&si2157_config, 0, sizeof(si2157_config));
|
||||
si2157_config.fe = adap->fe_adap[0].fe;
|
||||
@@ -1368,9 +1428,90 @@ static int cxusb_mygica_t230_frontend_attach(struct dvb_usb_adapter *adap)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
+ st->i2c_client_tuner = client_tuner;
|
||||
+
|
||||
+ /* hook fe: need to resync the slave fifo when signal locks. */
|
||||
+ mutex_init(&st->stream_mutex);
|
||||
+ st->last_lock = 0;
|
||||
+ st->fe_read_status = adap->fe_adap[0].fe->ops.read_status;
|
||||
+ adap->fe_adap[0].fe->ops.read_status = cxusb_read_status;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int cxusb_mygica_t230c_frontend_attach(struct dvb_usb_adapter *adap)
|
||||
+{
|
||||
+ struct dvb_usb_device *d = adap->dev;
|
||||
+ struct cxusb_state *st = d->priv;
|
||||
+ struct i2c_adapter *adapter;
|
||||
+ struct i2c_client *client_demod;
|
||||
+ struct i2c_client *client_tuner;
|
||||
+ struct i2c_board_info info;
|
||||
+ struct si2168_config si2168_config;
|
||||
+ struct si2157_config si2157_config;
|
||||
+
|
||||
+ /* Select required USB configuration */
|
||||
+ if (usb_set_interface(d->udev, 0, 0) < 0)
|
||||
+ err("set interface failed");
|
||||
+
|
||||
+ /* Unblock all USB pipes */
|
||||
+ usb_clear_halt(d->udev,
|
||||
+ usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
|
||||
+ usb_clear_halt(d->udev,
|
||||
+ usb_rcvbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
|
||||
+ usb_clear_halt(d->udev,
|
||||
+ usb_rcvbulkpipe(d->udev, d->props.adapter[0].fe[0].stream.endpoint));
|
||||
+
|
||||
+ /* attach frontend */
|
||||
+ memset(&si2168_config, 0, sizeof(si2168_config));
|
||||
+ si2168_config.i2c_adapter = &adapter;
|
||||
+ si2168_config.fe = &adap->fe_adap[0].fe;
|
||||
+ si2168_config.ts_mode = SI2168_TS_PARALLEL;
|
||||
+ si2168_config.ts_clock_inv = 1;
|
||||
+ memset(&info, 0, sizeof(struct i2c_board_info));
|
||||
+ strlcpy(info.type, "si2168", I2C_NAME_SIZE);
|
||||
+ info.addr = 0x64;
|
||||
+ info.platform_data = &si2168_config;
|
||||
+ request_module(info.type);
|
||||
+ client_demod = i2c_new_device(&d->i2c_adap, &info);
|
||||
+ if (client_demod == NULL || client_demod->dev.driver == NULL)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ if (!try_module_get(client_demod->dev.driver->owner)) {
|
||||
+ i2c_unregister_device(client_demod);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ /* attach tuner */
|
||||
+ memset(&si2157_config, 0, sizeof(si2157_config));
|
||||
+ si2157_config.fe = adap->fe_adap[0].fe;
|
||||
+ memset(&info, 0, sizeof(struct i2c_board_info));
|
||||
+ strlcpy(info.type, "si2141", I2C_NAME_SIZE);
|
||||
+ info.addr = 0x60;
|
||||
+ info.platform_data = &si2157_config;
|
||||
+ request_module("si2157");
|
||||
+ client_tuner = i2c_new_device(adapter, &info);
|
||||
+ if (client_tuner == NULL || client_tuner->dev.driver == NULL) {
|
||||
+ module_put(client_demod->dev.driver->owner);
|
||||
+ i2c_unregister_device(client_demod);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+ if (!try_module_get(client_tuner->dev.driver->owner)) {
|
||||
+ i2c_unregister_device(client_tuner);
|
||||
+ module_put(client_demod->dev.driver->owner);
|
||||
+ i2c_unregister_device(client_demod);
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
st->i2c_client_demod = client_demod;
|
||||
st->i2c_client_tuner = client_tuner;
|
||||
|
||||
+ /* hook fe: need to resync the slave fifo when signal locks. */
|
||||
+ mutex_init(&st->stream_mutex);
|
||||
+ st->last_lock = 0;
|
||||
+ st->fe_read_status = adap->fe_adap[0].fe->ops.read_status;
|
||||
+ adap->fe_adap[0].fe->ops.read_status = cxusb_read_status;
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1456,6 +1597,7 @@ static struct dvb_usb_device_properties cxusb_aver_a868r_properties;
|
||||
static struct dvb_usb_device_properties cxusb_d680_dmb_properties;
|
||||
static struct dvb_usb_device_properties cxusb_mygica_d689_properties;
|
||||
static struct dvb_usb_device_properties cxusb_mygica_t230_properties;
|
||||
+static struct dvb_usb_device_properties cxusb_mygica_t230c_properties;
|
||||
|
||||
static int cxusb_probe(struct usb_interface *intf,
|
||||
const struct usb_device_id *id)
|
||||
@@ -1488,6 +1630,8 @@ static int cxusb_probe(struct usb_interface *intf,
|
||||
THIS_MODULE, NULL, adapter_nr) ||
|
||||
0 == dvb_usb_device_init(intf, &cxusb_mygica_t230_properties,
|
||||
THIS_MODULE, NULL, adapter_nr) ||
|
||||
+ 0 == dvb_usb_device_init(intf, &cxusb_mygica_t230c_properties,
|
||||
+ THIS_MODULE, NULL, adapter_nr) ||
|
||||
0)
|
||||
return 0;
|
||||
|
||||
@@ -1539,6 +1683,7 @@ enum cxusb_table_index {
|
||||
CONEXANT_D680_DMB,
|
||||
MYGICA_D689,
|
||||
MYGICA_T230,
|
||||
+ MYGICA_T230C,
|
||||
NR__cxusb_table_index
|
||||
};
|
||||
|
||||
@@ -1606,6 +1751,9 @@ static struct usb_device_id cxusb_table[NR__cxusb_table_index + 1] = {
|
||||
[MYGICA_T230] = {
|
||||
USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230)
|
||||
},
|
||||
+ [MYGICA_T230C] = {
|
||||
+ USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230+1)
|
||||
+ },
|
||||
{} /* Terminating entry */
|
||||
};
|
||||
MODULE_DEVICE_TABLE (usb, cxusb_table);
|
||||
@@ -2290,8 +2438,8 @@ static struct dvb_usb_device_properties cxusb_mygica_t230_properties = {
|
||||
|
||||
.rc.legacy = {
|
||||
.rc_interval = 100,
|
||||
- .rc_map_table = rc_map_d680_dmb_table,
|
||||
- .rc_map_size = ARRAY_SIZE(rc_map_d680_dmb_table),
|
||||
+ .rc_map_table = rc_map_t230_table,
|
||||
+ .rc_map_size = ARRAY_SIZE(rc_map_t230_table),
|
||||
.rc_query = cxusb_d680_dmb_rc_query,
|
||||
},
|
||||
|
||||
@@ -2305,6 +2453,59 @@ static struct dvb_usb_device_properties cxusb_mygica_t230_properties = {
|
||||
}
|
||||
};
|
||||
|
||||
+static struct dvb_usb_device_properties cxusb_mygica_t230c_properties = {
|
||||
+ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
|
||||
+
|
||||
+ .usb_ctrl = CYPRESS_FX2,
|
||||
+
|
||||
+ .size_of_priv = sizeof(struct cxusb_state),
|
||||
+
|
||||
+ .num_adapters = 1,
|
||||
+ .adapter = {
|
||||
+ {
|
||||
+ .num_frontends = 1,
|
||||
+ .fe = {{
|
||||
+ .streaming_ctrl = cxusb_streaming_ctrl,
|
||||
+ .frontend_attach = cxusb_mygica_t230c_frontend_attach,
|
||||
+
|
||||
+ /* parameter for the MPEG2-data transfer */
|
||||
+ .stream = {
|
||||
+ .type = USB_BULK,
|
||||
+ .count = 5,
|
||||
+ .endpoint = 0x02,
|
||||
+ .u = {
|
||||
+ .bulk = {
|
||||
+ .buffersize = 8192,
|
||||
+ }
|
||||
+ }
|
||||
+ },
|
||||
+ } },
|
||||
+ },
|
||||
+ },
|
||||
+
|
||||
+ .power_ctrl = cxusb_d680_dmb_power_ctrl,
|
||||
+
|
||||
+ .i2c_algo = &cxusb_i2c_algo,
|
||||
+
|
||||
+ .generic_bulk_ctrl_endpoint = 0x01,
|
||||
+
|
||||
+ .rc.legacy = {
|
||||
+ .rc_interval = 100,
|
||||
+ .rc_map_table = rc_map_t230_table,
|
||||
+ .rc_map_size = ARRAY_SIZE(rc_map_t230_table),
|
||||
+ .rc_query = cxusb_d680_dmb_rc_query,
|
||||
+ },
|
||||
+
|
||||
+ .num_device_descs = 1,
|
||||
+ .devices = {
|
||||
+ {
|
||||
+ "Mygica T230C DVB-T/T2/C",
|
||||
+ { NULL },
|
||||
+ { &cxusb_table[MYGICA_T230C], NULL },
|
||||
+ },
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
static struct usb_driver cxusb_driver = {
|
||||
.name = "dvb_usb_cxusb",
|
||||
.probe = cxusb_probe,
|
||||
diff --git a/drivers/media/usb/dvb-usb/cxusb.h b/drivers/media/usb/dvb-usb/cxusb.h
|
||||
index 18acda1..66429d7 100644
|
||||
--- a/drivers/media/usb/dvb-usb/cxusb.h
|
||||
+++ b/drivers/media/usb/dvb-usb/cxusb.h
|
||||
@@ -37,6 +37,11 @@ struct cxusb_state {
|
||||
struct i2c_client *i2c_client_tuner;
|
||||
|
||||
unsigned char data[MAX_XFER_SIZE];
|
||||
+
|
||||
+ struct mutex stream_mutex;
|
||||
+ u8 last_lock;
|
||||
+ int (*fe_read_status)(struct dvb_frontend *fe,
|
||||
+ enum fe_status *status);
|
||||
};
|
||||
|
||||
#endif
|
@ -2849,18 +2849,6 @@ CONFIG_DVB_USB_DTV5100=m
|
||||
# CONFIG_DVB_USB_FRIIO is not set
|
||||
CONFIG_DVB_USB_AZ6027=m
|
||||
CONFIG_DVB_USB_TECHNISAT_USB2=m
|
||||
CONFIG_DVB_USB_TBSQBOX=m
|
||||
CONFIG_DVB_USB_TBSQBOX2=m
|
||||
CONFIG_DVB_USB_TBSQBOX22=m
|
||||
CONFIG_DVB_USB_TBS5922SE=m
|
||||
CONFIG_DVB_USB_TBSQBOXS2=m
|
||||
CONFIG_DVB_USB_TBSQBOX2CI=m
|
||||
CONFIG_DVB_USB_TBS5925=m
|
||||
CONFIG_DVB_USB_TBS5880=m
|
||||
CONFIG_DVB_USB_TBS5220=m
|
||||
CONFIG_DVB_USB_TBS5881=m
|
||||
CONFIG_DVB_USB_TBS5520=m
|
||||
CONFIG_DVB_USB_TBS5927=m
|
||||
CONFIG_DVB_USB_V2=m
|
||||
CONFIG_DVB_USB_AF9015=m
|
||||
CONFIG_DVB_USB_AF9035=m
|
||||
@ -2929,7 +2917,6 @@ CONFIG_VIDEO_SAA7134=m
|
||||
CONFIG_VIDEO_SAA7134_RC=y
|
||||
CONFIG_VIDEO_SAA7134_DVB=m
|
||||
CONFIG_VIDEO_SAA7164=m
|
||||
# CONFIG_SAA716X_SUPPORT is not set
|
||||
|
||||
#
|
||||
# Media digital TV PCI Adapters
|
||||
@ -2954,7 +2941,6 @@ CONFIG_DVB_MANTIS=m
|
||||
CONFIG_DVB_NGENE=m
|
||||
CONFIG_DVB_DDBRIDGE=m
|
||||
CONFIG_DVB_SMIPCIE=m
|
||||
CONFIG_DVB_TBSECP3=m
|
||||
# CONFIG_V4L_PLATFORM_DRIVERS is not set
|
||||
# CONFIG_V4L_MEM2MEM_DRIVERS is not set
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
@ -3076,9 +3062,6 @@ CONFIG_MEDIA_TUNER_SI2157=m
|
||||
CONFIG_MEDIA_TUNER_IT913X=m
|
||||
CONFIG_MEDIA_TUNER_R820T=m
|
||||
CONFIG_MEDIA_TUNER_QM1D1C0042=m
|
||||
CONFIG_MEDIA_TUNER_AV201X=m
|
||||
CONFIG_MEDIA_TUNER_STV6120=m
|
||||
CONFIG_MEDIA_TUNER_R848=m
|
||||
|
||||
#
|
||||
# Multistandard (satellite) frontends
|
||||
@ -3212,13 +3195,10 @@ CONFIG_DVB_TDA665x=m
|
||||
CONFIG_DVB_IX2505V=m
|
||||
CONFIG_DVB_M88RS2000=m
|
||||
CONFIG_DVB_AF9033=m
|
||||
CONFIG_DVB_TAS2101=m
|
||||
|
||||
#
|
||||
# Tools to develop new frontends
|
||||
#
|
||||
CONFIG_DVB_STV0910=m
|
||||
CONFIG_DVB_AVL6882=m
|
||||
# CONFIG_DVB_DUMMY_FE is not set
|
||||
|
||||
#
|
||||
|
@ -2327,18 +2327,6 @@ CONFIG_DVB_USB_DTV5100=m
|
||||
# CONFIG_DVB_USB_FRIIO is not set
|
||||
CONFIG_DVB_USB_AZ6027=m
|
||||
CONFIG_DVB_USB_TECHNISAT_USB2=m
|
||||
CONFIG_DVB_USB_TBSQBOX=m
|
||||
CONFIG_DVB_USB_TBSQBOX2=m
|
||||
CONFIG_DVB_USB_TBSQBOX22=m
|
||||
CONFIG_DVB_USB_TBS5922SE=m
|
||||
CONFIG_DVB_USB_TBSQBOXS2=m
|
||||
CONFIG_DVB_USB_TBSQBOX2CI=m
|
||||
CONFIG_DVB_USB_TBS5925=m
|
||||
CONFIG_DVB_USB_TBS5880=m
|
||||
CONFIG_DVB_USB_TBS5220=m
|
||||
CONFIG_DVB_USB_TBS5881=m
|
||||
CONFIG_DVB_USB_TBS5520=m
|
||||
CONFIG_DVB_USB_TBS5927=m
|
||||
CONFIG_DVB_USB_V2=m
|
||||
CONFIG_DVB_USB_AF9015=m
|
||||
CONFIG_DVB_USB_AF9035=m
|
||||
@ -2475,9 +2463,6 @@ CONFIG_MEDIA_TUNER_SI2157=m
|
||||
CONFIG_MEDIA_TUNER_IT913X=m
|
||||
CONFIG_MEDIA_TUNER_R820T=m
|
||||
CONFIG_MEDIA_TUNER_QM1D1C0042=m
|
||||
CONFIG_MEDIA_TUNER_AV201X=m
|
||||
CONFIG_MEDIA_TUNER_STV6120=m
|
||||
CONFIG_MEDIA_TUNER_R848=m
|
||||
|
||||
#
|
||||
# Multistandard (satellite) frontends
|
||||
@ -2595,13 +2580,10 @@ CONFIG_DVB_ATBM8830=m
|
||||
CONFIG_DVB_IX2505V=m
|
||||
CONFIG_DVB_M88RS2000=m
|
||||
CONFIG_DVB_AF9033=m
|
||||
CONFIG_DVB_TAS2101=m
|
||||
|
||||
#
|
||||
# Tools to develop new frontends
|
||||
#
|
||||
CONFIG_DVB_STV0910=m
|
||||
CONFIG_DVB_AVL6882=m
|
||||
# CONFIG_DVB_DUMMY_FE is not set
|
||||
|
||||
#
|
||||
|
@ -2418,18 +2418,6 @@ CONFIG_DVB_USB_DTV5100=m
|
||||
# CONFIG_DVB_USB_FRIIO is not set
|
||||
CONFIG_DVB_USB_AZ6027=m
|
||||
CONFIG_DVB_USB_TECHNISAT_USB2=m
|
||||
CONFIG_DVB_USB_TBSQBOX=m
|
||||
CONFIG_DVB_USB_TBSQBOX2=m
|
||||
CONFIG_DVB_USB_TBSQBOX22=m
|
||||
CONFIG_DVB_USB_TBS5922SE=m
|
||||
CONFIG_DVB_USB_TBSQBOXS2=m
|
||||
CONFIG_DVB_USB_TBSQBOX2CI=m
|
||||
CONFIG_DVB_USB_TBS5925=m
|
||||
CONFIG_DVB_USB_TBS5880=m
|
||||
CONFIG_DVB_USB_TBS5220=m
|
||||
CONFIG_DVB_USB_TBS5881=m
|
||||
CONFIG_DVB_USB_TBS5520=m
|
||||
CONFIG_DVB_USB_TBS5927=m
|
||||
CONFIG_DVB_USB_V2=m
|
||||
CONFIG_DVB_USB_AF9015=m
|
||||
CONFIG_DVB_USB_AF9035=m
|
||||
@ -2566,9 +2554,6 @@ CONFIG_MEDIA_TUNER_SI2157=m
|
||||
CONFIG_MEDIA_TUNER_IT913X=m
|
||||
CONFIG_MEDIA_TUNER_R820T=m
|
||||
CONFIG_MEDIA_TUNER_QM1D1C0042=m
|
||||
CONFIG_MEDIA_TUNER_AV201X=m
|
||||
CONFIG_MEDIA_TUNER_STV6120=m
|
||||
CONFIG_MEDIA_TUNER_R848=m
|
||||
|
||||
#
|
||||
# Multistandard (satellite) frontends
|
||||
@ -2686,13 +2671,10 @@ CONFIG_DVB_ATBM8830=m
|
||||
CONFIG_DVB_IX2505V=m
|
||||
CONFIG_DVB_M88RS2000=m
|
||||
CONFIG_DVB_AF9033=m
|
||||
CONFIG_DVB_TAS2101=m
|
||||
|
||||
#
|
||||
# Tools to develop new frontends
|
||||
#
|
||||
CONFIG_DVB_STV0910=m
|
||||
CONFIG_DVB_AVL6882=m
|
||||
# CONFIG_DVB_DUMMY_FE is not set
|
||||
|
||||
#
|
||||
|
@ -2848,18 +2848,6 @@ CONFIG_DVB_USB_DTV5100=m
|
||||
# CONFIG_DVB_USB_FRIIO is not set
|
||||
CONFIG_DVB_USB_AZ6027=m
|
||||
CONFIG_DVB_USB_TECHNISAT_USB2=m
|
||||
CONFIG_DVB_USB_TBSQBOX=m
|
||||
CONFIG_DVB_USB_TBSQBOX2=m
|
||||
CONFIG_DVB_USB_TBSQBOX22=m
|
||||
CONFIG_DVB_USB_TBS5922SE=m
|
||||
CONFIG_DVB_USB_TBSQBOXS2=m
|
||||
CONFIG_DVB_USB_TBSQBOX2CI=m
|
||||
CONFIG_DVB_USB_TBS5925=m
|
||||
CONFIG_DVB_USB_TBS5880=m
|
||||
CONFIG_DVB_USB_TBS5220=m
|
||||
CONFIG_DVB_USB_TBS5881=m
|
||||
CONFIG_DVB_USB_TBS5520=m
|
||||
CONFIG_DVB_USB_TBS5927=m
|
||||
CONFIG_DVB_USB_V2=m
|
||||
CONFIG_DVB_USB_AF9015=m
|
||||
CONFIG_DVB_USB_AF9035=m
|
||||
@ -2928,7 +2916,6 @@ CONFIG_VIDEO_SAA7134=m
|
||||
CONFIG_VIDEO_SAA7134_RC=y
|
||||
CONFIG_VIDEO_SAA7134_DVB=m
|
||||
CONFIG_VIDEO_SAA7164=m
|
||||
# CONFIG_SAA716X_SUPPORT is not set
|
||||
|
||||
#
|
||||
# Media digital TV PCI Adapters
|
||||
@ -2953,7 +2940,6 @@ CONFIG_DVB_MANTIS=m
|
||||
CONFIG_DVB_NGENE=m
|
||||
CONFIG_DVB_DDBRIDGE=m
|
||||
CONFIG_DVB_SMIPCIE=m
|
||||
CONFIG_DVB_TBSECP3=m
|
||||
# CONFIG_V4L_PLATFORM_DRIVERS is not set
|
||||
# CONFIG_V4L_MEM2MEM_DRIVERS is not set
|
||||
# CONFIG_V4L_TEST_DRIVERS is not set
|
||||
@ -3075,9 +3061,6 @@ CONFIG_MEDIA_TUNER_SI2157=m
|
||||
CONFIG_MEDIA_TUNER_IT913X=m
|
||||
CONFIG_MEDIA_TUNER_R820T=m
|
||||
CONFIG_MEDIA_TUNER_QM1D1C0042=m
|
||||
CONFIG_MEDIA_TUNER_AV201X=m
|
||||
CONFIG_MEDIA_TUNER_STV6120=m
|
||||
CONFIG_MEDIA_TUNER_R848=m
|
||||
|
||||
#
|
||||
# Multistandard (satellite) frontends
|
||||
@ -3211,13 +3194,10 @@ CONFIG_DVB_TDA665x=m
|
||||
CONFIG_DVB_IX2505V=m
|
||||
CONFIG_DVB_M88RS2000=m
|
||||
CONFIG_DVB_AF9033=m
|
||||
CONFIG_DVB_TAS2101=m
|
||||
|
||||
#
|
||||
# Tools to develop new frontends
|
||||
#
|
||||
CONFIG_DVB_STV0910=m
|
||||
CONFIG_DVB_AVL6882=m
|
||||
# CONFIG_DVB_DUMMY_FE is not set
|
||||
|
||||
#
|
||||
|
Loading…
x
Reference in New Issue
Block a user