summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorSean Young2016-12-02 18:16:12 +0100
committerMauro Carvalho Chehab2017-01-30 15:08:40 +0100
commit56a6036c5fcb784290edde050baacddb168f4a33 (patch)
treeef2340ffde51017b08b3cc979b1ef7cf12ffb403 /drivers/media/rc
parent[media] serial_ir: generate timeout (diff)
downloadkernel-qcow2-linux-56a6036c5fcb784290edde050baacddb168f4a33.tar.gz
kernel-qcow2-linux-56a6036c5fcb784290edde050baacddb168f4a33.tar.xz
kernel-qcow2-linux-56a6036c5fcb784290edde050baacddb168f4a33.zip
[media] rc: allow software timeout to be set
Both the iguanair and the technotrend usb ir do not do any timeout handling in hardware, so timeout is entirely done in ir_raw_event_store_with_filter(). Any sensible timeout value will do, so allow it to be set using LIRC_SET_REC_TIMEOUT. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/iguanair.c4
-rw-r--r--drivers/media/rc/ttusbir.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
index 6de27a21ae8c..9554585df8b8 100644
--- a/drivers/media/rc/iguanair.c
+++ b/drivers/media/rc/iguanair.c
@@ -500,7 +500,9 @@ static int iguanair_probe(struct usb_interface *intf,
rc->tx_ir = iguanair_tx;
rc->driver_name = DRIVER_NAME;
rc->map_name = RC_MAP_RC6_MCE;
- rc->timeout = MS_TO_NS(100);
+ rc->min_timeout = 1;
+ rc->timeout = IR_DEFAULT_TIMEOUT;
+ rc->max_timeout = 10 * IR_DEFAULT_TIMEOUT;
rc->rx_resolution = RX_RESOLUTION;
iguanair_set_tx_carrier(rc, 38000);
diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
index 066c12a4f0e9..bc7c091d6572 100644
--- a/drivers/media/rc/ttusbir.c
+++ b/drivers/media/rc/ttusbir.c
@@ -318,7 +318,10 @@ static int ttusbir_probe(struct usb_interface *intf,
rc->priv = tt;
rc->driver_name = DRIVER_NAME;
rc->map_name = RC_MAP_TT_1500;
- rc->timeout = MS_TO_NS(100);
+ rc->min_timeout = 1;
+ rc->timeout = IR_DEFAULT_TIMEOUT;
+ rc->max_timeout = 10 * IR_DEFAULT_TIMEOUT;
+
/*
* The precision is NS_PER_BIT, but since every 8th bit can be
* overwritten with garbage the accuracy is at best 2 * NS_PER_BIT.