TononixOS/ubports_kernel_google_msm
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

media: dvb: mpq: Extended and unified parameters of demux module

Browse Source 
Demux parameters were unified to have same semantics across
different demux plugins. Extended the parameters to add option
to invert the tsif clock signal.

Change-Id: I1b253d27353feb0b9c9214fcfafb8b257da6528e
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
This commit is contained in:
Hamad Kadmany
2012-10-25 11:39:54 +02:00
committed by Stephen Boyd
parent df7e43cddf
commit c39b1f2dfd
2 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tsif.c
View File

@@ -30,15 +30,16 @@
#define DMX_TSIF_CHUNKS_IN_BUF 16
#define DMX_TSIF_TIME_LIMIT 10000
/* TSIF_DRIVER_MODE: 3 means manual control from debugfs. use 1 normally. */
#define DMX_TSIF_DRIVER_MODE_DEF 1
/* TSIF_DRIVER_MODE: 3 means manual control from debugfs. use 2 normally. */
#define DMX_TSIF_DRIVER_MODE_DEF 2
/* module parameters for load time configuration: */
static int threshold = DMX_TSIF_PACKETS_IN_CHUNK_DEF;
static int mode = DMX_TSIF_DRIVER_MODE_DEF;
static int tsif_mode = DMX_TSIF_DRIVER_MODE_DEF;
static int clock_inv;
module_param(threshold, int, S_IRUGO);
module_param(mode, int, S_IRUGO);
module_param(tsif_mode, int, S_IRUGO);
module_param(clock_inv, int, S_IRUGO);
/*
* Work scheduled each time TSIF notifies dmx
@@ -273,7 +274,6 @@ static int mpq_tsif_dmx_start(struct mpq_demux *mpq_demux)
tsif_driver = &(mpq_dmx_tsif_info.tsif[tsif].tsif_driver);
/* Attach to TSIF driver */
tsif_driver->tsif_handler =
tsif_attach(tsif, mpq_tsif_callback, (void *)tsif);
if (IS_ERR_OR_NULL(tsif_driver->tsif_handler)) {
@@ -284,12 +284,19 @@ static int mpq_tsif_dmx_start(struct mpq_demux *mpq_demux)
return -ENODEV;
}
ret = tsif_set_clk_inverse(tsif_driver->tsif_handler,
clock_inv);
if (ret < 0) {
MPQ_DVB_ERR_PRINT(
"%s: tsif_set_clk_inverse (%d) failed\n",
__func__, clock_inv);
}
/* Set TSIF driver mode */
ret = tsif_set_mode(tsif_driver->tsif_handler,
mode);
ret = tsif_set_mode(tsif_driver->tsif_handler, tsif_mode);
if (ret < 0) {
MPQ_DVB_ERR_PRINT("%s: tsif_set_mode (%d) failed\n",
__func__, mode);
__func__, tsif_mode);
}
/* Set TSIF buffer configuration */
@@ -304,18 +311,6 @@ static int mpq_tsif_dmx_start(struct mpq_demux *mpq_demux)
MPQ_DVB_ERR_PRINT("Using default TSIF driver values\n");
}
/* Set TSIF driver time limit */
/* TODO: needed?? */
/* ret = tsif_set_time_limit(tsif_driver->tsif_handler,
DMX_TSIF_TIME_LIMIT);
if (ret < 0) {
MPQ_DVB_ERR_PRINT(
"%s: tsif_set_time_limit (%d) failed\n",
__func__, DMX_TSIF_TIME_LIMIT);
}
*/
/* Start TSIF driver */
ret = tsif_start(tsif_driver->tsif_handler);
if (ret < 0) {
@@ -705,11 +700,11 @@ static int __init mpq_dmx_tsif_plugin_init(void)
__func__, DMX_TSIF_PACKETS_IN_CHUNK_DEF);
threshold = DMX_TSIF_PACKETS_IN_CHUNK_DEF;
}
if ((mode < 1) || (mode > 3)) {
if ((tsif_mode < 1) || (tsif_mode > 3)) {
MPQ_DVB_ERR_PRINT(
"%s: invalid mode parameter, using %d instead\n",
__func__, DMX_TSIF_DRIVER_MODE_DEF);
mode = DMX_TSIF_DRIVER_MODE_DEF;
tsif_mode = DMX_TSIF_DRIVER_MODE_DEF;
}
for (i = 0; i < TSIF_COUNT; i++) {

24
drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tspp_v1.c
View File

@@ -66,10 +66,10 @@
#define TSPP_CHANNEL_TIMEOUT 16
/* module parameters for load time configuration */
static int tsif0_mode = TSPP_TSIF_MODE_2;
static int tsif1_mode = TSPP_TSIF_MODE_2;
module_param(tsif0_mode, int, S_IRUGO);
module_param(tsif1_mode, int, S_IRUGO);
static int clock_inv;
static int tsif_mode = 2;
module_param(tsif_mode, int, S_IRUGO);
module_param(clock_inv, int, S_IRUGO);
/*
* Work scheduled each time TSPP notifies dmx
@@ -279,20 +279,30 @@ static int mpq_tspp_dmx_add_channel(struct dvb_demux_feed *feed)
int channel_id;
int *channel_ref_count;
tspp_source.clk_inverse = 0;
tspp_source.clk_inverse = clock_inv;
tspp_source.data_inverse = 0;
tspp_source.sync_inverse = 0;
tspp_source.enable_inverse = 0;
switch (tsif_mode) {
case 1:
tspp_source.mode = TSPP_TSIF_MODE_1;
break;
case 2:
tspp_source.mode = TSPP_TSIF_MODE_2;
break;
default:
tspp_source.mode = TSPP_TSIF_MODE_LOOPBACK;
break;
}
/* determine the TSIF we are reading from */
if (mpq_demux->source == DMX_SOURCE_FRONT0) {
tsif = 0;
tspp_source.source = TSPP_SOURCE_TSIF0;
tspp_source.mode = (enum tspp_tsif_mode)tsif0_mode;
} else if (mpq_demux->source == DMX_SOURCE_FRONT1) {
tsif = 1;
tspp_source.source = TSPP_SOURCE_TSIF1;
tspp_source.mode = (enum tspp_tsif_mode)tsif1_mode;
} else {
/* invalid source */
MPQ_DVB_ERR_PRINT(