mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
linux: add tbs support
This commit is contained in:
MilhouseVH
parent
f94566a539
commit
ca26b275b4
60954
packages/linux/patches/default/linux-220.01-tbs-support.patch
Normal file
60954
packages/linux/patches/default/linux-220.01-tbs-support.patch
Normal file
File diff suppressed because it is too large
Load Diff
294
packages/linux/patches/default/linux-220.02-T230C-support.patch
Normal file
294
packages/linux/patches/default/linux-220.02-T230C-support.patch
Normal file
@ -0,0 +1,294 @@
|
||||
From: https://github.com/crazycat69/linux_media/
|
||||
From: CrazyCat <crazycat69@narod.ru>
|
||||
Date: Wed, 28 Sep 2016 01:29:23 +0300
|
||||
Subject: [PATCH] cxusb: Geniatech T230C support.
|
||||
|
||||
index 0f6ace4..72a8e91 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 };
|
||||
@@ -1371,6 +1429,88 @@ static int cxusb_mygica_t230_frontend_attach(struct dvb_usb_adapter *adap)
|
||||
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;
|
||||
+}
|
||||
+
|
||||
+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 +1596,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 +1629,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 +1682,7 @@ enum cxusb_table_index {
|
||||
CONEXANT_D680_DMB,
|
||||
MYGICA_D689,
|
||||
MYGICA_T230,
|
||||
+ MYGICA_T230C,
|
||||
NR__cxusb_table_index
|
||||
};
|
||||
|
||||
@@ -1606,6 +1750,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 +2437,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 +2452,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
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From: https://github.com/crazycat69/linux_media/commit/b9a64b0bf203030b3203916789ca4dfe55825edc
|
||||
From: CrazyCat <crazycat69@narod.ru>
|
||||
Date: Mon, 18 Jul 2016 16:33:31 +0300
|
||||
Subject: [PATCH] Fixes in si2168 configuration.
|
||||
|
||||
--- a/drivers/media/usb/dvb-usb/cxusb.c
|
||||
+++ b/drivers/media/usb/dvb-usb/cxusb.c
|
||||
@@ -1386,6 +1386,7 @@ static int cxusb_mygica_t230_frontend_attach(struct dvb_usb_adapter *adap)
|
||||
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;
|
||||
@@ -1641,6 +1642,7 @@ static void cxusb_disconnect(struct usb_interface *intf)
|
||||
{
|
||||
struct dvb_usb_device *d = usb_get_intfdata(intf);
|
||||
struct cxusb_state *st = d->priv;
|
||||
+#if 0
|
||||
struct i2c_client *client;
|
||||
|
||||
/* remove I2C client for tuner */
|
||||
@@ -1656,7 +1658,7 @@ static void cxusb_disconnect(struct usb_interface *intf)
|
||||
module_put(client->dev.driver->owner);
|
||||
i2c_unregister_device(client);
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
dvb_usb_device_exit(intf);
|
||||
}
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user