This device presents an IR buffer, which can be read and cleared.
Clearing the buffer is racey with receiving IR, so wait until the IR
message is finished before clearing it.
This should minimize the chance of the buffer clear happening while
IR is being received, although we cannot avoid this completely.
Signed-off-by: Sean Young <sean@xxxxxxxx>
---
drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 27 +++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index 60e5153fcb24c..a83b1107fc7fd 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -1720,6 +1720,7 @@ static int rtl2832u_rc_query(struct dvb_usb_device *d)
{IR_RX_BUF_CTRL, 0x80, 0xff},
{IR_RX_CTRL, 0x80, 0xff},
};
+ u32 idle_length;
/* init remote controller */
if (!dev->rc_active) {
@@ -1770,6 +1771,28 @@ static int rtl2832u_rc_query(struct dvb_usb_device *d)
if (ret)
goto err;
+ dev_dbg(&d->intf->dev, "IR_RX_BUF=%*ph\n", len, buf);
+
+ /* if the receiver is not idle yet, do not process */
+ idle_length = 0;
+ if (len > 2) {
+ if (!(buf[len - 1] & 0x80))
+ idle_length += buf[len - 1];
+ if (!(buf[len - 2] & 0x80))
+ idle_length += buf[len - 2];
+ }
+
+ if (idle_length < 0xbf) {
+ /*
+ * If the IR does not end with a space equal to the idle
+ * length, then the IR is not complete yet and more is to
+ * arrive shortly. If we process it and flush the buffer now,
+ * we end up missing IR.
+ */
+ dev_dbg(&d->intf->dev, "ignoring idle=%x\n", idle_length);
+ return 0;
+ }
+
/* let hw receive new code */
for (i = 0; i < ARRAY_SIZE(refresh_tab); i++) {
ret = rtl28xxu_wr_reg_mask(d, refresh_tab[i].reg,
@@ -1807,10 +1830,10 @@ static int rtl2832u_get_rc_config(struct dvb_usb_device *d,
rc->allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER;
rc->driver_type = RC_DRIVER_IR_RAW;
rc->query = rtl2832u_rc_query;
- rc->interval = 200;
+ rc->interval = 100;
/* we program idle len to 0xc0, set timeout to one less */
rc->rawir_timeout = 0xbf * 51;
- rc->keyup_delay = MS_TO_US(210);
+ rc->keyup_delay = MS_TO_US(110);
return 0;
}
--
2.34.1
