mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #2913 from MilhouseVH/le90_linux4180_rpi
linux (RPi): update to 4.18.10
This commit is contained in:
CvH
GitHub
commit
9f142fb457
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="70c60c5c57d9d639fbd92276f18558ada51b7c53"
|
||||
PKG_SHA256="a7acec466e98eb80058d7fcf7a77c265460dcbfa2aef73dc9dd18c1f3fda3874"
|
||||
PKG_VERSION="404dfef3b364b4533f70659eafdcefa3b68cd7ae"
|
||||
PKG_SHA256="cebc11e59fda3dcbf439f19ca7d65252f84cbb3106114a49f4c3ad36260fef43"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
||||
@ -41,8 +41,8 @@ case "$LINUX" in
|
||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||
;;
|
||||
raspberrypi)
|
||||
PKG_VERSION="27e84c625ebbdfccf78220f2f90995a050c7b64a" # 4.14.69
|
||||
PKG_SHA256="fd75cc94436ed88133d1e3567473fd0e9a3412497d6b335de6ec953968e22fcc"
|
||||
PKG_VERSION="d2b2e0421388d5b7acd1cba9bd197ff0ebee95ae" # 4.18.10
|
||||
PKG_SHA256="4013f17aed011b69cac4ca940e0b7a188e701aea8b70ffef14fc3196da091157"
|
||||
PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
|
||||
;;
|
||||
|
||||
@ -1,27 +1,20 @@
|
||||
From fde8c33acb5aabfc6143bff06ffcd241258fcbc4 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Rusak <lorusak@gmail.com>
|
||||
Date: Sun, 6 May 2018 22:03:11 -0700
|
||||
Subject: [PATCH] HID: add ouya HID driver
|
||||
commit 5a596921a4636e62843a59b7eab7b87b70a6d296
|
||||
Author: Lukas Rusak <lorusak@gmail.com>
|
||||
Date: Sun May 6 22:03:11 2018 -0700
|
||||
|
||||
HID: add ouya HID driver
|
||||
|
||||
This driver is a simple implementation to get the controller working and mapped properly.
|
||||
This driver does not include functionality for the touchpad (yet). The original driver
|
||||
was taken from from the ouya linux tree and has been simplified. It seems there may have
|
||||
been other versions of the controller present that had a broken report descriptor. I have
|
||||
removed that for now.
|
||||
---
|
||||
drivers/hid/Kconfig | 6 ++
|
||||
drivers/hid/Makefile | 1 +
|
||||
drivers/hid/hid-core.c | 3 +
|
||||
drivers/hid/hid-ids.h | 3 +
|
||||
drivers/hid/hid-ouya.c | 131 +++++++++++++++++++++++++++++++++++++++++
|
||||
5 files changed, 144 insertions(+)
|
||||
create mode 100644 drivers/hid/hid-ouya.c
|
||||
|
||||
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
|
||||
index 374301fcbc86..7c7d7a5d5b98 100644
|
||||
index 60252fd796f6..6be2c454e72e 100644
|
||||
--- a/drivers/hid/Kconfig
|
||||
+++ b/drivers/hid/Kconfig
|
||||
@@ -633,6 +633,12 @@ config HID_ORTEK
|
||||
@@ -659,6 +659,12 @@ config HID_ORTEK
|
||||
- Ortek WKB-2000
|
||||
- Skycable wireless presenter
|
||||
|
||||
@ -35,10 +28,10 @@ index 374301fcbc86..7c7d7a5d5b98 100644
|
||||
tristate "Pantherlord/GreenAsia game controller"
|
||||
depends on HID
|
||||
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
|
||||
index 235bd2a7b333..d3431f77b743 100644
|
||||
index 17a8bd97da9d..4425890934e4 100644
|
||||
--- a/drivers/hid/Makefile
|
||||
+++ b/drivers/hid/Makefile
|
||||
@@ -68,6 +68,7 @@ obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o
|
||||
@@ -71,6 +71,7 @@ obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o
|
||||
obj-$(CONFIG_HID_NTI) += hid-nti.o
|
||||
obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o
|
||||
obj-$(CONFIG_HID_ORTEK) += hid-ortek.o
|
||||
@ -46,25 +39,11 @@ index 235bd2a7b333..d3431f77b743 100644
|
||||
obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o
|
||||
obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
|
||||
obj-$(CONFIG_HID_PENMOUNT) += hid-penmount.o
|
||||
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
||||
index 330ca983828b..3a1d94bc1ea6 100644
|
||||
--- a/drivers/hid/hid-core.c
|
||||
+++ b/drivers/hid/hid-core.c
|
||||
@@ -2222,6 +2222,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
|
||||
#endif
|
||||
+#if IS_ENABLED(CONFIG_HID_OUYA)
|
||||
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_OUYA, USB_DEVICE_ID_OUYA_CONTROLLER) },
|
||||
+#endif
|
||||
#if IS_ENABLED(CONFIG_HID_PANTHERLORD)
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index be2e005c3c51..21732ac85740 100644
|
||||
index 0b5cc910f62e..0528efb825fa 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -833,6 +833,9 @@
|
||||
@@ -859,6 +859,9 @@
|
||||
#define USB_DEVICE_ID_ORTEK_WKB2000 0x2000
|
||||
#define USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S 0x8003
|
||||
|
||||
@ -211,6 +190,17 @@ index 000000000000..4344a47b40af
|
||||
+MODULE_AUTHOR("Lukas Rusak <lorusak@gmail.com>");
|
||||
+MODULE_AUTHOR("Gregorios Leach <optikflux@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Ouya Controller Driver");
|
||||
--
|
||||
2.17.0
|
||||
|
||||
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
|
||||
index 587e2681a53f..b5adc13e0df1 100644
|
||||
--- a/drivers/hid/hid-quirks.c
|
||||
+++ b/drivers/hid/hid-quirks.c
|
||||
@@ -538,6 +538,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
|
||||
#endif
|
||||
+#if IS_ENABLED(CONFIG_HID_OUYA)
|
||||
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_OUYA, USB_DEVICE_ID_OUYA_CONTROLLER) },
|
||||
+#endif
|
||||
#if IS_ENABLED(CONFIG_HID_PANTHERLORD)
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
|
||||
|
||||
@ -1,177 +0,0 @@
|
||||
From 91310f578291eabef1316eed38f79b05b8eaf568 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Mon, 19 Jun 2017 20:01:53 +0100
|
||||
Subject: [PATCH] Spinel Plus remote 0.2
|
||||
|
||||
---
|
||||
drivers/hid/Kconfig | 6 +++
|
||||
drivers/hid/Makefile | 1 +
|
||||
drivers/hid/hid-core.c | 4 ++
|
||||
drivers/hid/hid-ids.h | 4 ++
|
||||
drivers/hid/hid-spinelplus.c | 95 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
5 files changed, 110 insertions(+)
|
||||
create mode 100644 drivers/hid/hid-spinelplus.c
|
||||
|
||||
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
|
||||
index 84500fd..6b625cf 100644
|
||||
--- a/drivers/hid/Kconfig
|
||||
+++ b/drivers/hid/Kconfig
|
||||
@@ -808,6 +808,12 @@ config HID_STEELSERIES
|
||||
---help---
|
||||
Support for Steelseries SRW-S1 steering wheel
|
||||
|
||||
+config HID_SPINELPLUS
|
||||
+ tristate "Spinel Plus remote control"
|
||||
+ depends on USB_HID
|
||||
+ ---help---
|
||||
+ Say Y here if you have a Spinel Plus (0471:206c/20cc/0613/2168) remote
|
||||
+
|
||||
config HID_SUNPLUS
|
||||
tristate "Sunplus wireless desktop"
|
||||
depends on HID
|
||||
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
|
||||
index 4e22940..3205d88 100644
|
||||
--- a/drivers/hid/Makefile
|
||||
+++ b/drivers/hid/Makefile
|
||||
@@ -92,6 +92,7 @@ obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
|
||||
obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
|
||||
obj-$(CONFIG_HID_SONY) += hid-sony.o
|
||||
obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o
|
||||
+obj-$(CONFIG_HID_SPINELPLUS) += hid-spinelplus.o
|
||||
obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
|
||||
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
|
||||
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
|
||||
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
||||
index 32bcb50..11985b4 100644
|
||||
--- a/drivers/hid/hid-core.c
|
||||
+++ b/drivers/hid/hid-core.c
|
||||
@@ -2291,6 +2291,10 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
#if IS_ENABLED(CONFIG_HID_ZYDACRON)
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) },
|
||||
#endif
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_4) },
|
||||
{ }
|
||||
};
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index f3cd724..b67d5e5 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -841,6 +841,10 @@
|
||||
|
||||
#define USB_VENDOR_ID_PHILIPS 0x0471
|
||||
#define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617
|
||||
+#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1 0x206c
|
||||
+#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2 0x20cc
|
||||
+#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3 0x0613
|
||||
+#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_4 0x2168
|
||||
|
||||
#define USB_VENDOR_ID_PI_ENGINEERING 0x05f3
|
||||
#define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff
|
||||
diff --git a/drivers/hid/hid-spinelplus.c b/drivers/hid/hid-spinelplus.c
|
||||
new file mode 100644
|
||||
index 0000000..381c7b3
|
||||
--- /dev/null
|
||||
+++ b/drivers/hid/hid-spinelplus.c
|
||||
@@ -0,0 +1,95 @@
|
||||
+/*
|
||||
+ * HID driver for "PHILIPS MCE USB IR Receiver- Spinel plus" remotes
|
||||
+ *
|
||||
+ * Copyright (c) 2010 Panagiotis Skintzos
|
||||
+ *
|
||||
+ * Renamed to Spinel, cleanup and modified to also support
|
||||
+ * Spinel Plus 0471:20CC by Stephan Raue 2012.
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License as published by the Free
|
||||
+ * Software Foundation; either version 2 of the License, or (at your option)
|
||||
+ * any later version.
|
||||
+ */
|
||||
+
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/input.h>
|
||||
+#include <linux/hid.h>
|
||||
+#include <linux/module.h>
|
||||
+
|
||||
+#include "hid-ids.h"
|
||||
+
|
||||
+#define spinelplus_map_key(c) set_bit(EV_REP, hi->input->evbit); \
|
||||
+ hid_map_usage_clear(hi, usage, bit, max, EV_KEY, (c))
|
||||
+
|
||||
+static int spinelplus_input_mapping(struct hid_device *hdev,
|
||||
+ struct hid_input *hi, struct hid_field *field, struct hid_usage *usage,
|
||||
+ unsigned long **bit, int *max)
|
||||
+{
|
||||
+ switch (usage->hid) {
|
||||
+ case 0xffbc000d: spinelplus_map_key(KEY_MEDIA); break;
|
||||
+ case 0xffbc0024: spinelplus_map_key(KEY_MEDIA); break;
|
||||
+ case 0xffbc0027: spinelplus_map_key(KEY_ZOOM); break;
|
||||
+ case 0xffbc0033: spinelplus_map_key(KEY_HOME); break;
|
||||
+ case 0xffbc0035: spinelplus_map_key(KEY_CAMERA); break;
|
||||
+ case 0xffbc0036: spinelplus_map_key(KEY_EPG); break;
|
||||
+ case 0xffbc0037: spinelplus_map_key(KEY_DVD); break;
|
||||
+ case 0xffbc0038: spinelplus_map_key(KEY_HOME); break;
|
||||
+ case 0xffbc0039: spinelplus_map_key(KEY_MP3); break;
|
||||
+ case 0xffbc003a: spinelplus_map_key(KEY_VIDEO); break;
|
||||
+ case 0xffbc005a: spinelplus_map_key(KEY_TEXT); break;
|
||||
+ case 0xffbc005b: spinelplus_map_key(KEY_RED); break;
|
||||
+ case 0xffbc005c: spinelplus_map_key(KEY_GREEN); break;
|
||||
+ case 0xffbc005d: spinelplus_map_key(KEY_YELLOW); break;
|
||||
+ case 0xffbc005e: spinelplus_map_key(KEY_BLUE); break;
|
||||
+ default:
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+static int spinelplus_probe(struct hid_device *hdev,
|
||||
+ const struct hid_device_id *id)
|
||||
+{
|
||||
+ int ret;
|
||||
+ /* Connect only to hid input (not hiddev & hidraw)*/
|
||||
+ unsigned int cmask = HID_CONNECT_HIDINPUT;
|
||||
+
|
||||
+ ret = hid_parse(hdev);
|
||||
+ if (ret) {
|
||||
+ dev_err(&hdev->dev, "parse failed\n");
|
||||
+ goto err_free;
|
||||
+ }
|
||||
+
|
||||
+ ret = hid_hw_start(hdev, cmask);
|
||||
+ if (ret) {
|
||||
+ dev_err(&hdev->dev, "hw start failed\n");
|
||||
+ goto err_free;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+err_free:
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static const struct hid_device_id spinelplus_devices[] = {
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_4) },
|
||||
+ { }
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(hid, spinelplus_devices);
|
||||
+
|
||||
+static struct hid_driver spinelplus_driver = {
|
||||
+ .name = "SpinelPlus",
|
||||
+ .id_table = spinelplus_devices,
|
||||
+ .input_mapping = spinelplus_input_mapping,
|
||||
+ .probe = spinelplus_probe,
|
||||
+};
|
||||
+
|
||||
+module_hid_driver(spinelplus_driver);
|
||||
+
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,896 +0,0 @@
|
||||
From 8ff44dfe7971a9ed7308945c0d609a54be5051a2 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Tue, 27 Mar 2018 19:35:11 +0200
|
||||
Subject: [PATCH 01/10] media: rc: set timeout to smallest value required by
|
||||
enabled protocols
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/48516/
|
||||
|
||||
The longer the IR timeout, the longer the rc device waits until delivering
|
||||
the trailing space. So, by reducing this timeout, we reduce the delay for
|
||||
the last scancode to be delivered.
|
||||
|
||||
Note that the lirc daemon disables all protocols, in which case we revert
|
||||
back to the default value.
|
||||
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/ir-jvc-decoder.c | 1 +
|
||||
drivers/media/rc/ir-mce_kbd-decoder.c | 1 +
|
||||
drivers/media/rc/ir-nec-decoder.c | 1 +
|
||||
drivers/media/rc/ir-rc5-decoder.c | 1 +
|
||||
drivers/media/rc/ir-rc6-decoder.c | 1 +
|
||||
drivers/media/rc/ir-sanyo-decoder.c | 1 +
|
||||
drivers/media/rc/ir-sharp-decoder.c | 1 +
|
||||
drivers/media/rc/ir-sony-decoder.c | 1 +
|
||||
drivers/media/rc/ir-xmp-decoder.c | 1 +
|
||||
drivers/media/rc/rc-core-priv.h | 1 +
|
||||
drivers/media/rc/rc-ir-raw.c | 31 ++++++++++++++++++++++++++++++-
|
||||
drivers/media/rc/rc-main.c | 12 ++++++------
|
||||
12 files changed, 46 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
|
||||
index e2bd68c..fc931fe 100644
|
||||
--- a/drivers/media/rc/ir-jvc-decoder.c
|
||||
+++ b/drivers/media/rc/ir-jvc-decoder.c
|
||||
@@ -212,6 +212,7 @@ static struct ir_raw_handler jvc_handler = {
|
||||
.protocols = RC_PROTO_BIT_JVC,
|
||||
.decode = ir_jvc_decode,
|
||||
.encode = ir_jvc_encode,
|
||||
+ .max_space = JVC_TRAILER_SPACE,
|
||||
};
|
||||
|
||||
static int __init ir_jvc_decode_init(void)
|
||||
diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
index 2a1728e..04c0c28 100644
|
||||
--- a/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
+++ b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
@@ -476,6 +476,7 @@ static struct ir_raw_handler mce_kbd_handler = {
|
||||
.encode = ir_mce_kbd_encode,
|
||||
.raw_register = ir_mce_kbd_register,
|
||||
.raw_unregister = ir_mce_kbd_unregister,
|
||||
+ .max_space = MCIR2_MAX_LEN,
|
||||
};
|
||||
|
||||
static int __init ir_mce_kbd_decode_init(void)
|
||||
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
|
||||
index a95d09a..3e12059 100644
|
||||
--- a/drivers/media/rc/ir-nec-decoder.c
|
||||
+++ b/drivers/media/rc/ir-nec-decoder.c
|
||||
@@ -264,6 +264,7 @@ static struct ir_raw_handler nec_handler = {
|
||||
RC_PROTO_BIT_NEC32,
|
||||
.decode = ir_nec_decode,
|
||||
.encode = ir_nec_encode,
|
||||
+ .max_space = NEC_TRAILER_SPACE,
|
||||
};
|
||||
|
||||
static int __init ir_nec_decode_init(void)
|
||||
diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c
|
||||
index 1292f53..1eaca05 100644
|
||||
--- a/drivers/media/rc/ir-rc5-decoder.c
|
||||
+++ b/drivers/media/rc/ir-rc5-decoder.c
|
||||
@@ -282,6 +282,7 @@ static struct ir_raw_handler rc5_handler = {
|
||||
RC_PROTO_BIT_RC5_SZ,
|
||||
.decode = ir_rc5_decode,
|
||||
.encode = ir_rc5_encode,
|
||||
+ .max_space = RC5_TRAILER,
|
||||
};
|
||||
|
||||
static int __init ir_rc5_decode_init(void)
|
||||
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
|
||||
index 5d0d2fe..8c4c733 100644
|
||||
--- a/drivers/media/rc/ir-rc6-decoder.c
|
||||
+++ b/drivers/media/rc/ir-rc6-decoder.c
|
||||
@@ -408,6 +408,7 @@ static struct ir_raw_handler rc6_handler = {
|
||||
RC_PROTO_BIT_RC6_MCE,
|
||||
.decode = ir_rc6_decode,
|
||||
.encode = ir_rc6_encode,
|
||||
+ .max_space = RC6_SUFFIX_SPACE,
|
||||
};
|
||||
|
||||
static int __init ir_rc6_decode_init(void)
|
||||
diff --git a/drivers/media/rc/ir-sanyo-decoder.c b/drivers/media/rc/ir-sanyo-decoder.c
|
||||
index 758c609..935880d 100644
|
||||
--- a/drivers/media/rc/ir-sanyo-decoder.c
|
||||
+++ b/drivers/media/rc/ir-sanyo-decoder.c
|
||||
@@ -218,6 +218,7 @@ static struct ir_raw_handler sanyo_handler = {
|
||||
.protocols = RC_PROTO_BIT_SANYO,
|
||||
.decode = ir_sanyo_decode,
|
||||
.encode = ir_sanyo_encode,
|
||||
+ .max_space = SANYO_TRAILER_SPACE,
|
||||
};
|
||||
|
||||
static int __init ir_sanyo_decode_init(void)
|
||||
diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c
|
||||
index 129b558..96d818b 100644
|
||||
--- a/drivers/media/rc/ir-sharp-decoder.c
|
||||
+++ b/drivers/media/rc/ir-sharp-decoder.c
|
||||
@@ -226,6 +226,7 @@ static struct ir_raw_handler sharp_handler = {
|
||||
.protocols = RC_PROTO_BIT_SHARP,
|
||||
.decode = ir_sharp_decode,
|
||||
.encode = ir_sharp_encode,
|
||||
+ .max_space = SHARP_ECHO_SPACE,
|
||||
};
|
||||
|
||||
static int __init ir_sharp_decode_init(void)
|
||||
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
|
||||
index a47ced7..d57d15b 100644
|
||||
--- a/drivers/media/rc/ir-sony-decoder.c
|
||||
+++ b/drivers/media/rc/ir-sony-decoder.c
|
||||
@@ -221,6 +221,7 @@ static struct ir_raw_handler sony_handler = {
|
||||
RC_PROTO_BIT_SONY20,
|
||||
.decode = ir_sony_decode,
|
||||
.encode = ir_sony_encode,
|
||||
+ .max_space = SONY_TRAILER_SPACE,
|
||||
};
|
||||
|
||||
static int __init ir_sony_decode_init(void)
|
||||
diff --git a/drivers/media/rc/ir-xmp-decoder.c b/drivers/media/rc/ir-xmp-decoder.c
|
||||
index 6f464be..1ac3a4c 100644
|
||||
--- a/drivers/media/rc/ir-xmp-decoder.c
|
||||
+++ b/drivers/media/rc/ir-xmp-decoder.c
|
||||
@@ -198,6 +198,7 @@ static int ir_xmp_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||
static struct ir_raw_handler xmp_handler = {
|
||||
.protocols = RC_PROTO_BIT_XMP,
|
||||
.decode = ir_xmp_decode,
|
||||
+ .max_space = XMP_TRAILER_SPACE,
|
||||
};
|
||||
|
||||
static int __init ir_xmp_decode_init(void)
|
||||
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
|
||||
index 7da9c96..5fd3b5a 100644
|
||||
--- a/drivers/media/rc/rc-core-priv.h
|
||||
+++ b/drivers/media/rc/rc-core-priv.h
|
||||
@@ -29,6 +29,7 @@ struct ir_raw_handler {
|
||||
int (*decode)(struct rc_dev *dev, struct ir_raw_event event);
|
||||
int (*encode)(enum rc_proto protocol, u32 scancode,
|
||||
struct ir_raw_event *events, unsigned int max);
|
||||
+ u32 max_space;
|
||||
|
||||
/* These two should only be used by the lirc decoder */
|
||||
int (*raw_register)(struct rc_dev *dev);
|
||||
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
|
||||
index 503bc42..7f0197b 100644
|
||||
--- a/drivers/media/rc/rc-ir-raw.c
|
||||
+++ b/drivers/media/rc/rc-ir-raw.c
|
||||
@@ -215,7 +215,36 @@ ir_raw_get_allowed_protocols(void)
|
||||
|
||||
static int change_protocol(struct rc_dev *dev, u64 *rc_proto)
|
||||
{
|
||||
- /* the caller will update dev->enabled_protocols */
|
||||
+ struct ir_raw_handler *handler;
|
||||
+ u32 timeout = 0;
|
||||
+
|
||||
+ if (!dev->max_timeout)
|
||||
+ return 0;
|
||||
+
|
||||
+ mutex_lock(&ir_raw_handler_lock);
|
||||
+ list_for_each_entry(handler, &ir_raw_handler_list, list) {
|
||||
+ if (handler->protocols & *rc_proto) {
|
||||
+ if (timeout < handler->max_space)
|
||||
+ timeout = handler->max_space;
|
||||
+ }
|
||||
+ }
|
||||
+ mutex_unlock(&ir_raw_handler_lock);
|
||||
+
|
||||
+ if (timeout == 0)
|
||||
+ timeout = IR_DEFAULT_TIMEOUT;
|
||||
+ else
|
||||
+ timeout += MS_TO_NS(20);
|
||||
+
|
||||
+ if (timeout < dev->min_timeout)
|
||||
+ timeout = dev->min_timeout;
|
||||
+ else if (timeout > dev->max_timeout)
|
||||
+ timeout = dev->max_timeout;
|
||||
+
|
||||
+ if (dev->s_timeout)
|
||||
+ dev->s_timeout(dev, timeout);
|
||||
+ else
|
||||
+ dev->timeout = timeout;
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
|
||||
index 72f3815..e7e20bc 100644
|
||||
--- a/drivers/media/rc/rc-main.c
|
||||
+++ b/drivers/media/rc/rc-main.c
|
||||
@@ -1161,6 +1161,9 @@ static ssize_t store_protocols(struct device *device,
|
||||
if (rc < 0)
|
||||
goto out;
|
||||
|
||||
+ if (dev->driver_type == RC_DRIVER_IR_RAW)
|
||||
+ ir_raw_load_modules(&new_protocols);
|
||||
+
|
||||
rc = dev->change_protocol(dev, &new_protocols);
|
||||
if (rc < 0) {
|
||||
IR_dprintk(1, "Error setting protocols to 0x%llx\n",
|
||||
@@ -1168,9 +1171,6 @@ static ssize_t store_protocols(struct device *device,
|
||||
goto out;
|
||||
}
|
||||
|
||||
- if (dev->driver_type == RC_DRIVER_IR_RAW)
|
||||
- ir_raw_load_modules(&new_protocols);
|
||||
-
|
||||
if (new_protocols != old_protocols) {
|
||||
*current_protocols = new_protocols;
|
||||
IR_dprintk(1, "Protocols changed to 0x%llx\n",
|
||||
@@ -1638,6 +1638,9 @@ static int rc_prepare_rx_device(struct rc_dev *dev)
|
||||
|
||||
rc_proto = BIT_ULL(rc_map->rc_proto);
|
||||
|
||||
+ if (dev->driver_type == RC_DRIVER_IR_RAW)
|
||||
+ ir_raw_load_modules(&rc_proto);
|
||||
+
|
||||
if (dev->change_protocol) {
|
||||
rc = dev->change_protocol(dev, &rc_proto);
|
||||
if (rc < 0)
|
||||
@@ -1645,9 +1648,6 @@ static int rc_prepare_rx_device(struct rc_dev *dev)
|
||||
dev->enabled_protocols = rc_proto;
|
||||
}
|
||||
|
||||
- if (dev->driver_type == RC_DRIVER_IR_RAW)
|
||||
- ir_raw_load_modules(&rc_proto);
|
||||
-
|
||||
set_bit(EV_KEY, dev->input_dev->evbit);
|
||||
set_bit(EV_REP, dev->input_dev->evbit);
|
||||
set_bit(EV_MSC, dev->input_dev->evbit);
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From c750791828e2842dfc63b2d4fa1a4c6ce2054147 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Tue, 27 Mar 2018 19:45:36 +0200
|
||||
Subject: [PATCH 02/10] media: rc: per-protocol repeat period and minimum keyup
|
||||
timer
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/48520/
|
||||
|
||||
Each IR protocol has its own repeat period. We can minimise the keyup
|
||||
timer to be the protocol period + IR timeout. This makes keys less
|
||||
"sticky" and makes IR more reactive and nicer to use.
|
||||
|
||||
This feature was previously attempted in commit d57ea877af38 ("media: rc:
|
||||
per-protocol repeat period"), but that did not take the IR timeout into
|
||||
account, and had to be reverted.
|
||||
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/cec/cec-core.c | 2 +-
|
||||
drivers/media/rc/ir-lirc-codec.c | 2 +-
|
||||
drivers/media/rc/rc-main.c | 54 +++++++++++++++++++++-------------------
|
||||
3 files changed, 30 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c
|
||||
index 648136e..4cf35e4 100644
|
||||
--- a/drivers/media/cec/cec-core.c
|
||||
+++ b/drivers/media/cec/cec-core.c
|
||||
@@ -280,7 +280,7 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
|
||||
adap->rc->enabled_protocols = RC_PROTO_BIT_CEC;
|
||||
adap->rc->priv = adap;
|
||||
adap->rc->map_name = RC_MAP_CEC;
|
||||
- adap->rc->timeout = MS_TO_NS(100);
|
||||
+ adap->rc->timeout = MS_TO_NS(550);
|
||||
adap->rc_last_scancode = -1;
|
||||
#endif
|
||||
return adap;
|
||||
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
|
||||
index 4c8f456..ef7e430 100644
|
||||
--- a/drivers/media/rc/ir-lirc-codec.c
|
||||
+++ b/drivers/media/rc/ir-lirc-codec.c
|
||||
@@ -314,7 +314,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
|
||||
break;
|
||||
|
||||
case LIRC_SET_REC_TIMEOUT_REPORTS:
|
||||
- if (!dev->timeout)
|
||||
+ if (dev->driver_type != RC_DRIVER_IR_RAW)
|
||||
return -ENOTTY;
|
||||
|
||||
lirc->send_timeout_reports = !!val;
|
||||
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
|
||||
index e7e20bc..36f99a0 100644
|
||||
--- a/drivers/media/rc/rc-main.c
|
||||
+++ b/drivers/media/rc/rc-main.c
|
||||
@@ -35,48 +35,48 @@ static const struct {
|
||||
unsigned int repeat_period;
|
||||
unsigned int scancode_bits;
|
||||
} protocols[] = {
|
||||
- [RC_PROTO_UNKNOWN] = { .name = "unknown", .repeat_period = 250 },
|
||||
- [RC_PROTO_OTHER] = { .name = "other", .repeat_period = 250 },
|
||||
+ [RC_PROTO_UNKNOWN] = { .name = "unknown", .repeat_period = 125 },
|
||||
+ [RC_PROTO_OTHER] = { .name = "other", .repeat_period = 125 },
|
||||
[RC_PROTO_RC5] = { .name = "rc-5",
|
||||
- .scancode_bits = 0x1f7f, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0x1f7f, .repeat_period = 114 },
|
||||
[RC_PROTO_RC5X_20] = { .name = "rc-5x-20",
|
||||
- .scancode_bits = 0x1f7f3f, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0x1f7f3f, .repeat_period = 114 },
|
||||
[RC_PROTO_RC5_SZ] = { .name = "rc-5-sz",
|
||||
- .scancode_bits = 0x2fff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0x2fff, .repeat_period = 114 },
|
||||
[RC_PROTO_JVC] = { .name = "jvc",
|
||||
- .scancode_bits = 0xffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffff, .repeat_period = 125 },
|
||||
[RC_PROTO_SONY12] = { .name = "sony-12",
|
||||
- .scancode_bits = 0x1f007f, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0x1f007f, .repeat_period = 100 },
|
||||
[RC_PROTO_SONY15] = { .name = "sony-15",
|
||||
- .scancode_bits = 0xff007f, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xff007f, .repeat_period = 100 },
|
||||
[RC_PROTO_SONY20] = { .name = "sony-20",
|
||||
- .scancode_bits = 0x1fff7f, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0x1fff7f, .repeat_period = 100 },
|
||||
[RC_PROTO_NEC] = { .name = "nec",
|
||||
- .scancode_bits = 0xffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffff, .repeat_period = 110 },
|
||||
[RC_PROTO_NECX] = { .name = "nec-x",
|
||||
- .scancode_bits = 0xffffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffffff, .repeat_period = 110 },
|
||||
[RC_PROTO_NEC32] = { .name = "nec-32",
|
||||
- .scancode_bits = 0xffffffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffffffff, .repeat_period = 110 },
|
||||
[RC_PROTO_SANYO] = { .name = "sanyo",
|
||||
- .scancode_bits = 0x1fffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0x1fffff, .repeat_period = 125 },
|
||||
[RC_PROTO_MCIR2_KBD] = { .name = "mcir2-kbd",
|
||||
- .scancode_bits = 0xffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffff, .repeat_period = 100 },
|
||||
[RC_PROTO_MCIR2_MSE] = { .name = "mcir2-mse",
|
||||
- .scancode_bits = 0x1fffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0x1fffff, .repeat_period = 100 },
|
||||
[RC_PROTO_RC6_0] = { .name = "rc-6-0",
|
||||
- .scancode_bits = 0xffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffff, .repeat_period = 114 },
|
||||
[RC_PROTO_RC6_6A_20] = { .name = "rc-6-6a-20",
|
||||
- .scancode_bits = 0xfffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xfffff, .repeat_period = 114 },
|
||||
[RC_PROTO_RC6_6A_24] = { .name = "rc-6-6a-24",
|
||||
- .scancode_bits = 0xffffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffffff, .repeat_period = 114 },
|
||||
[RC_PROTO_RC6_6A_32] = { .name = "rc-6-6a-32",
|
||||
- .scancode_bits = 0xffffffff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffffffff, .repeat_period = 114 },
|
||||
[RC_PROTO_RC6_MCE] = { .name = "rc-6-mce",
|
||||
- .scancode_bits = 0xffff7fff, .repeat_period = 250 },
|
||||
+ .scancode_bits = 0xffff7fff, .repeat_period = 114 },
|
||||
[RC_PROTO_SHARP] = { .name = "sharp",
|
||||
- .scancode_bits = 0x1fff, .repeat_period = 250 },
|
||||
- [RC_PROTO_XMP] = { .name = "xmp", .repeat_period = 250 },
|
||||
- [RC_PROTO_CEC] = { .name = "cec", .repeat_period = 550 },
|
||||
+ .scancode_bits = 0x1fff, .repeat_period = 125 },
|
||||
+ [RC_PROTO_XMP] = { .name = "xmp", .repeat_period = 125 },
|
||||
+ [RC_PROTO_CEC] = { .name = "cec", .repeat_period = 0 },
|
||||
};
|
||||
|
||||
/* Used to keep track of known keymaps */
|
||||
@@ -659,7 +659,8 @@ static void ir_timer_keyup(unsigned long cookie)
|
||||
void rc_repeat(struct rc_dev *dev)
|
||||
{
|
||||
unsigned long flags;
|
||||
- unsigned int timeout = protocols[dev->last_protocol].repeat_period;
|
||||
+ unsigned int timeout = nsecs_to_jiffies(dev->timeout) +
|
||||
+ msecs_to_jiffies(protocols[dev->last_protocol].repeat_period);
|
||||
|
||||
spin_lock_irqsave(&dev->keylock, flags);
|
||||
|
||||
@@ -669,7 +670,7 @@ void rc_repeat(struct rc_dev *dev)
|
||||
input_event(dev->input_dev, EV_MSC, MSC_SCAN, dev->last_scancode);
|
||||
input_sync(dev->input_dev);
|
||||
|
||||
- dev->keyup_jiffies = jiffies + msecs_to_jiffies(timeout);
|
||||
+ dev->keyup_jiffies = jiffies + timeout;
|
||||
mod_timer(&dev->timer_keyup, dev->keyup_jiffies);
|
||||
|
||||
out:
|
||||
@@ -740,7 +741,7 @@ void rc_keydown(struct rc_dev *dev, enum rc_proto protocol, u32 scancode,
|
||||
ir_do_keydown(dev, protocol, scancode, keycode, toggle);
|
||||
|
||||
if (dev->keypressed) {
|
||||
- dev->keyup_jiffies = jiffies +
|
||||
+ dev->keyup_jiffies = jiffies + nsecs_to_jiffies(dev->timeout) +
|
||||
msecs_to_jiffies(protocols[protocol].repeat_period);
|
||||
mod_timer(&dev->timer_keyup, dev->keyup_jiffies);
|
||||
}
|
||||
@@ -1553,6 +1554,7 @@ struct rc_dev *rc_allocate_device(enum rc_driver_type type)
|
||||
dev->input_dev->setkeycode = ir_setkeycode;
|
||||
input_set_drvdata(dev->input_dev, dev);
|
||||
|
||||
+ dev->timeout = IR_DEFAULT_TIMEOUT;
|
||||
setup_timer(&dev->timer_keyup, ir_timer_keyup,
|
||||
(unsigned long)dev);
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From b175295d3cc86f88c2bbd04938f690cae475db53 Mon Sep 17 00:00:00 2001
|
||||
From: Sean Young <sean@mess.org>
|
||||
Date: Sun, 8 Apr 2018 22:19:39 +0100
|
||||
Subject: [PATCH 03/10] media: rc: mce_kbd decoder: low timeout values cause
|
||||
double keydowns
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/48522/
|
||||
|
||||
The mce keyboard repeats pressed keys every 100ms. If the IR timeout
|
||||
is set to less than that, we send key up events before the repeat
|
||||
arrives, so we have key up/key down for each IR repeat.
|
||||
|
||||
The keyboard ends any sequence with a 0 scancode, in which case all keys
|
||||
are cleared so there is no need to run the timeout timer: it only exists
|
||||
for the case that the final 0 was not received.
|
||||
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/ir-mce_kbd-decoder.c | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
index 04c0c28..c157682 100644
|
||||
--- a/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
+++ b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
@@ -321,11 +321,13 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||
case MCIR2_KEYBOARD_NBITS:
|
||||
scancode = data->body & 0xffff;
|
||||
IR_dprintk(1, "keyboard data 0x%08x\n", data->body);
|
||||
- if (dev->timeout)
|
||||
- delay = usecs_to_jiffies(dev->timeout / 1000);
|
||||
- else
|
||||
- delay = msecs_to_jiffies(100);
|
||||
- mod_timer(&data->rx_timeout, jiffies + delay);
|
||||
+ if (scancode) {
|
||||
+ delay = nsecs_to_jiffies(dev->timeout) +
|
||||
+ msecs_to_jiffies(100);
|
||||
+ mod_timer(&data->rx_timeout, jiffies + delay);
|
||||
+ } else {
|
||||
+ del_timer(&data->rx_timeout);
|
||||
+ }
|
||||
/* Pass data to keyboard buffer parser */
|
||||
ir_mce_kbd_process_keyboard_data(data->idev, scancode);
|
||||
break;
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From 184b30f98772d4a1fd41572f5764bdef4d345bf7 Mon Sep 17 00:00:00 2001
|
||||
From: Sean Young <sean@mess.org>
|
||||
Date: Sun, 8 Apr 2018 22:19:40 +0100
|
||||
Subject: [PATCH 04/10] media: rc: mce_kbd protocol encodes two scancodes
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/48518/
|
||||
|
||||
If two keys are pressed, then both keys are encoded in the scancode. This
|
||||
makes the mce keyboard more responsive.
|
||||
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/ir-mce_kbd-decoder.c | 21 ++++++++++++---------
|
||||
drivers/media/rc/rc-main.c | 2 +-
|
||||
2 files changed, 13 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
index c157682..164302e 100644
|
||||
--- a/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
+++ b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
@@ -149,13 +149,14 @@ static enum mce_kbd_mode mce_kbd_mode(struct mce_kbd_dec *data)
|
||||
static void ir_mce_kbd_process_keyboard_data(struct input_dev *idev,
|
||||
u32 scancode)
|
||||
{
|
||||
- u8 keydata = (scancode >> 8) & 0xff;
|
||||
+ u8 keydata1 = (scancode >> 8) & 0xff;
|
||||
+ u8 keydata2 = (scancode >> 16) & 0xff;
|
||||
u8 shiftmask = scancode & 0xff;
|
||||
- unsigned char keycode, maskcode;
|
||||
+ unsigned char maskcode;
|
||||
int i, keystate;
|
||||
|
||||
- IR_dprintk(1, "keyboard: keydata = 0x%02x, shiftmask = 0x%02x\n",
|
||||
- keydata, shiftmask);
|
||||
+ IR_dprintk(1, "keyboard: keydata2 = 0x%02x, keydata1 = 0x%02x, shiftmask = 0x%02x\n",
|
||||
+ keydata2, keydata1, shiftmask);
|
||||
|
||||
for (i = 0; i < 7; i++) {
|
||||
maskcode = kbd_keycodes[MCIR2_MASK_KEYS_START + i];
|
||||
@@ -166,10 +167,12 @@ static void ir_mce_kbd_process_keyboard_data(struct input_dev *idev,
|
||||
input_report_key(idev, maskcode, keystate);
|
||||
}
|
||||
|
||||
- if (keydata) {
|
||||
- keycode = kbd_keycodes[keydata];
|
||||
- input_report_key(idev, keycode, 1);
|
||||
- } else {
|
||||
+ if (keydata1)
|
||||
+ input_report_key(idev, kbd_keycodes[keydata1], 1);
|
||||
+ if (keydata2)
|
||||
+ input_report_key(idev, kbd_keycodes[keydata2], 1);
|
||||
+
|
||||
+ if (!keydata1 && !keydata2) {
|
||||
for (i = 0; i < MCIR2_MASK_KEYS_START; i++)
|
||||
input_report_key(idev, kbd_keycodes[i], 0);
|
||||
}
|
||||
@@ -319,7 +322,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||
|
||||
switch (data->wanted_bits) {
|
||||
case MCIR2_KEYBOARD_NBITS:
|
||||
- scancode = data->body & 0xffff;
|
||||
+ scancode = data->body & 0xffffff;
|
||||
IR_dprintk(1, "keyboard data 0x%08x\n", data->body);
|
||||
if (scancode) {
|
||||
delay = nsecs_to_jiffies(dev->timeout) +
|
||||
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
|
||||
index 36f99a0..34cef7a 100644
|
||||
--- a/drivers/media/rc/rc-main.c
|
||||
+++ b/drivers/media/rc/rc-main.c
|
||||
@@ -60,7 +60,7 @@ static const struct {
|
||||
[RC_PROTO_SANYO] = { .name = "sanyo",
|
||||
.scancode_bits = 0x1fffff, .repeat_period = 125 },
|
||||
[RC_PROTO_MCIR2_KBD] = { .name = "mcir2-kbd",
|
||||
- .scancode_bits = 0xffff, .repeat_period = 100 },
|
||||
+ .scancode_bits = 0xffffff, .repeat_period = 100 },
|
||||
[RC_PROTO_MCIR2_MSE] = { .name = "mcir2-mse",
|
||||
.scancode_bits = 0x1fffff, .repeat_period = 100 },
|
||||
[RC_PROTO_RC6_0] = { .name = "rc-6-0",
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From 455d3ec9f3b931f0b78bffdbff2a420891d1c609 Mon Sep 17 00:00:00 2001
|
||||
From: Sean Young <sean@mess.org>
|
||||
Date: Sun, 8 Apr 2018 22:19:42 +0100
|
||||
Subject: [PATCH 05/10] media: rc: mceusb: allow the timeout to be configurable
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/48521/
|
||||
|
||||
mceusb devices have a default timeout of 100ms, but this can be changed.
|
||||
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/mceusb.c | 22 ++++++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
|
||||
index bf7aaff..160754a 100644
|
||||
--- a/drivers/media/rc/mceusb.c
|
||||
+++ b/drivers/media/rc/mceusb.c
|
||||
@@ -937,6 +937,25 @@ static int mceusb_set_tx_carrier(struct rc_dev *dev, u32 carrier)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int mceusb_set_timeout(struct rc_dev *dev, unsigned int timeout)
|
||||
+{
|
||||
+ u8 cmdbuf[4] = { MCE_CMD_PORT_IR, MCE_CMD_SETIRTIMEOUT, 0, 0 };
|
||||
+ struct mceusb_dev *ir = dev->priv;
|
||||
+ unsigned int units;
|
||||
+
|
||||
+ units = DIV_ROUND_CLOSEST(timeout, US_TO_NS(MCE_TIME_UNIT));
|
||||
+
|
||||
+ cmdbuf[2] = units >> 8;
|
||||
+ cmdbuf[3] = units;
|
||||
+
|
||||
+ mce_async_out(ir, cmdbuf, sizeof(cmdbuf));
|
||||
+
|
||||
+ /* get receiver timeout value */
|
||||
+ mce_async_out(ir, GET_RX_TIMEOUT, sizeof(GET_RX_TIMEOUT));
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* We don't do anything but print debug spew for many of the command bits
|
||||
* we receive from the hardware, but some of them are useful information
|
||||
@@ -1268,7 +1287,10 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
|
||||
rc->dev.parent = dev;
|
||||
rc->priv = ir;
|
||||
rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
|
||||
+ rc->min_timeout = US_TO_NS(MCE_TIME_UNIT);
|
||||
rc->timeout = MS_TO_NS(100);
|
||||
+ rc->max_timeout = 10 * IR_DEFAULT_TIMEOUT;
|
||||
+ rc->s_timeout = mceusb_set_timeout;
|
||||
if (!ir->flags.no_tx) {
|
||||
rc->s_tx_mask = mceusb_set_tx_mask;
|
||||
rc->s_tx_carrier = mceusb_set_tx_carrier;
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From a95d47e2c9ae3d8c826ca14fe6973138bf57d0aa Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Sun, 15 Apr 2018 17:26:21 +0200
|
||||
Subject: [PATCH 06/10] media: rc: mce_kbd decoder: remove superfluous call to
|
||||
input_sync
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/48681/
|
||||
|
||||
There is nothing to sync in this code path.
|
||||
|
||||
Reported-by: Matthias Reichl <hias@horus.com>
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/ir-mce_kbd-decoder.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
index 164302e..f057b57 100644
|
||||
--- a/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
+++ b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
@@ -355,7 +355,6 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||
IR_dprintk(1, "failed at state %i (%uus %s)\n",
|
||||
data->state, TO_US(ev.duration), TO_STR(ev.pulse));
|
||||
data->state = STATE_INACTIVE;
|
||||
- input_sync(data->idev);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From fd0375f3b8a3eee6fbc9ea6c570132e5a2feb239 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Sun, 15 Apr 2018 17:38:49 +0200
|
||||
Subject: [PATCH 07/10] media: rc: mce_kbd decoder: fix race condition
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/48680/
|
||||
|
||||
The MCE keyboard sends both key down and key up events. We have a timeout
|
||||
handler mce_kbd_rx_timeout() in case the keyup event is never received;
|
||||
however, this may race with new key down events from occurring.
|
||||
|
||||
The race is that key down scancode arrives and key down events are
|
||||
generated. The timeout handler races this and generates key up events
|
||||
straight afterwards. Since the keyboard generates scancodes every 100ms,
|
||||
most likely the keys will be repeated 100ms later, and now we have new
|
||||
key down events and the user sees duplicate key presses.
|
||||
|
||||
Reported-by: Matthias Reichl <hias@horus.com>
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/ir-mce_kbd-decoder.c | 23 ++++++++++++++++-------
|
||||
drivers/media/rc/rc-core-priv.h | 1 +
|
||||
2 files changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
index f057b57..67c37db 100644
|
||||
--- a/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
+++ b/drivers/media/rc/ir-mce_kbd-decoder.c
|
||||
@@ -120,18 +120,24 @@ static void mce_kbd_rx_timeout(unsigned long data)
|
||||
struct mce_kbd_dec *mce_kbd = (struct mce_kbd_dec *)data;
|
||||
int i;
|
||||
unsigned char maskcode;
|
||||
+ unsigned long flags;
|
||||
|
||||
IR_dprintk(2, "timer callback clearing all keys\n");
|
||||
|
||||
- for (i = 0; i < 7; i++) {
|
||||
- maskcode = kbd_keycodes[MCIR2_MASK_KEYS_START + i];
|
||||
- input_report_key(mce_kbd->idev, maskcode, 0);
|
||||
- }
|
||||
+ spin_lock_irqsave(&mce_kbd->keylock, flags);
|
||||
|
||||
- for (i = 0; i < MCIR2_MASK_KEYS_START; i++)
|
||||
- input_report_key(mce_kbd->idev, kbd_keycodes[i], 0);
|
||||
+ if (time_is_before_eq_jiffies(mce_kbd->rx_timeout.expires)) {
|
||||
+ for (i = 0; i < 7; i++) {
|
||||
+ maskcode = kbd_keycodes[MCIR2_MASK_KEYS_START + i];
|
||||
+ input_report_key(mce_kbd->idev, maskcode, 0);
|
||||
+ }
|
||||
|
||||
- input_sync(mce_kbd->idev);
|
||||
+ for (i = 0; i < MCIR2_MASK_KEYS_START; i++)
|
||||
+ input_report_key(mce_kbd->idev, kbd_keycodes[i], 0);
|
||||
+
|
||||
+ input_sync(mce_kbd->idev);
|
||||
+ }
|
||||
+ spin_unlock_irqrestore(&mce_kbd->keylock, flags);
|
||||
}
|
||||
|
||||
static enum mce_kbd_mode mce_kbd_mode(struct mce_kbd_dec *data)
|
||||
@@ -324,6 +330,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||
case MCIR2_KEYBOARD_NBITS:
|
||||
scancode = data->body & 0xffffff;
|
||||
IR_dprintk(1, "keyboard data 0x%08x\n", data->body);
|
||||
+ spin_lock(&data->keylock);
|
||||
if (scancode) {
|
||||
delay = nsecs_to_jiffies(dev->timeout) +
|
||||
msecs_to_jiffies(100);
|
||||
@@ -333,6 +340,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
||||
}
|
||||
/* Pass data to keyboard buffer parser */
|
||||
ir_mce_kbd_process_keyboard_data(data->idev, scancode);
|
||||
+ spin_unlock(&data->keylock);
|
||||
break;
|
||||
case MCIR2_MOUSE_NBITS:
|
||||
scancode = data->body & 0x1fffff;
|
||||
@@ -397,6 +405,7 @@ static int ir_mce_kbd_register(struct rc_dev *dev)
|
||||
|
||||
setup_timer(&mce_kbd->rx_timeout, mce_kbd_rx_timeout,
|
||||
(unsigned long)mce_kbd);
|
||||
+ spin_lock_init(&mce_kbd->keylock);
|
||||
|
||||
input_set_drvdata(idev, mce_kbd);
|
||||
|
||||
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
|
||||
index 5fd3b5a..77928ae 100644
|
||||
--- a/drivers/media/rc/rc-core-priv.h
|
||||
+++ b/drivers/media/rc/rc-core-priv.h
|
||||
@@ -97,6 +97,7 @@ struct ir_raw_event_ctrl {
|
||||
struct mce_kbd_dec {
|
||||
struct input_dev *idev;
|
||||
struct timer_list rx_timeout;
|
||||
+ spinlock_t keylock;
|
||||
char name[64];
|
||||
char phys[64];
|
||||
int state;
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From 47633baec95db9c03d61ce59f47e67ee485f394c Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Wed, 18 Apr 2018 13:50:52 +0200
|
||||
Subject: [PATCH 08/10] media: rc: mceusb: IR of length 0 means IR timeout, not
|
||||
reset
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/48782/
|
||||
|
||||
The last usb packet with IR data will end with 0x80 (MCE_IRDATA_TRAILER).
|
||||
If we reset the decoder state at this point, IR decoding can fail.
|
||||
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/mceusb.c | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
|
||||
index 160754a..dc7ebed 100644
|
||||
--- a/drivers/media/rc/mceusb.c
|
||||
+++ b/drivers/media/rc/mceusb.c
|
||||
@@ -1056,8 +1056,14 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
|
||||
i, ir->rem + 1, false);
|
||||
if (ir->rem)
|
||||
ir->parser_state = PARSE_IRDATA;
|
||||
- else
|
||||
- ir_raw_event_reset(ir->rc);
|
||||
+ else {
|
||||
+ init_ir_raw_event(&rawir);
|
||||
+ rawir.timeout = 1;
|
||||
+ rawir.duration = ir->rc->timeout;
|
||||
+ if (ir_raw_event_store_with_filter(ir->rc,
|
||||
+ &rawir))
|
||||
+ event = true;
|
||||
+ }
|
||||
break;
|
||||
}
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From ebb32fcc2aa4ebfce182fce11c4a203c4a6a908e Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Thu, 10 May 2018 10:42:24 +0200
|
||||
Subject: [PATCH 09/10] media: mceusb: MCE_CMD_SETIRTIMEOUT cause strange
|
||||
behaviour on device
|
||||
|
||||
backport of https://patchwork.linuxtv.org/patch/49409/
|
||||
|
||||
If the IR timeout is set on vid 1784 pid 0011, the device starts
|
||||
behaving strangely.
|
||||
|
||||
Reported-by: Matthias Reichl <hias@horus.com>
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/mceusb.c | 21 ++++++++++++++++++---
|
||||
1 file changed, 18 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
|
||||
index dc7ebed..2e1241f 100644
|
||||
--- a/drivers/media/rc/mceusb.c
|
||||
+++ b/drivers/media/rc/mceusb.c
|
||||
@@ -181,6 +181,7 @@ enum mceusb_model_type {
|
||||
MCE_GEN2 = 0, /* Most boards */
|
||||
MCE_GEN1,
|
||||
MCE_GEN3,
|
||||
+ MCE_GEN3_BROKEN_IRTIMEOUT,
|
||||
MCE_GEN2_TX_INV,
|
||||
POLARIS_EVK,
|
||||
CX_HYBRID_TV,
|
||||
@@ -196,6 +197,7 @@ struct mceusb_model {
|
||||
u32 mce_gen3:1;
|
||||
u32 tx_mask_normal:1;
|
||||
u32 no_tx:1;
|
||||
+ u32 broken_irtimeout:1;
|
||||
|
||||
int ir_intfnum;
|
||||
|
||||
@@ -223,6 +225,11 @@ static const struct mceusb_model mceusb_model[] = {
|
||||
.mce_gen3 = 1,
|
||||
.tx_mask_normal = 1,
|
||||
},
|
||||
+ [MCE_GEN3_BROKEN_IRTIMEOUT] = {
|
||||
+ .mce_gen3 = 1,
|
||||
+ .tx_mask_normal = 1,
|
||||
+ .broken_irtimeout = 1
|
||||
+ },
|
||||
[POLARIS_EVK] = {
|
||||
/*
|
||||
* In fact, the EVK is shipped without
|
||||
@@ -320,7 +327,7 @@ static struct usb_device_id mceusb_dev_table[] = {
|
||||
.driver_info = MCE_GEN2_TX_INV },
|
||||
/* Topseed eHome Infrared Transceiver */
|
||||
{ USB_DEVICE(VENDOR_TOPSEED, 0x0011),
|
||||
- .driver_info = MCE_GEN3 },
|
||||
+ .driver_info = MCE_GEN3_BROKEN_IRTIMEOUT },
|
||||
/* Ricavision internal Infrared Transceiver */
|
||||
{ USB_DEVICE(VENDOR_RICAVISION, 0x0010) },
|
||||
/* Itron ione Libra Q-11 */
|
||||
@@ -1295,8 +1302,16 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
|
||||
rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
|
||||
rc->min_timeout = US_TO_NS(MCE_TIME_UNIT);
|
||||
rc->timeout = MS_TO_NS(100);
|
||||
- rc->max_timeout = 10 * IR_DEFAULT_TIMEOUT;
|
||||
- rc->s_timeout = mceusb_set_timeout;
|
||||
+ if (!mceusb_model[ir->model].broken_irtimeout) {
|
||||
+ rc->s_timeout = mceusb_set_timeout;
|
||||
+ rc->max_timeout = 10 * IR_DEFAULT_TIMEOUT;
|
||||
+ } else {
|
||||
+ /*
|
||||
+ * If we can't set the timeout using CMD_SETIRTIMEOUT, we can
|
||||
+ * rely on software timeouts for timeouts < 100ms.
|
||||
+ */
|
||||
+ rc->max_timeout = rc->timeout;
|
||||
+ }
|
||||
if (!ir->flags.no_tx) {
|
||||
rc->s_tx_mask = mceusb_set_tx_mask;
|
||||
rc->s_tx_carrier = mceusb_set_tx_carrier;
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
From f3db736f8a5b4278b7b2907d5c5c5fc2b76605a6 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Fri, 11 May 2018 12:20:44 +0200
|
||||
Subject: [PATCH 10/10] media: mceusb: filter out bogus timing irdata of
|
||||
duration 0
|
||||
|
||||
Backport of https://patchwork.linuxtv.org/patch/49430/
|
||||
|
||||
A mceusb device has been observed producing invalid irdata. Proactively
|
||||
guard against this.
|
||||
|
||||
Suggested-by: Matthias Reichl <hias@horus.com>
|
||||
Signed-off-by: Sean Young <sean@mess.org>
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
drivers/media/rc/mceusb.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
|
||||
index 2e1241f..7864a30 100644
|
||||
--- a/drivers/media/rc/mceusb.c
|
||||
+++ b/drivers/media/rc/mceusb.c
|
||||
@@ -1038,6 +1038,12 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
|
||||
rawir.duration = (ir->buf_in[i] & MCE_PULSE_MASK)
|
||||
* US_TO_NS(MCE_TIME_UNIT);
|
||||
|
||||
+ if (unlikely(!rawir.duration)) {
|
||||
+ dev_warn(ir->dev, "nonsensical irdata %02x with duration 0",
|
||||
+ ir->buf_in[i]);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
dev_dbg(ir->dev, "Storing %s with duration %u",
|
||||
rawir.pulse ? "pulse" : "space",
|
||||
rawir.duration);
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
From c24b2ad9c085685c2cace7733c22dbc80a95de27 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Thu, 16 Aug 2018 21:24:14 +0100
|
||||
Subject: [PATCH] Revert "media: dvbsky: use just one mutex for serializing
|
||||
device R/W ops"
|
||||
|
||||
This reverts commit 7d95fb746c4eece67308f1642a666ea1ebdbd2cc.
|
||||
---
|
||||
drivers/media/usb/dvb-usb-v2/dvbsky.c | 16 ++++++++++------
|
||||
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
|
||||
index 1aa88d9..e28bd88 100644
|
||||
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c
|
||||
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
|
||||
@@ -31,6 +31,7 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver.");
|
||||
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
|
||||
|
||||
struct dvbsky_state {
|
||||
+ struct mutex stream_mutex;
|
||||
u8 ibuf[DVBSKY_BUF_LEN];
|
||||
u8 obuf[DVBSKY_BUF_LEN];
|
||||
u8 last_lock;
|
||||
@@ -67,17 +68,18 @@ static int dvbsky_usb_generic_rw(struct dvb_usb_device *d,
|
||||
|
||||
static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff)
|
||||
{
|
||||
+ struct dvbsky_state *state = d_to_priv(d);
|
||||
int ret;
|
||||
- static u8 obuf_pre[3] = { 0x37, 0, 0 };
|
||||
- static u8 obuf_post[3] = { 0x36, 3, 0 };
|
||||
+ u8 obuf_pre[3] = { 0x37, 0, 0 };
|
||||
+ u8 obuf_post[3] = { 0x36, 3, 0 };
|
||||
|
||||
- mutex_lock(&d->usb_mutex);
|
||||
- ret = dvb_usbv2_generic_rw_locked(d, obuf_pre, 3, NULL, 0);
|
||||
+ mutex_lock(&state->stream_mutex);
|
||||
+ ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0);
|
||||
if (!ret && onoff) {
|
||||
msleep(20);
|
||||
- ret = dvb_usbv2_generic_rw_locked(d, obuf_post, 3, NULL, 0);
|
||||
+ ret = dvbsky_usb_generic_rw(d, obuf_post, 3, NULL, 0);
|
||||
}
|
||||
- mutex_unlock(&d->usb_mutex);
|
||||
+ mutex_unlock(&state->stream_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -606,6 +608,8 @@ static int dvbsky_init(struct dvb_usb_device *d)
|
||||
if (ret)
|
||||
return ret;
|
||||
*/
|
||||
+ mutex_init(&state->stream_mutex);
|
||||
+
|
||||
state->last_lock = 0;
|
||||
|
||||
return 0;
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="70c60c5c57d9d639fbd92276f18558ada51b7c53"
|
||||
PKG_SHA256="cd5a035bcf56f44e8d957b27ebf0d4d615f9308902464b1dc1615f42ffd16680"
|
||||
PKG_VERSION="404dfef3b364b4533f70659eafdcefa3b68cd7ae"
|
||||
PKG_SHA256="3ddd5f7c37cec2b7e26f31702c584c01b5ba1bf09e90f3f7bdb34dab42981379"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,24 +0,0 @@
|
||||
<confdir:pcm/iec958.conf>
|
||||
AlloDigiOne.pcm.iec958.0 {
|
||||
@args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
@args.AES0 {
|
||||
type integer
|
||||
}
|
||||
@args.AES1 {
|
||||
type integer
|
||||
}
|
||||
@args.AES2 {
|
||||
type integer
|
||||
}
|
||||
@args.AES3 {
|
||||
type integer
|
||||
}
|
||||
type hooks
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
<confdir:pcm/iec958.conf>
|
||||
HifiberryDigi.pcm.iec958.0 {
|
||||
@args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
@args.AES0 {
|
||||
type integer
|
||||
}
|
||||
@args.AES1 {
|
||||
type integer
|
||||
}
|
||||
@args.AES2 {
|
||||
type integer
|
||||
}
|
||||
@args.AES3 {
|
||||
type integer
|
||||
}
|
||||
type hooks
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
<confdir:pcm/iec958.conf>
|
||||
JustBoomDigi.pcm.iec958.0 {
|
||||
@args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
@args.AES0 {
|
||||
type integer
|
||||
}
|
||||
@args.AES1 {
|
||||
type integer
|
||||
}
|
||||
@args.AES2 {
|
||||
type integer
|
||||
}
|
||||
@args.AES3 {
|
||||
type integer
|
||||
}
|
||||
type hooks
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
<confdir:pcm/iec958.conf>
|
||||
IQAudIODigi.pcm.iec958.0 {
|
||||
RPi-WM8804.pcm.iec958.0 {
|
||||
@args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD {
|
||||
type string
|
||||
Loading…
x
Reference in New Issue
Block a user