* [PATCH 1/9] [media] lirc: lirc interface should not be a raw decoder
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-06 12:49 ` [PATCH 2/9] [media] lirc: exorcise struct irctl Sean Young
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
The lirc bridge exists as a raw decoder. We would like to make the bridge
to also work for scancode drivers in further commits, so it cannot be
a raw decoder.
Note that rc-code, lirc_dev, ir-lirc-codec are now calling functions of
each other, so they've been merged into one module rc-core to avoid
circular dependencies.
Since ir-lirc-codec no longer exists as separate codec module, there is no
need for RC_DRIVER_IR_RAW_TX type drivers to call ir_raw_event_register().
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/Kconfig | 15 ++++++------
drivers/media/rc/Makefile | 6 ++---
drivers/media/rc/ir-lirc-codec.c | 38 ++++---------------------------
drivers/media/rc/lirc_dev.c | 22 +++---------------
drivers/media/rc/rc-core-priv.h | 24 +++++++++++++++++++-
drivers/media/rc/rc-ir-raw.c | 17 +++++---------
drivers/media/rc/rc-main.c | 49 ++++++++++++++++++++--------------------
7 files changed, 71 insertions(+), 100 deletions(-)
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index d0ddbd3..b2607c7 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -6,14 +6,8 @@ config RC_CORE
source "drivers/media/rc/keymaps/Kconfig"
-menuconfig RC_DECODERS
- bool "Remote controller decoders"
- depends on RC_CORE
- default y
-
-if RC_DECODERS
config LIRC
- tristate "LIRC interface driver"
+ bool "LIRC interface driver"
depends on RC_CORE
---help---
@@ -24,7 +18,7 @@ config LIRC
encoding for IR transmitting (aka "blasting").
config IR_LIRC_CODEC
- tristate "Enable IR to LIRC bridge"
+ bool "Enable IR to LIRC bridge"
depends on RC_CORE
depends on LIRC
default y
@@ -33,7 +27,12 @@ config IR_LIRC_CODEC
Enable this option to pass raw IR to and from userspace via
the LIRC interface.
+menuconfig RC_DECODERS
+ bool "Remote controller decoders"
+ depends on RC_CORE
+ default y
+if RC_DECODERS
config IR_NEC_DECODER
tristate "Enable IR raw decoder for the NEC protocol"
depends on RC_CORE
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 938c98b..cbb2da0 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -1,9 +1,10 @@
-rc-core-objs := rc-main.o rc-ir-raw.o
obj-y += keymaps/
obj-$(CONFIG_RC_CORE) += rc-core.o
-obj-$(CONFIG_LIRC) += lirc_dev.o
+rc-core-y := rc-main.o rc-ir-raw.o
+rc-core-$(CONFIG_LIRC) += lirc_dev.o
+rc-core-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o
obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o
@@ -12,7 +13,6 @@ obj-$(CONFIG_IR_SONY_DECODER) += ir-sony-decoder.o
obj-$(CONFIG_IR_SANYO_DECODER) += ir-sanyo-decoder.o
obj-$(CONFIG_IR_SHARP_DECODER) += ir-sharp-decoder.o
obj-$(CONFIG_IR_MCE_KBD_DECODER) += ir-mce_kbd-decoder.o
-obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o
obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o
# stand-alone IR receivers/transmitters
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 9e41305..c3a2a6d 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -14,7 +14,6 @@
#include <linux/sched.h>
#include <linux/wait.h>
-#include <linux/module.h>
#include <media/lirc.h>
#include <media/lirc_dev.h>
#include <media/rc-core.h>
@@ -23,14 +22,14 @@
#define LIRCBUF_SIZE 256
/**
- * ir_lirc_decode() - Send raw IR data to lirc_dev to be relayed to the
- * lircd userspace daemon for decoding.
+ * ir_lirc_raw_event() - Send raw IR data to lirc to be relayed to userspace
+ *
* @input_dev: the struct rc_dev descriptor of the device
* @duration: the struct ir_raw_event descriptor of the pulse/space
*
* This function returns -EINVAL if the lirc interfaces aren't wired up.
*/
-static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
+int ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
{
struct lirc_codec *lirc = &dev->raw->lirc;
int sample;
@@ -342,7 +341,7 @@ static const struct file_operations lirc_fops = {
.llseek = no_llseek,
};
-static int ir_lirc_register(struct rc_dev *dev)
+int ir_lirc_register(struct rc_dev *dev)
{
struct lirc_driver *drv;
struct lirc_buffer *rbuf;
@@ -418,7 +417,7 @@ static int ir_lirc_register(struct rc_dev *dev)
return rc;
}
-static int ir_lirc_unregister(struct rc_dev *dev)
+int ir_lirc_unregister(struct rc_dev *dev)
{
struct lirc_codec *lirc = &dev->raw->lirc;
@@ -430,30 +429,3 @@ static int ir_lirc_unregister(struct rc_dev *dev)
return 0;
}
-static struct ir_raw_handler lirc_handler = {
- .protocols = 0,
- .decode = ir_lirc_decode,
- .raw_register = ir_lirc_register,
- .raw_unregister = ir_lirc_unregister,
-};
-
-static int __init ir_lirc_codec_init(void)
-{
- ir_raw_handler_register(&lirc_handler);
-
- printk(KERN_INFO "IR LIRC bridge handler initialized\n");
- return 0;
-}
-
-static void __exit ir_lirc_codec_exit(void)
-{
- ir_raw_handler_unregister(&lirc_handler);
-}
-
-module_init(ir_lirc_codec_init);
-module_exit(ir_lirc_codec_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");
-MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
-MODULE_DESCRIPTION("LIRC IR handler bridge");
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 7f5d109..5884f0e 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -37,12 +37,10 @@
#include <linux/device.h>
#include <linux/cdev.h>
-#include <media/rc-core.h>
+#include "rc-core-priv.h"
#include <media/lirc.h>
#include <media/lirc_dev.h>
-static bool debug;
-
#define IRCTL_DEV_NAME "BaseRemoteCtl"
#define NOPLUG -1
#define LOGHEAD "lirc_dev (%s[%d]): "
@@ -763,7 +761,7 @@ ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
EXPORT_SYMBOL(lirc_dev_fop_write);
-static int __init lirc_dev_init(void)
+int __init lirc_dev_init(void)
{
int retval;
@@ -781,28 +779,14 @@ static int __init lirc_dev_init(void)
return retval;
}
-
pr_info("IR Remote Control driver registered, major %d\n",
MAJOR(lirc_base_dev));
return 0;
}
-
-
-static void __exit lirc_dev_exit(void)
+void __exit lirc_dev_exit(void)
{
class_destroy(lirc_class);
unregister_chrdev_region(lirc_base_dev, MAX_IRCTL_DEVICES);
- pr_info("module unloaded\n");
}
-
-module_init(lirc_dev_init);
-module_exit(lirc_dev_exit);
-
-MODULE_DESCRIPTION("LIRC base driver module");
-MODULE_AUTHOR("Artur Lipowski");
-MODULE_LICENSE("GPL");
-
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Enable debugging messages");
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index a70a5c55..6819310 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -30,7 +30,7 @@ struct ir_raw_handler {
int (*encode)(enum rc_type protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max);
- /* These two should only be used by the lirc decoder */
+ /* These two should only be used by the mce kbd decoder */
int (*raw_register)(struct rc_dev *dev);
int (*raw_unregister)(struct rc_dev *dev);
};
@@ -270,6 +270,28 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler);
void ir_raw_init(void);
/*
+ * lirc interface bridge
+ */
+#ifdef CONFIG_IR_LIRC_CODEC
+int ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev);
+int ir_lirc_register(struct rc_dev *dev);
+int ir_lirc_unregister(struct rc_dev *dev);
+#else
+static inline int ir_lirc_raw_event(struct rc_dev *dev,
+ struct ir_raw_event ev) { return 0; }
+static inline int ir_lirc_register(struct rc_dev *dev) { return 0; }
+static inline int ir_lirc_unregister(struct rc_dev *dev) { return 0; }
+#endif
+
+#ifdef CONFIG_LIRC
+int lirc_dev_init(void);
+void lirc_dev_exit(void);
+#else
+static inline int lirc_dev_init(void) { return 0; }
+static inline void lirc_dev_exit(void) {}
+#endif
+
+/*
* Decoder initialization code
*
* Those load logic are called during ir-core init, and automatically
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
index 7fa84b6..2421258 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -40,6 +40,7 @@ static int ir_raw_event_thread(void *data)
if (raw->dev->enabled_protocols &
handler->protocols || !handler->protocols)
handler->decode(raw->dev, ev);
+ ir_lirc_raw_event(raw->dev, ev);
raw->prev_ev = ev;
}
mutex_unlock(&ir_raw_handler_lock);
@@ -502,18 +503,12 @@ int ir_raw_event_register(struct rc_dev *dev)
dev->change_protocol = change_protocol;
INIT_KFIFO(dev->raw->kfifo);
- /*
- * raw transmitters do not need any event registration
- * because the event is coming from userspace
- */
- if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {
- dev->raw->thread = kthread_run(ir_raw_event_thread, dev->raw,
- "rc%u", dev->minor);
+ dev->raw->thread = kthread_run(ir_raw_event_thread, dev->raw,
+ "rc%u", dev->minor);
- if (IS_ERR(dev->raw->thread)) {
- rc = PTR_ERR(dev->raw->thread);
- goto out;
- }
+ if (IS_ERR(dev->raw->thread)) {
+ rc = PTR_ERR(dev->raw->thread);
+ goto out;
}
mutex_lock(&ir_raw_handler_lock);
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 075d7a9..b135365 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -903,23 +903,6 @@ struct rc_filter_attribute {
.mask = (_mask), \
}
-static bool lirc_is_present(void)
-{
-#if defined(CONFIG_LIRC_MODULE)
- struct module *lirc;
-
- mutex_lock(&module_mutex);
- lirc = find_module("lirc_dev");
- mutex_unlock(&module_mutex);
-
- return lirc ? true : false;
-#elif defined(CONFIG_LIRC)
- return true;
-#else
- return false;
-#endif
-}
-
/**
* show_protocols() - shows the current IR protocol(s)
* @device: the device descriptor
@@ -971,8 +954,10 @@ static ssize_t show_protocols(struct device *device,
allowed &= ~proto_names[i].type;
}
- if (dev->driver_type == RC_DRIVER_IR_RAW && lirc_is_present())
+#ifdef CONFIG_IR_LIRC_CODEC
+ if (dev->driver_type == RC_DRIVER_IR_RAW)
tmp += sprintf(tmp, "[lirc] ");
+#endif
if (tmp != buf)
tmp--;
@@ -1742,7 +1727,6 @@ static void rc_free_rx_device(struct rc_dev *dev)
int rc_register_device(struct rc_dev *dev)
{
- static bool raw_init; /* 'false' default value, raw decoders loaded? */
const char *path;
int attr = 0;
int minor;
@@ -1784,17 +1768,18 @@ int rc_register_device(struct rc_dev *dev)
goto out_dev;
}
- if (dev->driver_type == RC_DRIVER_IR_RAW ||
- dev->driver_type == RC_DRIVER_IR_RAW_TX) {
- if (!raw_init) {
- request_module_nowait("ir-lirc-codec");
- raw_init = true;
- }
+ if (dev->driver_type == RC_DRIVER_IR_RAW) {
rc = ir_raw_event_register(dev);
if (rc < 0)
goto out_rx;
}
+ if (dev->driver_type != RC_DRIVER_SCANCODE) {
+ rc = ir_lirc_register(dev);
+ if (rc < 0)
+ goto out_raw;
+ }
+
/* Allow the RC sysfs nodes to be accessible */
atomic_set(&dev->initialized, 1);
@@ -1804,6 +1789,9 @@ int rc_register_device(struct rc_dev *dev)
return 0;
+out_raw:
+ if (dev->driver_type == RC_DRIVER_IR_RAW)
+ ir_raw_event_unregister(dev);
out_rx:
rc_free_rx_device(dev);
out_dev:
@@ -1851,6 +1839,9 @@ void rc_unregister_device(struct rc_dev *dev)
if (dev->driver_type == RC_DRIVER_IR_RAW)
ir_raw_event_unregister(dev);
+ if (dev->driver_type != RC_DRIVER_SCANCODE)
+ ir_lirc_unregister(dev);
+
rc_free_rx_device(dev);
device_del(&dev->dev);
@@ -1875,6 +1866,13 @@ static int __init rc_core_init(void)
return rc;
}
+ rc = lirc_dev_init();
+ if (rc) {
+ pr_err("rc_core: unable to init lirc\n");
+ class_unregister(&rc_class);
+ return 0;
+ }
+
led_trigger_register_simple("rc-feedback", &led_feedback);
rc_map_register(&empty_map);
@@ -1883,6 +1881,7 @@ static int __init rc_core_init(void)
static void __exit rc_core_exit(void)
{
+ lirc_dev_exit();
class_unregister(&rc_class);
led_trigger_unregister_simple(led_feedback);
rc_map_unregister(&empty_map);
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/9] [media] lirc: exorcise struct irctl
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
2017-01-06 12:49 ` [PATCH 1/9] [media] lirc: lirc interface should not be a raw decoder Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-06 12:49 ` [PATCH 3/9] [media] lirc: use plain kfifo rather than lirc_buffer Sean Young
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
lirc_register_driver() takes a struct lirc_driver argument, it then
allocates a new struct irctl which contains another struct lirc_driver
and then copies it over.
By moving the members of struct irctl to struct lirc_driver, we avoid the
extra allocation and we can remove struct irctl completely. We also
remove the duplicate chunk_size member.
In addition, the members of irctl are now visible elsewhere.
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/ir-lirc-codec.c | 1 -
drivers/media/rc/lirc_dev.c | 317 ++++++++++++++------------------
drivers/staging/media/lirc/lirc_sasem.c | 1 -
include/media/lirc_dev.h | 25 +++
4 files changed, 168 insertions(+), 176 deletions(-)
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index c3a2a6d..b78a402 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -424,7 +424,6 @@ int ir_lirc_unregister(struct rc_dev *dev)
lirc_unregister_driver(lirc->drv->minor);
lirc_buffer_free(lirc->drv->rbuf);
kfree(lirc->drv->rbuf);
- kfree(lirc->drv);
return 0;
}
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 5884f0e..379e9d4 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -47,24 +47,9 @@
static dev_t lirc_base_dev;
-struct irctl {
- struct lirc_driver d;
- int attached;
- int open;
-
- struct mutex irctl_lock;
- struct lirc_buffer *buf;
- unsigned int chunk_size;
-
- struct cdev *cdev;
-
- struct task_struct *task;
- long jiffies_to_wait;
-};
-
static DEFINE_MUTEX(lirc_dev_lock);
-static struct irctl *irctls[MAX_IRCTL_DEVICES];
+static struct lirc_driver *irctls[MAX_IRCTL_DEVICES];
/* Only used for sysfs but defined to void otherwise */
static struct class *lirc_class;
@@ -72,33 +57,27 @@ static struct class *lirc_class;
/* helper function
* initializes the irctl structure
*/
-static void lirc_irctl_init(struct irctl *ir)
-{
- mutex_init(&ir->irctl_lock);
- ir->d.minor = NOPLUG;
-}
-
-static void lirc_irctl_cleanup(struct irctl *ir)
+static void lirc_irctl_cleanup(struct lirc_driver *d)
{
- device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
+ device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), d->minor));
- if (ir->buf != ir->d.rbuf) {
- lirc_buffer_free(ir->buf);
- kfree(ir->buf);
+ if (d->buf != d->rbuf) {
+ lirc_buffer_free(d->buf);
+ kfree(d->buf);
}
- ir->buf = NULL;
+ d->buf = NULL;
}
/* helper function
* reads key codes from driver and puts them into buffer
* returns 0 on success
*/
-static int lirc_add_to_buf(struct irctl *ir)
+static int lirc_add_to_buf(struct lirc_driver *d)
{
int res;
int got_data = -1;
- if (!ir->d.add_to_buf)
+ if (!d->add_to_buf)
return 0;
/*
@@ -107,31 +86,31 @@ static int lirc_add_to_buf(struct irctl *ir)
*/
do {
got_data++;
- res = ir->d.add_to_buf(ir->d.data, ir->buf);
+ res = d->add_to_buf(d->data, d->buf);
} while (!res);
if (res == -ENODEV)
- kthread_stop(ir->task);
+ kthread_stop(d->task);
return got_data ? 0 : res;
}
/* main function of the polling thread
*/
-static int lirc_thread(void *irctl)
+static int lirc_thread(void *lirc_driver)
{
- struct irctl *ir = irctl;
+ struct lirc_driver *d = lirc_driver;
do {
- if (ir->open) {
- if (ir->jiffies_to_wait) {
+ if (d->open) {
+ if (d->jiffies_to_wait) {
set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(ir->jiffies_to_wait);
+ schedule_timeout(d->jiffies_to_wait);
}
if (kthread_should_stop())
break;
- if (!lirc_add_to_buf(ir))
- wake_up_interruptible(&ir->buf->wait_poll);
+ if (!lirc_add_to_buf(d))
+ wake_up_interruptible(&d->buf->wait_poll);
} else {
set_current_state(TASK_INTERRUPTIBLE);
schedule();
@@ -141,7 +120,6 @@ static int lirc_thread(void *irctl)
return 0;
}
-
static const struct file_operations lirc_dev_fops = {
.owner = THIS_MODULE,
.read = lirc_dev_fop_read,
@@ -153,9 +131,8 @@ static const struct file_operations lirc_dev_fops = {
.llseek = noop_llseek,
};
-static int lirc_cdev_add(struct irctl *ir)
+static int lirc_cdev_add(struct lirc_driver *d)
{
- struct lirc_driver *d = &ir->d;
struct cdev *cdev;
int retval;
@@ -178,7 +155,7 @@ static int lirc_cdev_add(struct irctl *ir)
if (retval)
goto err_out;
- ir->cdev = cdev;
+ d->cdev = cdev;
return 0;
@@ -187,13 +164,12 @@ static int lirc_cdev_add(struct irctl *ir)
return retval;
}
-static int lirc_allocate_buffer(struct irctl *ir)
+static int lirc_allocate_buffer(struct lirc_driver *d)
{
int err = 0;
int bytes_in_key;
unsigned int chunk_size;
unsigned int buffer_size;
- struct lirc_driver *d = &ir->d;
mutex_lock(&lirc_dev_lock);
@@ -203,21 +179,21 @@ static int lirc_allocate_buffer(struct irctl *ir)
chunk_size = d->chunk_size ? d->chunk_size : bytes_in_key;
if (d->rbuf) {
- ir->buf = d->rbuf;
+ d->buf = d->rbuf;
} else {
- ir->buf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
- if (!ir->buf) {
+ d->buf = kmalloc(sizeof(*d->buf), GFP_KERNEL);
+ if (!d->buf) {
err = -ENOMEM;
goto out;
}
- err = lirc_buffer_init(ir->buf, chunk_size, buffer_size);
+ err = lirc_buffer_init(d->buf, chunk_size, buffer_size);
if (err) {
- kfree(ir->buf);
+ kfree(d->buf);
goto out;
}
}
- ir->chunk_size = ir->buf->chunk_size;
+ d->chunk_size = d->buf->chunk_size;
out:
mutex_unlock(&lirc_dev_lock);
@@ -227,7 +203,6 @@ static int lirc_allocate_buffer(struct irctl *ir)
static int lirc_allocate_driver(struct lirc_driver *d)
{
- struct irctl *ir;
int minor;
int err;
@@ -289,13 +264,8 @@ static int lirc_allocate_driver(struct lirc_driver *d)
goto out_lock;
}
- ir = kzalloc(sizeof(struct irctl), GFP_KERNEL);
- if (!ir) {
- err = -ENOMEM;
- goto out_lock;
- }
- lirc_irctl_init(ir);
- irctls[minor] = ir;
+ mutex_init(&d->irctl_lock);
+ irctls[minor] = d;
d->minor = minor;
/* some safety check 8-) */
@@ -304,18 +274,16 @@ static int lirc_allocate_driver(struct lirc_driver *d)
if (d->features == 0)
d->features = LIRC_CAN_REC_LIRCCODE;
- ir->d = *d;
-
- device_create(lirc_class, ir->d.dev,
- MKDEV(MAJOR(lirc_base_dev), ir->d.minor), NULL,
- "lirc%u", ir->d.minor);
+ device_create(lirc_class, d->dev,
+ MKDEV(MAJOR(lirc_base_dev), d->minor), NULL,
+ "lirc%u", d->minor);
if (d->sample_rate) {
- ir->jiffies_to_wait = HZ / d->sample_rate;
+ d->jiffies_to_wait = HZ / d->sample_rate;
/* try to fire up polling thread */
- ir->task = kthread_run(lirc_thread, (void *)ir, "lirc_dev");
- if (IS_ERR(ir->task)) {
+ d->task = kthread_run(lirc_thread, d, "lirc_dev");
+ if (IS_ERR(d->task)) {
dev_err(d->dev, "cannot run thread for minor = %d\n",
d->minor);
err = -ECHILD;
@@ -323,22 +291,22 @@ static int lirc_allocate_driver(struct lirc_driver *d)
}
} else {
/* it means - wait for external event in task queue */
- ir->jiffies_to_wait = 0;
+ d->jiffies_to_wait = 0;
}
- err = lirc_cdev_add(ir);
+ err = lirc_cdev_add(d);
if (err)
goto out_sysfs;
- ir->attached = 1;
+ d->attached = 1;
mutex_unlock(&lirc_dev_lock);
- dev_info(ir->d.dev, "lirc_dev: driver %s registered at minor = %d\n",
- ir->d.name, ir->d.minor);
+ dev_info(d->dev, "lirc_dev: driver %s registered at minor = %d\n",
+ d->name, d->minor);
return minor;
out_sysfs:
- device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
+ device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), d->minor));
out_lock:
mutex_unlock(&lirc_dev_lock);
@@ -365,7 +333,7 @@ EXPORT_SYMBOL(lirc_register_driver);
int lirc_unregister_driver(int minor)
{
- struct irctl *ir;
+ struct lirc_driver *d;
struct cdev *cdev;
if (minor < 0 || minor >= MAX_IRCTL_DEVICES) {
@@ -374,46 +342,46 @@ int lirc_unregister_driver(int minor)
return -EBADRQC;
}
- ir = irctls[minor];
- if (!ir) {
+ d = irctls[minor];
+ if (!d) {
pr_err("failed to get irctl\n");
return -ENOENT;
}
- cdev = ir->cdev;
+ cdev = d->cdev;
mutex_lock(&lirc_dev_lock);
- if (ir->d.minor != minor) {
- dev_err(ir->d.dev, "lirc_dev: minor %d device not registered\n",
- minor);
+ if (d->minor != minor) {
+ dev_err(d->dev, "lirc_dev: minor %d device not registered\n",
+ minor);
mutex_unlock(&lirc_dev_lock);
return -ENOENT;
}
/* end up polling thread */
- if (ir->task)
- kthread_stop(ir->task);
+ if (d->task)
+ kthread_stop(d->task);
- dev_dbg(ir->d.dev, "lirc_dev: driver %s unregistered from minor = %d\n",
- ir->d.name, ir->d.minor);
+ dev_dbg(d->dev, "lirc_dev: driver %s unregistered from minor = %d\n",
+ d->name, d->minor);
- ir->attached = 0;
- if (ir->open) {
- dev_dbg(ir->d.dev, LOGHEAD "releasing opened driver\n",
- ir->d.name, ir->d.minor);
- wake_up_interruptible(&ir->buf->wait_poll);
- mutex_lock(&ir->irctl_lock);
+ d->attached = 0;
+ if (d->open) {
+ dev_dbg(d->dev, LOGHEAD "releasing opened driver\n",
+ d->name, d->minor);
+ wake_up_interruptible(&d->buf->wait_poll);
+ mutex_lock(&d->irctl_lock);
- if (ir->d.set_use_dec)
- ir->d.set_use_dec(ir->d.data);
+ if (d->set_use_dec)
+ d->set_use_dec(d->data);
module_put(cdev->owner);
- mutex_unlock(&ir->irctl_lock);
+ mutex_unlock(&d->irctl_lock);
} else {
- lirc_irctl_cleanup(ir);
+ lirc_irctl_cleanup(d);
cdev_del(cdev);
- kfree(ir);
+ kfree(d);
irctls[minor] = NULL;
}
@@ -425,7 +393,7 @@ EXPORT_SYMBOL(lirc_unregister_driver);
int lirc_dev_fop_open(struct inode *inode, struct file *file)
{
- struct irctl *ir;
+ struct lirc_driver *d;
struct cdev *cdev;
int retval = 0;
@@ -437,44 +405,44 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file)
if (mutex_lock_interruptible(&lirc_dev_lock))
return -ERESTARTSYS;
- ir = irctls[iminor(inode)];
- if (!ir) {
+ d = irctls[iminor(inode)];
+ if (!d) {
retval = -ENODEV;
goto error;
}
- dev_dbg(ir->d.dev, LOGHEAD "open called\n", ir->d.name, ir->d.minor);
+ dev_dbg(d->dev, LOGHEAD "open called\n", d->name, d->minor);
- if (ir->d.minor == NOPLUG) {
+ if (d->minor == NOPLUG) {
retval = -ENODEV;
goto error;
}
- if (ir->open) {
+ if (d->open) {
retval = -EBUSY;
goto error;
}
- if (ir->d.rdev) {
- retval = rc_open(ir->d.rdev);
+ if (d->rdev) {
+ retval = rc_open(d->rdev);
if (retval)
goto error;
}
- cdev = ir->cdev;
+ cdev = d->cdev;
if (try_module_get(cdev->owner)) {
- ir->open++;
- if (ir->d.set_use_inc)
- retval = ir->d.set_use_inc(ir->d.data);
+ d->open++;
+ if (d->set_use_inc)
+ retval = d->set_use_inc(d->data);
if (retval) {
module_put(cdev->owner);
- ir->open--;
+ d->open--;
} else {
- lirc_buffer_clear(ir->buf);
+ lirc_buffer_clear(d->buf);
}
- if (ir->task)
- wake_up_process(ir->task);
+ if (d->task)
+ wake_up_process(d->task);
}
error:
@@ -488,32 +456,32 @@ EXPORT_SYMBOL(lirc_dev_fop_open);
int lirc_dev_fop_close(struct inode *inode, struct file *file)
{
- struct irctl *ir = irctls[iminor(inode)];
+ struct lirc_driver *d = irctls[iminor(inode)];
struct cdev *cdev;
int ret;
- if (!ir) {
+ if (!d) {
pr_err("called with invalid irctl\n");
return -EINVAL;
}
- cdev = ir->cdev;
+ cdev = d->cdev;
ret = mutex_lock_killable(&lirc_dev_lock);
WARN_ON(ret);
- rc_close(ir->d.rdev);
+ rc_close(d->rdev);
- ir->open--;
- if (ir->attached) {
- if (ir->d.set_use_dec)
- ir->d.set_use_dec(ir->d.data);
+ d->open--;
+ if (d->attached) {
+ if (d->set_use_dec)
+ d->set_use_dec(d->data);
module_put(cdev->owner);
} else {
- lirc_irctl_cleanup(ir);
+ lirc_irctl_cleanup(d);
cdev_del(cdev);
- irctls[ir->d.minor] = NULL;
- kfree(ir);
+ irctls[d->minor] = NULL;
+ kfree(d);
}
if (!ret)
@@ -525,29 +493,30 @@ EXPORT_SYMBOL(lirc_dev_fop_close);
unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
{
- struct irctl *ir = irctls[iminor(file_inode(file))];
+ struct lirc_driver *d = irctls[iminor(file_inode(file))];
unsigned int ret;
- if (!ir) {
+ if (!d) {
pr_err("called with invalid irctl\n");
return POLLERR;
}
- if (!ir->attached)
+ if (!d->attached)
return POLLERR;
- if (ir->buf) {
- poll_wait(file, &ir->buf->wait_poll, wait);
+ if (d->buf) {
+ poll_wait(file, &d->buf->wait_poll, wait);
- if (lirc_buffer_empty(ir->buf))
+ if (lirc_buffer_empty(d->buf))
ret = 0;
else
ret = POLLIN | POLLRDNORM;
- } else
+ } else {
ret = POLLERR;
+ }
- dev_dbg(ir->d.dev, LOGHEAD "poll result = %d\n",
- ir->d.name, ir->d.minor, ret);
+ dev_dbg(d->dev, LOGHEAD "poll result = %d\n",
+ d->name, d->minor, ret);
return ret;
}
@@ -557,46 +526,46 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
__u32 mode;
int result = 0;
- struct irctl *ir = irctls[iminor(file_inode(file))];
+ struct lirc_driver *d = irctls[iminor(file_inode(file))];
- if (!ir) {
+ if (!d) {
pr_err("no irctl found!\n");
return -ENODEV;
}
- dev_dbg(ir->d.dev, LOGHEAD "ioctl called (0x%x)\n",
- ir->d.name, ir->d.minor, cmd);
+ dev_dbg(d->dev, LOGHEAD "ioctl called (0x%x)\n",
+ d->name, d->minor, cmd);
- if (ir->d.minor == NOPLUG || !ir->attached) {
- dev_err(ir->d.dev, LOGHEAD "ioctl result = -ENODEV\n",
- ir->d.name, ir->d.minor);
+ if (d->minor == NOPLUG || !d->attached) {
+ dev_err(d->dev, LOGHEAD "ioctl result = -ENODEV\n",
+ d->name, d->minor);
return -ENODEV;
}
- mutex_lock(&ir->irctl_lock);
+ mutex_lock(&d->irctl_lock);
switch (cmd) {
case LIRC_GET_FEATURES:
- result = put_user(ir->d.features, (__u32 __user *)arg);
+ result = put_user(d->features, (__u32 __user *)arg);
break;
case LIRC_GET_REC_MODE:
- if (!LIRC_CAN_REC(ir->d.features)) {
+ if (!LIRC_CAN_REC(d->features)) {
result = -ENOTTY;
break;
}
result = put_user(LIRC_REC2MODE
- (ir->d.features & LIRC_CAN_REC_MASK),
+ (d->features & LIRC_CAN_REC_MASK),
(__u32 __user *)arg);
break;
case LIRC_SET_REC_MODE:
- if (!LIRC_CAN_REC(ir->d.features)) {
+ if (!LIRC_CAN_REC(d->features)) {
result = -ENOTTY;
break;
}
result = get_user(mode, (__u32 __user *)arg);
- if (!result && !(LIRC_MODE2REC(mode) & ir->d.features))
+ if (!result && !(LIRC_MODE2REC(mode) & d->features))
result = -EINVAL;
/*
* FIXME: We should actually set the mode somehow but
@@ -604,31 +573,31 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
*/
break;
case LIRC_GET_LENGTH:
- result = put_user(ir->d.code_length, (__u32 __user *)arg);
+ result = put_user(d->code_length, (__u32 __user *)arg);
break;
case LIRC_GET_MIN_TIMEOUT:
- if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) ||
- ir->d.min_timeout == 0) {
+ if (!(d->features & LIRC_CAN_SET_REC_TIMEOUT) ||
+ d->min_timeout == 0) {
result = -ENOTTY;
break;
}
- result = put_user(ir->d.min_timeout, (__u32 __user *)arg);
+ result = put_user(d->min_timeout, (__u32 __user *)arg);
break;
case LIRC_GET_MAX_TIMEOUT:
- if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) ||
- ir->d.max_timeout == 0) {
+ if (!(d->features & LIRC_CAN_SET_REC_TIMEOUT) ||
+ d->max_timeout == 0) {
result = -ENOTTY;
break;
}
- result = put_user(ir->d.max_timeout, (__u32 __user *)arg);
+ result = put_user(d->max_timeout, (__u32 __user *)arg);
break;
default:
result = -EINVAL;
}
- mutex_unlock(&ir->irctl_lock);
+ mutex_unlock(&d->irctl_lock);
return result;
}
@@ -639,32 +608,32 @@ ssize_t lirc_dev_fop_read(struct file *file,
size_t length,
loff_t *ppos)
{
- struct irctl *ir = irctls[iminor(file_inode(file))];
+ struct lirc_driver *d = irctls[iminor(file_inode(file))];
unsigned char *buf;
int ret = 0, written = 0;
DECLARE_WAITQUEUE(wait, current);
- if (!ir) {
+ if (!d) {
pr_err("called with invalid irctl\n");
return -ENODEV;
}
- dev_dbg(ir->d.dev, LOGHEAD "read called\n", ir->d.name, ir->d.minor);
+ dev_dbg(d->dev, LOGHEAD "read called\n", d->name, d->minor);
- buf = kzalloc(ir->chunk_size, GFP_KERNEL);
+ buf = kzalloc(d->chunk_size, GFP_KERNEL);
if (!buf)
return -ENOMEM;
- if (mutex_lock_interruptible(&ir->irctl_lock)) {
+ if (mutex_lock_interruptible(&d->irctl_lock)) {
ret = -ERESTARTSYS;
goto out_unlocked;
}
- if (!ir->attached) {
+ if (!d->attached) {
ret = -ENODEV;
goto out_locked;
}
- if (length % ir->chunk_size) {
+ if (length % d->chunk_size) {
ret = -EINVAL;
goto out_locked;
}
@@ -674,14 +643,14 @@ ssize_t lirc_dev_fop_read(struct file *file,
* to avoid losing scan code (in case when queue is awaken somewhere
* between while condition checking and scheduling)
*/
- add_wait_queue(&ir->buf->wait_poll, &wait);
+ add_wait_queue(&d->buf->wait_poll, &wait);
/*
* while we didn't provide 'length' bytes, device is opened in blocking
* mode and 'copy_to_user' is happy, wait for data.
*/
while (written < length && ret == 0) {
- if (lirc_buffer_empty(ir->buf)) {
+ if (lirc_buffer_empty(d->buf)) {
/* According to the read(2) man page, 'written' can be
* returned as less than 'length', instead of blocking
* again, returning -EWOULDBLOCK, or returning
@@ -698,36 +667,36 @@ ssize_t lirc_dev_fop_read(struct file *file,
break;
}
- mutex_unlock(&ir->irctl_lock);
+ mutex_unlock(&d->irctl_lock);
set_current_state(TASK_INTERRUPTIBLE);
schedule();
set_current_state(TASK_RUNNING);
- if (mutex_lock_interruptible(&ir->irctl_lock)) {
+ if (mutex_lock_interruptible(&d->irctl_lock)) {
ret = -ERESTARTSYS;
- remove_wait_queue(&ir->buf->wait_poll, &wait);
+ remove_wait_queue(&d->buf->wait_poll, &wait);
goto out_unlocked;
}
- if (!ir->attached) {
+ if (!d->attached) {
ret = -ENODEV;
goto out_locked;
}
} else {
- lirc_buffer_read(ir->buf, buf);
+ lirc_buffer_read(d->buf, buf);
ret = copy_to_user((void __user *)buffer+written, buf,
- ir->buf->chunk_size);
+ d->buf->chunk_size);
if (!ret)
- written += ir->buf->chunk_size;
+ written += d->buf->chunk_size;
else
ret = -EFAULT;
}
}
- remove_wait_queue(&ir->buf->wait_poll, &wait);
+ remove_wait_queue(&d->buf->wait_poll, &wait);
out_locked:
- mutex_unlock(&ir->irctl_lock);
+ mutex_unlock(&d->irctl_lock);
out_unlocked:
kfree(buf);
@@ -738,7 +707,7 @@ EXPORT_SYMBOL(lirc_dev_fop_read);
void *lirc_get_pdata(struct file *file)
{
- return irctls[iminor(file_inode(file))]->d.data;
+ return irctls[iminor(file_inode(file))]->data;
}
EXPORT_SYMBOL(lirc_get_pdata);
@@ -746,14 +715,14 @@ EXPORT_SYMBOL(lirc_get_pdata);
ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
size_t length, loff_t *ppos)
{
- struct irctl *ir = irctls[iminor(file_inode(file))];
+ struct lirc_driver *d = irctls[iminor(file_inode(file))];
- if (!ir) {
+ if (!d) {
pr_err("called with invalid irctl\n");
return -ENODEV;
}
- if (!ir->attached)
+ if (!d->attached)
return -ENODEV;
return -EINVAL;
diff --git a/drivers/staging/media/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c
index b0c176e..dd9c877 100644
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -167,7 +167,6 @@ static void delete_context(struct sasem_context *context)
usb_free_urb(context->rx_urb); /* IR */
lirc_buffer_free(context->driver->rbuf);
kfree(context->driver->rbuf);
- kfree(context->driver);
kfree(context);
}
diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
index cec7d35..aa4ec34 100644
--- a/include/media/lirc_dev.h
+++ b/include/media/lirc_dev.h
@@ -182,6 +182,20 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
* device.
*
* @owner: the module owning this struct
+ *
+ * @attached: 1 if the device is still attached, 0 otherwise
+ *
+ * @open: 1 if the lirc char device has been opened
+ *
+ * @irctl_lock: mutex for the structure
+ *
+ * @buf: read buffer used if rbuf is not set
+ *
+ * @cdev: the char device structure
+ *
+ * @task: thread performing read polling, if present
+ *
+ * @jiffies_to_wait: jiffies to sleep in read polling thread
*/
struct lirc_driver {
char name[40];
@@ -204,6 +218,17 @@ struct lirc_driver {
const struct file_operations *fops;
struct device *dev;
struct module *owner;
+
+ int attached;
+ int open;
+
+ struct mutex irctl_lock;
+ struct lirc_buffer *buf;
+
+ struct cdev *cdev;
+
+ struct task_struct *task;
+ long jiffies_to_wait;
};
/* following functions can be called ONLY from user context
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/9] [media] lirc: use plain kfifo rather than lirc_buffer
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
2017-01-06 12:49 ` [PATCH 1/9] [media] lirc: lirc interface should not be a raw decoder Sean Young
2017-01-06 12:49 ` [PATCH 2/9] [media] lirc: exorcise struct irctl Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-06 12:49 ` [PATCH 4/9] [media] lirc: implement scancode sending Sean Young
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
Since a lirc char device can only be opened once, there can only be one
reader. By using a plain kfifo we don't need a spinlock and we can use
kfifo_to_user. The code is much simplified.
Unfortunately we cannot eliminate lirc_buffer from the tree yet, as there
are still some staging lirc drivers which use it.
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/ir-lirc-codec.c | 105 ++++++++++++++++++++++++++-------------
drivers/media/rc/rc-core-priv.h | 26 ++++++++++
2 files changed, 96 insertions(+), 35 deletions(-)
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index b78a402..46dfcec 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -19,8 +19,6 @@
#include <media/rc-core.h>
#include "rc-core-priv.h"
-#define LIRCBUF_SIZE 256
-
/**
* ir_lirc_raw_event() - Send raw IR data to lirc to be relayed to userspace
*
@@ -32,10 +30,7 @@
int ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
{
struct lirc_codec *lirc = &dev->raw->lirc;
- int sample;
-
- if (!dev->raw->lirc.drv || !dev->raw->lirc.drv->rbuf)
- return -EINVAL;
+ unsigned int sample;
/* Packet start */
if (ev.reset) {
@@ -70,10 +65,7 @@ int ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
/* Normal sample */
} else {
-
if (lirc->gap) {
- int gap_sample;
-
lirc->gap_duration += ktime_to_ns(ktime_sub(ktime_get(),
lirc->gap_start));
@@ -82,9 +74,7 @@ int ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
lirc->gap_duration = min(lirc->gap_duration,
(u64)LIRC_VALUE_MASK);
- gap_sample = LIRC_SPACE(lirc->gap_duration);
- lirc_buffer_write(dev->raw->lirc.drv->rbuf,
- (unsigned char *) &gap_sample);
+ kfifo_put(&lirc->kfifo, LIRC_SPACE(lirc->gap_duration));
lirc->gap = false;
}
@@ -94,9 +84,8 @@ int ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
TO_US(ev.duration), TO_STR(ev.pulse));
}
- lirc_buffer_write(dev->raw->lirc.drv->rbuf,
- (unsigned char *) &sample);
- wake_up(&dev->raw->lirc.drv->rbuf->wait_poll);
+ kfifo_put(&lirc->kfifo, sample);
+ wake_up_poll(&lirc->wait_poll, POLLIN);
return 0;
}
@@ -317,8 +306,67 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
return ret;
}
+static unsigned int ir_lirc_poll_ir(struct file *filep,
+ struct poll_table_struct *wait)
+{
+ struct lirc_codec *lirc = lirc_get_pdata(filep);
+ unsigned int events = 0;
+
+ if (!lirc->drv->attached)
+ return POLLERR;
+
+ poll_wait(filep, &lirc->wait_poll, wait);
+
+ if (!lirc->drv->attached)
+ events = POLLERR;
+ else if (!kfifo_is_empty(&lirc->kfifo))
+ events = POLLIN | POLLRDNORM;
+
+ return events;
+}
+
+static ssize_t ir_lirc_read_ir(struct file *filep, char __user *buffer,
+ size_t length, loff_t *ppos)
+{
+ struct lirc_codec *lirc = lirc_get_pdata(filep);
+ unsigned int copied;
+ int ret;
+
+ if (length % sizeof(unsigned int))
+ return -EINVAL;
+
+ if (!lirc->drv->attached)
+ return -ENODEV;
+
+ do {
+ if (kfifo_is_empty(&lirc->kfifo)) {
+ if (filep->f_flags & O_NONBLOCK)
+ return -EAGAIN;
+
+ ret = wait_event_interruptible(lirc->wait_poll,
+ !kfifo_is_empty(&lirc->kfifo) ||
+ !lirc->drv->attached);
+ if (ret)
+ return ret;
+ }
+
+ if (!lirc->drv->attached)
+ return -ENODEV;
+
+ ret = kfifo_to_user(&lirc->kfifo, buffer, length, &copied);
+ if (ret)
+ return ret;
+ } while (copied == 0);
+
+ return copied;
+}
+
static int ir_lirc_open(void *data)
{
+ struct lirc_codec *lirc = data;
+
+ kfifo_reset_out(&lirc->kfifo);
+
return 0;
}
@@ -334,8 +382,8 @@ static const struct file_operations lirc_fops = {
#ifdef CONFIG_COMPAT
.compat_ioctl = ir_lirc_ioctl,
#endif
- .read = lirc_dev_fop_read,
- .poll = lirc_dev_fop_poll,
+ .read = ir_lirc_read_ir,
+ .poll = ir_lirc_poll_ir,
.open = lirc_dev_fop_open,
.release = lirc_dev_fop_close,
.llseek = no_llseek,
@@ -344,21 +392,12 @@ static const struct file_operations lirc_fops = {
int ir_lirc_register(struct rc_dev *dev)
{
struct lirc_driver *drv;
- struct lirc_buffer *rbuf;
int rc = -ENOMEM;
unsigned long features;
- drv = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL);
+ drv = kzalloc(sizeof(*drv), GFP_KERNEL);
if (!drv)
- return rc;
-
- rbuf = kzalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
- if (!rbuf)
- goto rbuf_alloc_failed;
-
- rc = lirc_buffer_init(rbuf, sizeof(int), LIRCBUF_SIZE);
- if (rc)
- goto rbuf_init_failed;
+ return -ENOMEM;
features = LIRC_CAN_REC_MODE2;
if (dev->tx_ir) {
@@ -389,7 +428,6 @@ int ir_lirc_register(struct rc_dev *dev)
drv->minor = -1;
drv->features = features;
drv->data = &dev->raw->lirc;
- drv->rbuf = rbuf;
drv->set_use_inc = &ir_lirc_open;
drv->set_use_dec = &ir_lirc_close;
drv->code_length = sizeof(struct ir_raw_event) * 8;
@@ -397,6 +435,8 @@ int ir_lirc_register(struct rc_dev *dev)
drv->dev = &dev->dev;
drv->rdev = dev;
drv->owner = THIS_MODULE;
+ INIT_KFIFO(dev->raw->lirc.kfifo);
+ init_waitqueue_head(&dev->raw->lirc.wait_poll);
drv->minor = lirc_register_driver(drv);
if (drv->minor < 0) {
@@ -409,11 +449,7 @@ int ir_lirc_register(struct rc_dev *dev)
return 0;
lirc_register_failed:
-rbuf_init_failed:
- kfree(rbuf);
-rbuf_alloc_failed:
kfree(drv);
-
return rc;
}
@@ -421,9 +457,8 @@ int ir_lirc_unregister(struct rc_dev *dev)
{
struct lirc_codec *lirc = &dev->raw->lirc;
+ wake_up_poll(&lirc->wait_poll, POLLERR);
lirc_unregister_driver(lirc->drv->minor);
- lirc_buffer_free(lirc->drv->rbuf);
- kfree(lirc->drv->rbuf);
return 0;
}
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 6819310..f612340 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -19,7 +19,11 @@
/* Define the max number of pulse/space transitions to buffer */
#define MAX_IR_EVENT_SIZE 512
+/* Define the number */
+#define LIRCBUF_SIZE 256
+
#include <linux/slab.h>
+#include <media/lirc_dev.h>
#include <media/rc-core.h>
struct ir_raw_handler {
@@ -47,6 +51,7 @@ struct ir_raw_event_ctrl {
/* raw decoder state follows */
struct ir_raw_event prev_ev;
struct ir_raw_event this_ev;
+#if IS_ENABLED(CONFIG_IR_NEC_DECODER)
struct nec_dec {
int state;
unsigned count;
@@ -54,12 +59,16 @@ struct ir_raw_event_ctrl {
bool is_nec_x;
bool necx_repeat;
} nec;
+#endif
+#if IS_ENABLED(CONFIG_IR_RC5_DECODER)
struct rc5_dec {
int state;
u32 bits;
unsigned count;
bool is_rc5x;
} rc5;
+#endif
+#if IS_ENABLED(CONFIG_IR_RC6_DECODER)
struct rc6_dec {
int state;
u8 header;
@@ -68,11 +77,15 @@ struct ir_raw_event_ctrl {
unsigned count;
unsigned wanted_bits;
} rc6;
+#endif
+#if IS_ENABLED(CONFIG_IR_SONY_DECODER)
struct sony_dec {
int state;
u32 bits;
unsigned count;
} sony;
+#endif
+#if IS_ENABLED(CONFIG_IR_JVC_DECODER)
struct jvc_dec {
int state;
u16 bits;
@@ -81,17 +94,23 @@ struct ir_raw_event_ctrl {
bool first;
bool toggle;
} jvc;
+#endif
+#if IS_ENABLED(CONFIG_IR_SANYO_DECODER)
struct sanyo_dec {
int state;
unsigned count;
u64 bits;
} sanyo;
+#endif
+#if IS_ENABLED(CONFIG_IR_SHARP_DECODER)
struct sharp_dec {
int state;
unsigned count;
u32 bits;
unsigned int pulse_len;
} sharp;
+#endif
+#if IS_ENABLED(CONFIG_IR_MCE_KBD_DECODER)
struct mce_kbd_dec {
struct input_dev *idev;
struct timer_list rx_timeout;
@@ -103,9 +122,13 @@ struct ir_raw_event_ctrl {
unsigned count;
unsigned wanted_bits;
} mce_kbd;
+#endif
+#if IS_ENABLED(CONFIG_IR_LIRC_CODEC)
struct lirc_codec {
struct rc_dev *dev;
struct lirc_driver *drv;
+ DECLARE_KFIFO(kfifo, unsigned int, LIRCBUF_SIZE);
+ wait_queue_head_t wait_poll;
int carrier_low;
ktime_t gap_start;
@@ -114,11 +137,14 @@ struct ir_raw_event_ctrl {
bool send_timeout_reports;
} lirc;
+#endif
+#if IS_ENABLED(CONFIG_IR_XMP_DECODER)
struct xmp_dec {
int state;
unsigned count;
u32 durations[16];
} xmp;
+#endif
};
/* macros for IR decoders */
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/9] [media] lirc: implement scancode sending
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
` (2 preceding siblings ...)
2017-01-06 12:49 ` [PATCH 3/9] [media] lirc: use plain kfifo rather than lirc_buffer Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-06 12:49 ` [PATCH 5/9] [media] rc: use the correct carrier for scancode transmit Sean Young
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
This introduces a new lirc mode: scancode. Any device which can send raw IR
can also send scancodes.
int main()
{
int fd, mode, rc;
fd = open("/dev/lirc0", O_RDWR);
mode = LIRC_MODE_SCANCODE;
if (ioctl(fd, LIRC_SET_SEND_MODE, &mode)) {
// kernel too old or lirc does not support transmit
}
struct lirc_scancode scancode {
.scancode = 0x1e3d,
.rc_type = RC_TYPE_RC5,
.flags = 0
};
write(fd, &scancode, sizeof(scancode));
close(fd);
}
Note that toggle (rc5, rc6) and repeats (nec) are not implemented. Nor is
there a method for holding down a key for a period.
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/ir-lirc-codec.c | 64 ++++++++++++++++++++++++++++++--------
drivers/media/rc/rc-core-priv.h | 2 +-
include/media/rc-map.h | 52 +------------------------------
include/uapi/linux/lirc.h | 66 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 120 insertions(+), 64 deletions(-)
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 46dfcec..307b1d9 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -96,6 +96,7 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
struct lirc_codec *lirc;
struct rc_dev *dev;
unsigned int *txbuf; /* buffer with values to transmit */
+ struct ir_raw_event *raw = NULL;
ssize_t ret = -EINVAL;
size_t count;
ktime_t start;
@@ -109,16 +110,49 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
if (!lirc)
return -EFAULT;
- if (n < sizeof(unsigned) || n % sizeof(unsigned))
- return -EINVAL;
+ if (lirc->send_mode == LIRC_MODE_SCANCODE) {
+ struct lirc_scancode scan;
- count = n / sizeof(unsigned);
- if (count > LIRCBUF_SIZE || count % 2 == 0)
- return -EINVAL;
+ if (n != sizeof(scan))
+ return -EINVAL;
+
+ if (copy_from_user(&scan, buf, sizeof(scan)))
+ return -EFAULT;
+
+ if (scan.flags)
+ return -EINVAL;
+
+ raw = kmalloc_array(LIRCBUF_SIZE, sizeof(*raw), GFP_KERNEL);
+ if (!raw)
+ return -ENOMEM;
+
+ ret = ir_raw_encode_scancode(scan.rc_type, scan.scancode,
+ raw, LIRCBUF_SIZE);
+ if (ret < 0)
+ goto out;
+
+ count = ret;
- txbuf = memdup_user(buf, n);
- if (IS_ERR(txbuf))
- return PTR_ERR(txbuf);
+ txbuf = kmalloc_array(count, sizeof(unsigned int), GFP_KERNEL);
+ if (!txbuf) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ for (i = 0; i < count; i++)
+ txbuf[i] = DIV_ROUND_UP(raw[i].duration, 1000);
+ } else {
+ if (n < sizeof(unsigned int) || n % sizeof(unsigned int))
+ return -EINVAL;
+
+ count = n / sizeof(unsigned int);
+ if (count > LIRCBUF_SIZE || count % 2 == 0)
+ return -EINVAL;
+
+ txbuf = memdup_user(buf, n);
+ if (IS_ERR(txbuf))
+ return PTR_ERR(txbuf);
+ }
dev = lirc->dev;
if (!dev) {
@@ -147,7 +181,10 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
for (duration = i = 0; i < ret; i++)
duration += txbuf[i];
- ret *= sizeof(unsigned int);
+ if (lirc->send_mode == LIRC_MODE_SCANCODE)
+ ret = n;
+ else
+ ret *= sizeof(unsigned int);
/*
* The lircd gap calculation expects the write function to
@@ -162,6 +199,7 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
out:
kfree(txbuf);
+ kfree(raw);
return ret;
}
@@ -195,15 +233,17 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
if (!dev->tx_ir)
return -ENOTTY;
- val = LIRC_MODE_PULSE;
+ val = lirc->send_mode;
break;
case LIRC_SET_SEND_MODE:
if (!dev->tx_ir)
return -ENOTTY;
- if (val != LIRC_MODE_PULSE)
+ if (!(val == LIRC_MODE_PULSE || val == LIRC_MODE_SCANCODE))
return -EINVAL;
+
+ lirc->send_mode = val;
return 0;
/* TX settings */
@@ -401,7 +441,7 @@ int ir_lirc_register(struct rc_dev *dev)
features = LIRC_CAN_REC_MODE2;
if (dev->tx_ir) {
- features |= LIRC_CAN_SEND_PULSE;
+ features |= LIRC_CAN_SEND_PULSE | LIRC_CAN_SEND_SCANCODE;
if (dev->s_tx_mask)
features |= LIRC_CAN_SET_TRANSMITTER_MASK;
if (dev->s_tx_carrier)
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index f612340..5ec0932 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -135,7 +135,7 @@ struct ir_raw_event_ctrl {
u64 gap_duration;
bool gap;
bool send_timeout_reports;
-
+ int send_mode;
} lirc;
#endif
#if IS_ENABLED(CONFIG_IR_XMP_DECODER)
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index df7b032..8711132 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -10,57 +10,7 @@
*/
#include <linux/input.h>
-
-/**
- * enum rc_type - type of the Remote Controller protocol
- *
- * @RC_TYPE_UNKNOWN: Protocol not known
- * @RC_TYPE_OTHER: Protocol known but proprietary
- * @RC_TYPE_RC5: Philips RC5 protocol
- * @RC_TYPE_RC5X_20: Philips RC5x 20 bit protocol
- * @RC_TYPE_RC5_SZ: StreamZap variant of RC5
- * @RC_TYPE_JVC: JVC protocol
- * @RC_TYPE_SONY12: Sony 12 bit protocol
- * @RC_TYPE_SONY15: Sony 15 bit protocol
- * @RC_TYPE_SONY20: Sony 20 bit protocol
- * @RC_TYPE_NEC: NEC protocol
- * @RC_TYPE_NECX: Extended NEC protocol
- * @RC_TYPE_NEC32: NEC 32 bit protocol
- * @RC_TYPE_SANYO: Sanyo protocol
- * @RC_TYPE_MCE_KBD: RC6-ish MCE keyboard/mouse
- * @RC_TYPE_RC6_0: Philips RC6-0-16 protocol
- * @RC_TYPE_RC6_6A_20: Philips RC6-6A-20 protocol
- * @RC_TYPE_RC6_6A_24: Philips RC6-6A-24 protocol
- * @RC_TYPE_RC6_6A_32: Philips RC6-6A-32 protocol
- * @RC_TYPE_RC6_MCE: MCE (Philips RC6-6A-32 subtype) protocol
- * @RC_TYPE_SHARP: Sharp protocol
- * @RC_TYPE_XMP: XMP protocol
- * @RC_TYPE_CEC: CEC protocol
- */
-enum rc_type {
- RC_TYPE_UNKNOWN = 0,
- RC_TYPE_OTHER = 1,
- RC_TYPE_RC5 = 2,
- RC_TYPE_RC5X_20 = 3,
- RC_TYPE_RC5_SZ = 4,
- RC_TYPE_JVC = 5,
- RC_TYPE_SONY12 = 6,
- RC_TYPE_SONY15 = 7,
- RC_TYPE_SONY20 = 8,
- RC_TYPE_NEC = 9,
- RC_TYPE_NECX = 10,
- RC_TYPE_NEC32 = 11,
- RC_TYPE_SANYO = 12,
- RC_TYPE_MCE_KBD = 13,
- RC_TYPE_RC6_0 = 14,
- RC_TYPE_RC6_6A_20 = 15,
- RC_TYPE_RC6_6A_24 = 16,
- RC_TYPE_RC6_6A_32 = 17,
- RC_TYPE_RC6_MCE = 18,
- RC_TYPE_SHARP = 19,
- RC_TYPE_XMP = 20,
- RC_TYPE_CEC = 21,
-};
+#include <linux/lirc.h>
#define RC_BIT_NONE 0ULL
#define RC_BIT_UNKNOWN (1ULL << RC_TYPE_UNKNOWN)
diff --git a/include/uapi/linux/lirc.h b/include/uapi/linux/lirc.h
index 991ab45..c623568 100644
--- a/include/uapi/linux/lirc.h
+++ b/include/uapi/linux/lirc.h
@@ -46,12 +46,14 @@
#define LIRC_MODE_RAW 0x00000001
#define LIRC_MODE_PULSE 0x00000002
#define LIRC_MODE_MODE2 0x00000004
+#define LIRC_MODE_SCANCODE 0x00000008
#define LIRC_MODE_LIRCCODE 0x00000010
#define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW)
#define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE)
#define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2)
+#define LIRC_CAN_SEND_SCANCODE LIRC_MODE2SEND(LIRC_MODE_SCANCODE)
#define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
#define LIRC_CAN_SEND_MASK 0x0000003f
@@ -63,6 +65,7 @@
#define LIRC_CAN_REC_RAW LIRC_MODE2REC(LIRC_MODE_RAW)
#define LIRC_CAN_REC_PULSE LIRC_MODE2REC(LIRC_MODE_PULSE)
#define LIRC_CAN_REC_MODE2 LIRC_MODE2REC(LIRC_MODE_MODE2)
+#define LIRC_CAN_REC_SCANCODE LIRC_MODE2REC(LIRC_MODE_SCANCODE)
#define LIRC_CAN_REC_LIRCCODE LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
#define LIRC_CAN_REC_MASK LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
@@ -130,4 +133,67 @@
#define LIRC_SET_WIDEBAND_RECEIVER _IOW('i', 0x00000023, __u32)
+/*
+ * Sending and receiving scancodes
+ */
+struct lirc_scancode {
+ __u16 flags;
+ __u16 rc_type;
+ __u32 scancode;
+};
+
+#define LIRC_SCANCODE_FLAG_TOGGLE 1
+#define LIRC_SCANCODE_FLAG_REPEAT 2
+
+/**
+ * enum rc_type - type of the Remote Controller protocol
+ *
+ * @RC_TYPE_UNKNOWN: Protocol not known
+ * @RC_TYPE_OTHER: Protocol known but proprietary
+ * @RC_TYPE_RC5: Philips RC5 protocol
+ * @RC_TYPE_RC5X_20: Philips RC5x 20 bit protocol
+ * @RC_TYPE_RC5_SZ: StreamZap variant of RC5
+ * @RC_TYPE_JVC: JVC protocol
+ * @RC_TYPE_SONY12: Sony 12 bit protocol
+ * @RC_TYPE_SONY15: Sony 15 bit protocol
+ * @RC_TYPE_SONY20: Sony 20 bit protocol
+ * @RC_TYPE_NEC: NEC protocol
+ * @RC_TYPE_NECX: Extended NEC protocol
+ * @RC_TYPE_NEC32: NEC 32 bit protocol
+ * @RC_TYPE_SANYO: Sanyo protocol
+ * @RC_TYPE_MCE_KBD: RC6-ish MCE keyboard/mouse
+ * @RC_TYPE_RC6_0: Philips RC6-0-16 protocol
+ * @RC_TYPE_RC6_6A_20: Philips RC6-6A-20 protocol
+ * @RC_TYPE_RC6_6A_24: Philips RC6-6A-24 protocol
+ * @RC_TYPE_RC6_6A_32: Philips RC6-6A-32 protocol
+ * @RC_TYPE_RC6_MCE: MCE (Philips RC6-6A-32 subtype) protocol
+ * @RC_TYPE_SHARP: Sharp protocol
+ * @RC_TYPE_XMP: XMP protocol
+ * @RC_TYPE_CEC: CEC protocol
+ */
+enum rc_type {
+ RC_TYPE_UNKNOWN = 0,
+ RC_TYPE_OTHER = 1,
+ RC_TYPE_RC5 = 2,
+ RC_TYPE_RC5X_20 = 3,
+ RC_TYPE_RC5_SZ = 4,
+ RC_TYPE_JVC = 5,
+ RC_TYPE_SONY12 = 6,
+ RC_TYPE_SONY15 = 7,
+ RC_TYPE_SONY20 = 8,
+ RC_TYPE_NEC = 9,
+ RC_TYPE_NECX = 10,
+ RC_TYPE_NEC32 = 11,
+ RC_TYPE_SANYO = 12,
+ RC_TYPE_MCE_KBD = 13,
+ RC_TYPE_RC6_0 = 14,
+ RC_TYPE_RC6_6A_20 = 15,
+ RC_TYPE_RC6_6A_24 = 16,
+ RC_TYPE_RC6_6A_32 = 17,
+ RC_TYPE_RC6_MCE = 18,
+ RC_TYPE_SHARP = 19,
+ RC_TYPE_XMP = 20,
+ RC_TYPE_CEC = 21,
+};
+
#endif
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/9] [media] rc: use the correct carrier for scancode transmit
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
` (3 preceding siblings ...)
2017-01-06 12:49 ` [PATCH 4/9] [media] lirc: implement scancode sending Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-06 12:49 ` [PATCH 6/9] [media] rc: auto load encoder if necessary Sean Young
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
If the lirc device supports it, set the carrier for the protocol.
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/ir-jvc-decoder.c | 1 +
drivers/media/rc/ir-lirc-codec.c | 28 ++++++++++++++++------------
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/rc-core-priv.h | 1 +
drivers/media/rc/rc-ir-raw.c | 30 ++++++++++++++++++++++++++++++
include/media/rc-core.h | 1 +
11 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
index 674bf15..f3a1f6e 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_BIT_JVC,
.decode = ir_jvc_decode,
.encode = ir_jvc_encode,
+ .carrier = 38000,
};
static int __init ir_jvc_decode_init(void)
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 307b1d9..4c7dd03 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -95,7 +95,7 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
{
struct lirc_codec *lirc;
struct rc_dev *dev;
- unsigned int *txbuf; /* buffer with values to transmit */
+ unsigned int *txbuf = NULL; /* buffer with values to transmit */
struct ir_raw_event *raw = NULL;
ssize_t ret = -EINVAL;
size_t count;
@@ -110,6 +110,13 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
if (!lirc)
return -EFAULT;
+ dev = lirc->dev;
+ if (!dev)
+ return -EFAULT;
+
+ if (!dev->tx_ir)
+ return -ENOTTY;
+
if (lirc->send_mode == LIRC_MODE_SCANCODE) {
struct lirc_scancode scan;
@@ -140,7 +147,15 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
}
for (i = 0; i < count; i++)
+ /* Convert from NS to US */
txbuf[i] = DIV_ROUND_UP(raw[i].duration, 1000);
+
+ if (dev->s_tx_carrier) {
+ int carrier = ir_raw_encode_carrier(scan.rc_type);
+
+ if (carrier > 0)
+ dev->s_tx_carrier(dev, carrier);
+ }
} else {
if (n < sizeof(unsigned int) || n % sizeof(unsigned int))
return -EINVAL;
@@ -154,17 +169,6 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
return PTR_ERR(txbuf);
}
- dev = lirc->dev;
- if (!dev) {
- ret = -EFAULT;
- goto out;
- }
-
- if (!dev->tx_ir) {
- ret = -ENOSYS;
- goto out;
- }
-
for (i = 0; i < count; i++) {
if (txbuf[i] > IR_MAX_DURATION / 1000 - duration || !txbuf[i]) {
ret = -EINVAL;
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index 3ce8503..8f9ca71 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -288,6 +288,7 @@ static struct ir_raw_handler nec_handler = {
.protocols = RC_BIT_NEC | RC_BIT_NECX | RC_BIT_NEC32,
.decode = ir_nec_decode,
.encode = ir_nec_encode,
+ .carrier = 38000,
};
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 fcfedf9..d92e49b 100644
--- a/drivers/media/rc/ir-rc5-decoder.c
+++ b/drivers/media/rc/ir-rc5-decoder.c
@@ -281,6 +281,7 @@ static struct ir_raw_handler rc5_handler = {
.protocols = RC_BIT_RC5 | RC_BIT_RC5X_20 | RC_BIT_RC5_SZ,
.decode = ir_rc5_decode,
.encode = ir_rc5_encode,
+ .carrier = 36000,
};
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 6fe2268..83a36f4 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_BIT_RC6_MCE,
.decode = ir_rc6_decode,
.encode = ir_rc6_encode,
+ .carrier = 36000,
};
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 520bb77..7d3bc03 100644
--- a/drivers/media/rc/ir-sanyo-decoder.c
+++ b/drivers/media/rc/ir-sanyo-decoder.c
@@ -222,6 +222,7 @@ static struct ir_raw_handler sanyo_handler = {
.protocols = RC_BIT_SANYO,
.decode = ir_sanyo_decode,
.encode = ir_sanyo_encode,
+ .carrier = 38000,
};
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 b47e89e..2b08da4 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_BIT_SHARP,
.decode = ir_sharp_decode,
.encode = ir_sharp_encode,
+ .carrier = 38000,
};
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 355fa81..e36e779 100644
--- a/drivers/media/rc/ir-sony-decoder.c
+++ b/drivers/media/rc/ir-sony-decoder.c
@@ -220,6 +220,7 @@ static struct ir_raw_handler sony_handler = {
.protocols = RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20,
.decode = ir_sony_decode,
.encode = ir_sony_encode,
+ .carrier = 40000,
};
static int __init ir_sony_decode_init(void)
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 5ec0932..c183b70 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -33,6 +33,7 @@ struct ir_raw_handler {
int (*decode)(struct rc_dev *dev, struct ir_raw_event event);
int (*encode)(enum rc_type protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max);
+ u32 carrier;
/* These two should only be used by the mce kbd 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 2421258..49f1b14 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -484,6 +484,36 @@ int ir_raw_encode_scancode(enum rc_type protocol, u32 scancode,
}
EXPORT_SYMBOL(ir_raw_encode_scancode);
+/**
+ * ir_raw_encode_carrier() - Get carrier used for protocol
+ *
+ * @protocol: protocol
+ *
+ * Attempts to find the carrier for the specified protocol
+ *
+ * Returns: The carrier in Hz
+ * -EINVAL if the protocol is invalid, or if no
+ * compatible encoder was found.
+ */
+int ir_raw_encode_carrier(enum rc_type protocol)
+{
+ struct ir_raw_handler *handler;
+ int ret = -EINVAL;
+ u64 mask = 1ULL << protocol;
+
+ mutex_lock(&ir_raw_handler_lock);
+ list_for_each_entry(handler, &ir_raw_handler_list, list) {
+ if (handler->protocols & mask && handler->encode) {
+ ret = handler->carrier;
+ break;
+ }
+ }
+ mutex_unlock(&ir_raw_handler_lock);
+
+ return ret;
+}
+EXPORT_SYMBOL(ir_raw_encode_carrier);
+
/*
* Used to (un)register raw event clients
*/
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 73ddd721..f06d9ae 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -316,6 +316,7 @@ int ir_raw_event_store_with_filter(struct rc_dev *dev,
void ir_raw_event_set_idle(struct rc_dev *dev, bool idle);
int ir_raw_encode_scancode(enum rc_type protocol, u32 scancode,
struct ir_raw_event *events, unsigned int max);
+int ir_raw_encode_carrier(enum rc_type protocol);
static inline void ir_raw_event_reset(struct rc_dev *dev)
{
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/9] [media] rc: auto load encoder if necessary
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
` (4 preceding siblings ...)
2017-01-06 12:49 ` [PATCH 5/9] [media] rc: use the correct carrier for scancode transmit Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-06 12:49 ` [PATCH 7/9] [media] lirc: implement reading scancode Sean Young
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
When sending scancodes, load the encoder if we need it.
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/rc-core-priv.h | 1 +
drivers/media/rc/rc-ir-raw.c | 2 ++
drivers/media/rc/rc-main.c | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index c183b70..337b9ce 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -294,6 +294,7 @@ int ir_raw_event_register(struct rc_dev *dev);
void ir_raw_event_unregister(struct rc_dev *dev);
int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler);
void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler);
+void ir_raw_load_modules(u64 *protocols);
void ir_raw_init(void);
/*
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
index 49f1b14..a1e89a8 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -470,6 +470,8 @@ int ir_raw_encode_scancode(enum rc_type protocol, u32 scancode,
int ret = -EINVAL;
u64 mask = 1ULL << protocol;
+ ir_raw_load_modules(&mask);
+
mutex_lock(&ir_raw_handler_lock);
list_for_each_entry(handler, &ir_raw_handler_list, list) {
if (handler->protocols & mask && handler->encode) {
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index b135365..bfc43e9 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1036,7 +1036,7 @@ static int parse_protocol_change(u64 *protocols, const char *buf)
return count;
}
-static void ir_raw_load_modules(u64 *protocols)
+void ir_raw_load_modules(u64 *protocols)
{
u64 available;
int i, ret;
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 7/9] [media] lirc: implement reading scancode
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
` (5 preceding siblings ...)
2017-01-06 12:49 ` [PATCH 6/9] [media] rc: auto load encoder if necessary Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-06 12:49 ` [PATCH 8/9] [media] lirc: scancode rc devices should have a lirc device too Sean Young
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
This implements LIRC_MODE_SCANCODE reading from the lirc device. The
scancode can be read from the input device too, but with this interface
you get the rc protocol, toggle and repeat status in addition too just
the scancode.
int main()
{
int fd, mode, rc;
fd = open("/dev/lirc0", O_RDWR);
mode = LIRC_MODE_SCANCODE;
if (ioctl(fd, LIRC_SET_REC_MODE, &mode)) {
// kernel too old or lirc does not support transmit
}
struct lirc_scancode scancode;
while (read(fd, &scancode, sizeof(scancode)) == sizeof(scancode)) {
printf("protocol:%d scancode:0x%x toggle:%d repeat:%d\n",
scancode.rc_type, scancode.scancode,
!!(scancode.flags & LIRC_SCANCODE_FLAG_TOGGLE),
!!(scancode.flags & LIRC_SCANCODE_FLAG_REPEAT));
}
close(fd);
}
Note that the translated KEY_* is not included, that information is
published to the input device.
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/ir-lirc-codec.c | 95 ++++++++++++++++++++++++++++++++--------
drivers/media/rc/rc-core-priv.h | 11 +++++
drivers/media/rc/rc-main.c | 17 +++++++
include/media/rc-core.h | 3 +-
4 files changed, 107 insertions(+), 19 deletions(-)
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 4c7dd03..6a15192 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -231,8 +231,31 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
}
switch (cmd) {
+ case LIRC_GET_REC_MODE:
+ if (dev->driver_type == RC_DRIVER_IR_RAW_TX)
+ return -ENOTTY;
+
+ val = lirc->rec_mode;
+ break;
+
+ case LIRC_SET_REC_MODE:
+ switch (dev->driver_type) {
+ case RC_DRIVER_IR_RAW_TX:
+ return -ENOTTY;
+ case RC_DRIVER_SCANCODE:
+ if (val != LIRC_MODE_SCANCODE)
+ return -EINVAL;
+ break;
+ case RC_DRIVER_IR_RAW:
+ if (!(val == LIRC_MODE_SCANCODE ||
+ val == LIRC_MODE_MODE2))
+ return -EINVAL;
+ break;
+ }
+
+ lirc->rec_mode = val;
+ return 0;
- /* legacy support */
case LIRC_GET_SEND_MODE:
if (!dev->tx_ir)
return -ENOTTY;
@@ -376,31 +399,60 @@ static ssize_t ir_lirc_read_ir(struct file *filep, char __user *buffer,
unsigned int copied;
int ret;
- if (length % sizeof(unsigned int))
- return -EINVAL;
-
if (!lirc->drv->attached)
return -ENODEV;
- do {
- if (kfifo_is_empty(&lirc->kfifo)) {
- if (filep->f_flags & O_NONBLOCK)
- return -EAGAIN;
+ if (lirc->rec_mode == LIRC_MODE_SCANCODE) {
+ struct rc_dev *rcdev = lirc->dev;
+
+ if (length % sizeof(struct lirc_scancode))
+ return -EINVAL;
+
+ do {
+ if (kfifo_is_empty(&rcdev->kfifo)) {
+ if (filep->f_flags & O_NONBLOCK)
+ return -EAGAIN;
- ret = wait_event_interruptible(lirc->wait_poll,
- !kfifo_is_empty(&lirc->kfifo) ||
+ ret = wait_event_interruptible(lirc->wait_poll,
+ !kfifo_is_empty(&rcdev->kfifo) ||
!lirc->drv->attached);
+ if (ret)
+ return ret;
+ }
+
+ if (!lirc->drv->attached)
+ return -ENODEV;
+
+ ret = kfifo_to_user(&rcdev->kfifo, buffer, length,
+ &copied);
if (ret)
return ret;
- }
+ } while (copied == 0);
+ } else {
+ if (length % sizeof(unsigned int))
+ return -EINVAL;
- if (!lirc->drv->attached)
- return -ENODEV;
+ do {
+ if (kfifo_is_empty(&lirc->kfifo)) {
+ if (filep->f_flags & O_NONBLOCK)
+ return -EAGAIN;
- ret = kfifo_to_user(&lirc->kfifo, buffer, length, &copied);
- if (ret)
- return ret;
- } while (copied == 0);
+ ret = wait_event_interruptible(lirc->wait_poll,
+ !kfifo_is_empty(&lirc->kfifo) ||
+ !lirc->drv->attached);
+ if (ret)
+ return ret;
+ }
+
+ if (!lirc->drv->attached)
+ return -ENODEV;
+
+ ret = kfifo_to_user(&lirc->kfifo, buffer, length,
+ &copied);
+ if (ret)
+ return ret;
+ } while (copied == 0);
+ }
return copied;
}
@@ -410,6 +462,7 @@ static int ir_lirc_open(void *data)
struct lirc_codec *lirc = data;
kfifo_reset_out(&lirc->kfifo);
+ kfifo_reset_out(&lirc->dev->kfifo);
return 0;
}
@@ -443,8 +496,14 @@ int ir_lirc_register(struct rc_dev *dev)
if (!drv)
return -ENOMEM;
- features = LIRC_CAN_REC_MODE2;
+ features = LIRC_CAN_REC_SCANCODE;
+ dev->raw->lirc.rec_mode = LIRC_MODE_SCANCODE;
+ if (dev->driver_type == RC_DRIVER_IR_RAW) {
+ features |= LIRC_CAN_REC_MODE2;
+ dev->raw->lirc.rec_mode = LIRC_MODE_MODE2;
+ }
if (dev->tx_ir) {
+ dev->raw->lirc.send_mode = LIRC_MODE_PULSE;
features |= LIRC_CAN_SEND_PULSE | LIRC_CAN_SEND_SCANCODE;
if (dev->s_tx_mask)
features |= LIRC_CAN_SET_TRANSMITTER_MASK;
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 337b9ce..daf2429 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -137,6 +137,7 @@ struct ir_raw_event_ctrl {
bool gap;
bool send_timeout_reports;
int send_mode;
+ int rec_mode;
} lirc;
#endif
#if IS_ENABLED(CONFIG_IR_XMP_DECODER)
@@ -148,6 +149,16 @@ struct ir_raw_event_ctrl {
#endif
};
+#if IS_ENABLED(CONFIG_IR_LIRC_CODEC)
+static inline void ir_wakeup_poll(struct ir_raw_event_ctrl *ctrl)
+{
+ if (ctrl)
+ wake_up_poll(&ctrl->lirc.wait_poll, POLLIN);
+}
+#else
+static inline void ir_wakeup_poll(struct ir_raw_event_ctrl *ctrl) {}
+#endif
+
/* macros for IR decoders */
static inline bool geq_margin(unsigned d1, unsigned d2, unsigned margin)
{
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index bfc43e9..037ea45 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -614,6 +614,15 @@ static void ir_timer_keyup(unsigned long cookie)
void rc_repeat(struct rc_dev *dev)
{
unsigned long flags;
+ struct lirc_scancode sc = {
+ .scancode = dev->last_scancode,
+ .rc_type = dev->last_protocol,
+ .flags = LIRC_SCANCODE_FLAG_REPEAT |
+ (dev->last_toggle ? LIRC_SCANCODE_FLAG_TOGGLE : 0),
+ };
+
+ if (kfifo_put(&dev->kfifo, sc))
+ ir_wakeup_poll(dev->raw);
spin_lock_irqsave(&dev->keylock, flags);
@@ -649,6 +658,13 @@ static void ir_do_keydown(struct rc_dev *dev, enum rc_type protocol,
dev->last_protocol != protocol ||
dev->last_scancode != scancode ||
dev->last_toggle != toggle);
+ struct lirc_scancode sc = {
+ .scancode = scancode, .rc_type = protocol,
+ .flags = toggle ? LIRC_SCANCODE_FLAG_TOGGLE : 0
+ };
+
+ if (kfifo_put(&dev->kfifo, sc))
+ ir_wakeup_poll(dev->raw);
if (new_event && dev->keypressed)
ir_do_keyup(dev, false);
@@ -1586,6 +1602,7 @@ struct rc_dev *rc_allocate_device(enum rc_driver_type type)
spin_lock_init(&dev->rc_map.lock);
spin_lock_init(&dev->keylock);
+ INIT_KFIFO(dev->kfifo);
}
mutex_init(&dev->lock);
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index f06d9ae..5d7093d 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -18,7 +18,7 @@
#include <linux/spinlock.h>
#include <linux/kfifo.h>
-#include <linux/time.h>
+#include <linux/lirc.h>
#include <linux/timer.h>
#include <media/rc-map.h>
@@ -160,6 +160,7 @@ struct rc_dev {
struct rc_scancode_filter scancode_filter;
struct rc_scancode_filter scancode_wakeup_filter;
u32 scancode_mask;
+ DECLARE_KFIFO(kfifo, struct lirc_scancode, 32);
u32 users;
void *priv;
spinlock_t keylock;
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 8/9] [media] lirc: scancode rc devices should have a lirc device too
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
` (6 preceding siblings ...)
2017-01-06 12:49 ` [PATCH 7/9] [media] lirc: implement reading scancode Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-06 12:49 ` [PATCH 9/9] [media] lirc: LIRC_MODE_SCANCODE documentation Sean Young
2017-01-29 22:35 ` [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
Now that the lirc interface supports scancodes, RC scancode devices
can also have a lirc device.
Note that this means that every rc device has a lirc device, including
cec.
Signed-off-by: Sean Young <sean@mess.org>
---
drivers/media/rc/ir-lirc-codec.c | 125 ++++++++++++++++++---------------------
drivers/media/rc/rc-core-priv.h | 15 -----
drivers/media/rc/rc-main.c | 16 +++--
include/media/rc-core.h | 4 ++
4 files changed, 69 insertions(+), 91 deletions(-)
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 6a15192..ea0896a 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -85,7 +85,7 @@ int ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
}
kfifo_put(&lirc->kfifo, sample);
- wake_up_poll(&lirc->wait_poll, POLLIN);
+ wake_up_poll(&dev->wait_poll, POLLIN);
return 0;
}
@@ -93,8 +93,7 @@ int ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
size_t n, loff_t *ppos)
{
- struct lirc_codec *lirc;
- struct rc_dev *dev;
+ struct rc_dev *dev = lirc_get_pdata(file);
unsigned int *txbuf = NULL; /* buffer with values to transmit */
struct ir_raw_event *raw = NULL;
ssize_t ret = -EINVAL;
@@ -106,18 +105,10 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
start = ktime_get();
- lirc = lirc_get_pdata(file);
- if (!lirc)
- return -EFAULT;
-
- dev = lirc->dev;
- if (!dev)
- return -EFAULT;
-
if (!dev->tx_ir)
return -ENOTTY;
- if (lirc->send_mode == LIRC_MODE_SCANCODE) {
+ if (dev->send_mode == LIRC_MODE_SCANCODE) {
struct lirc_scancode scan;
if (n != sizeof(scan))
@@ -185,7 +176,7 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
for (duration = i = 0; i < ret; i++)
duration += txbuf[i];
- if (lirc->send_mode == LIRC_MODE_SCANCODE)
+ if (dev->send_mode == LIRC_MODE_SCANCODE)
ret = n;
else
ret *= sizeof(unsigned int);
@@ -210,20 +201,11 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
unsigned long arg)
{
- struct lirc_codec *lirc;
- struct rc_dev *dev;
+ struct rc_dev *dev = lirc_get_pdata(filep);
u32 __user *argp = (u32 __user *)(arg);
int ret = 0;
__u32 val = 0, tmp;
- lirc = lirc_get_pdata(filep);
- if (!lirc)
- return -EFAULT;
-
- dev = lirc->dev;
- if (!dev)
- return -EFAULT;
-
if (_IOC_DIR(cmd) & _IOC_WRITE) {
ret = get_user(val, argp);
if (ret)
@@ -235,7 +217,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
if (dev->driver_type == RC_DRIVER_IR_RAW_TX)
return -ENOTTY;
- val = lirc->rec_mode;
+ val = dev->rec_mode;
break;
case LIRC_SET_REC_MODE:
@@ -253,14 +235,14 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
break;
}
- lirc->rec_mode = val;
+ dev->rec_mode = val;
return 0;
case LIRC_GET_SEND_MODE:
if (!dev->tx_ir)
return -ENOTTY;
- val = lirc->send_mode;
+ val = dev->send_mode;
break;
case LIRC_SET_SEND_MODE:
@@ -270,7 +252,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
if (!(val == LIRC_MODE_PULSE || val == LIRC_MODE_SCANCODE))
return -EINVAL;
- lirc->send_mode = val;
+ dev->send_mode = val;
return 0;
/* TX settings */
@@ -297,8 +279,8 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
/* RX settings */
case LIRC_SET_REC_CARRIER:
- if (!dev->s_rx_carrier_range)
- return -ENOSYS;
+ if (!dev->s_rx_carrier_range || !dev->raw)
+ return -ENOTTY;
if (val <= 0)
return -EINVAL;
@@ -308,6 +290,9 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
val);
case LIRC_SET_REC_CARRIER_RANGE:
+ if (!dev->raw)
+ return -ENOTTY;
+
if (val <= 0)
return -EINVAL;
@@ -360,7 +345,10 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
break;
case LIRC_SET_REC_TIMEOUT_REPORTS:
- lirc->send_timeout_reports = !!val;
+ if (!dev->raw)
+ return -ENOTTY;
+
+ dev->raw->lirc.send_timeout_reports = !!val;
break;
default:
@@ -376,17 +364,19 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
static unsigned int ir_lirc_poll_ir(struct file *filep,
struct poll_table_struct *wait)
{
- struct lirc_codec *lirc = lirc_get_pdata(filep);
+ struct rc_dev *dev = lirc_get_pdata(filep);
+ struct lirc_driver *drv = dev->lirc_drv;
unsigned int events = 0;
- if (!lirc->drv->attached)
+ if (!drv->attached)
return POLLERR;
- poll_wait(filep, &lirc->wait_poll, wait);
+ poll_wait(filep, &dev->wait_poll, wait);
- if (!lirc->drv->attached)
+ if (!drv->attached)
events = POLLERR;
- else if (!kfifo_is_empty(&lirc->kfifo))
+ else if (!kfifo_is_empty(&dev->kfifo) ||
+ (dev->raw && !kfifo_is_empty(&dev->raw->lirc.kfifo)))
events = POLLIN | POLLRDNORM;
return events;
@@ -395,35 +385,35 @@ static unsigned int ir_lirc_poll_ir(struct file *filep,
static ssize_t ir_lirc_read_ir(struct file *filep, char __user *buffer,
size_t length, loff_t *ppos)
{
- struct lirc_codec *lirc = lirc_get_pdata(filep);
+ struct rc_dev *dev = lirc_get_pdata(filep);
+ struct lirc_driver *drv = dev->lirc_drv;
+ struct lirc_codec *lirc = &dev->raw->lirc;
unsigned int copied;
int ret;
- if (!lirc->drv->attached)
+ if (!drv->attached)
return -ENODEV;
- if (lirc->rec_mode == LIRC_MODE_SCANCODE) {
- struct rc_dev *rcdev = lirc->dev;
-
+ if (dev->rec_mode == LIRC_MODE_SCANCODE) {
if (length % sizeof(struct lirc_scancode))
return -EINVAL;
do {
- if (kfifo_is_empty(&rcdev->kfifo)) {
+ if (kfifo_is_empty(&dev->kfifo)) {
if (filep->f_flags & O_NONBLOCK)
return -EAGAIN;
- ret = wait_event_interruptible(lirc->wait_poll,
- !kfifo_is_empty(&rcdev->kfifo) ||
- !lirc->drv->attached);
+ ret = wait_event_interruptible(dev->wait_poll,
+ !kfifo_is_empty(&dev->kfifo) ||
+ !drv->attached);
if (ret)
return ret;
}
- if (!lirc->drv->attached)
+ if (!drv->attached)
return -ENODEV;
- ret = kfifo_to_user(&rcdev->kfifo, buffer, length,
+ ret = kfifo_to_user(&dev->kfifo, buffer, length,
&copied);
if (ret)
return ret;
@@ -437,14 +427,14 @@ static ssize_t ir_lirc_read_ir(struct file *filep, char __user *buffer,
if (filep->f_flags & O_NONBLOCK)
return -EAGAIN;
- ret = wait_event_interruptible(lirc->wait_poll,
+ ret = wait_event_interruptible(dev->wait_poll,
!kfifo_is_empty(&lirc->kfifo) ||
- !lirc->drv->attached);
+ !drv->attached);
if (ret)
return ret;
}
- if (!lirc->drv->attached)
+ if (!drv->attached)
return -ENODEV;
ret = kfifo_to_user(&lirc->kfifo, buffer, length,
@@ -459,10 +449,11 @@ static ssize_t ir_lirc_read_ir(struct file *filep, char __user *buffer,
static int ir_lirc_open(void *data)
{
- struct lirc_codec *lirc = data;
+ struct rc_dev *dev = data;
- kfifo_reset_out(&lirc->kfifo);
- kfifo_reset_out(&lirc->dev->kfifo);
+ kfifo_reset_out(&dev->kfifo);
+ if (dev->raw)
+ kfifo_reset_out(&dev->raw->kfifo);
return 0;
}
@@ -490,20 +481,22 @@ int ir_lirc_register(struct rc_dev *dev)
{
struct lirc_driver *drv;
int rc = -ENOMEM;
- unsigned long features;
+ unsigned long features = 0;
drv = kzalloc(sizeof(*drv), GFP_KERNEL);
if (!drv)
return -ENOMEM;
- features = LIRC_CAN_REC_SCANCODE;
- dev->raw->lirc.rec_mode = LIRC_MODE_SCANCODE;
+ if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {
+ features = LIRC_CAN_REC_SCANCODE;
+ dev->rec_mode = LIRC_MODE_SCANCODE;
+ }
if (dev->driver_type == RC_DRIVER_IR_RAW) {
features |= LIRC_CAN_REC_MODE2;
- dev->raw->lirc.rec_mode = LIRC_MODE_MODE2;
+ dev->rec_mode = LIRC_MODE_MODE2;
}
if (dev->tx_ir) {
- dev->raw->lirc.send_mode = LIRC_MODE_PULSE;
+ dev->send_mode = LIRC_MODE_PULSE;
features |= LIRC_CAN_SEND_PULSE | LIRC_CAN_SEND_SCANCODE;
if (dev->s_tx_mask)
features |= LIRC_CAN_SET_TRANSMITTER_MASK;
@@ -530,16 +523,17 @@ int ir_lirc_register(struct rc_dev *dev)
dev->driver_name);
drv->minor = -1;
drv->features = features;
- drv->data = &dev->raw->lirc;
drv->set_use_inc = &ir_lirc_open;
drv->set_use_dec = &ir_lirc_close;
drv->code_length = sizeof(struct ir_raw_event) * 8;
drv->fops = &lirc_fops;
drv->dev = &dev->dev;
+ drv->data = dev;
drv->rdev = dev;
drv->owner = THIS_MODULE;
- INIT_KFIFO(dev->raw->lirc.kfifo);
- init_waitqueue_head(&dev->raw->lirc.wait_poll);
+ init_waitqueue_head(&dev->wait_poll);
+ if (dev->raw)
+ INIT_KFIFO(dev->raw->lirc.kfifo);
drv->minor = lirc_register_driver(drv);
if (drv->minor < 0) {
@@ -547,8 +541,8 @@ int ir_lirc_register(struct rc_dev *dev)
goto lirc_register_failed;
}
- dev->raw->lirc.drv = drv;
- dev->raw->lirc.dev = dev;
+ dev->lirc_drv = drv;
+
return 0;
lirc_register_failed:
@@ -558,11 +552,8 @@ int ir_lirc_register(struct rc_dev *dev)
int ir_lirc_unregister(struct rc_dev *dev)
{
- struct lirc_codec *lirc = &dev->raw->lirc;
-
- wake_up_poll(&lirc->wait_poll, POLLERR);
- lirc_unregister_driver(lirc->drv->minor);
+ wake_up_poll(&dev->wait_poll, POLLERR);
+ lirc_unregister_driver(dev->lirc_drv->minor);
return 0;
}
-
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index daf2429..fe7452f 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -126,18 +126,13 @@ struct ir_raw_event_ctrl {
#endif
#if IS_ENABLED(CONFIG_IR_LIRC_CODEC)
struct lirc_codec {
- struct rc_dev *dev;
- struct lirc_driver *drv;
DECLARE_KFIFO(kfifo, unsigned int, LIRCBUF_SIZE);
- wait_queue_head_t wait_poll;
int carrier_low;
ktime_t gap_start;
u64 gap_duration;
bool gap;
bool send_timeout_reports;
- int send_mode;
- int rec_mode;
} lirc;
#endif
#if IS_ENABLED(CONFIG_IR_XMP_DECODER)
@@ -149,16 +144,6 @@ struct ir_raw_event_ctrl {
#endif
};
-#if IS_ENABLED(CONFIG_IR_LIRC_CODEC)
-static inline void ir_wakeup_poll(struct ir_raw_event_ctrl *ctrl)
-{
- if (ctrl)
- wake_up_poll(&ctrl->lirc.wait_poll, POLLIN);
-}
-#else
-static inline void ir_wakeup_poll(struct ir_raw_event_ctrl *ctrl) {}
-#endif
-
/* macros for IR decoders */
static inline bool geq_margin(unsigned d1, unsigned d2, unsigned margin)
{
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 037ea45..19b8a4e 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -622,7 +622,7 @@ void rc_repeat(struct rc_dev *dev)
};
if (kfifo_put(&dev->kfifo, sc))
- ir_wakeup_poll(dev->raw);
+ wake_up_poll(&dev->wait_poll, POLLIN);
spin_lock_irqsave(&dev->keylock, flags);
@@ -664,7 +664,7 @@ static void ir_do_keydown(struct rc_dev *dev, enum rc_type protocol,
};
if (kfifo_put(&dev->kfifo, sc))
- ir_wakeup_poll(dev->raw);
+ wake_up_poll(&dev->wait_poll, POLLIN);
if (new_event && dev->keypressed)
ir_do_keyup(dev, false);
@@ -1603,6 +1603,7 @@ struct rc_dev *rc_allocate_device(enum rc_driver_type type)
spin_lock_init(&dev->rc_map.lock);
spin_lock_init(&dev->keylock);
INIT_KFIFO(dev->kfifo);
+ init_waitqueue_head(&dev->wait_poll);
}
mutex_init(&dev->lock);
@@ -1791,11 +1792,9 @@ int rc_register_device(struct rc_dev *dev)
goto out_rx;
}
- if (dev->driver_type != RC_DRIVER_SCANCODE) {
- rc = ir_lirc_register(dev);
- if (rc < 0)
- goto out_raw;
- }
+ rc = ir_lirc_register(dev);
+ if (rc)
+ goto out_raw;
/* Allow the RC sysfs nodes to be accessible */
atomic_set(&dev->initialized, 1);
@@ -1856,8 +1855,7 @@ void rc_unregister_device(struct rc_dev *dev)
if (dev->driver_type == RC_DRIVER_IR_RAW)
ir_raw_event_unregister(dev);
- if (dev->driver_type != RC_DRIVER_SCANCODE)
- ir_lirc_unregister(dev);
+ ir_lirc_unregister(dev);
rc_free_rx_device(dev);
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 5d7093d..071a50aad 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -161,6 +161,7 @@ struct rc_dev {
struct rc_scancode_filter scancode_wakeup_filter;
u32 scancode_mask;
DECLARE_KFIFO(kfifo, struct lirc_scancode, 32);
+ wait_queue_head_t wait_poll;
u32 users;
void *priv;
spinlock_t keylock;
@@ -171,6 +172,9 @@ struct rc_dev {
enum rc_type last_protocol;
u32 last_scancode;
u8 last_toggle;
+ struct lirc_driver *lirc_drv;
+ u8 rec_mode;
+ u8 send_mode;
u32 timeout;
u32 min_timeout;
u32 max_timeout;
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 9/9] [media] lirc: LIRC_MODE_SCANCODE documentation
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
` (7 preceding siblings ...)
2017-01-06 12:49 ` [PATCH 8/9] [media] lirc: scancode rc devices should have a lirc device too Sean Young
@ 2017-01-06 12:49 ` Sean Young
2017-01-29 22:35 ` [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-06 12:49 UTC (permalink / raw)
To: linux-media, Hans Verkuil
Document the interface we've just implemented.
Signed-off-by: Sean Young <sean@mess.org>
---
Documentation/media/uapi/rc/lirc-dev-intro.rst | 21 +++++++++++++++++----
Documentation/media/uapi/rc/lirc-get-features.rst | 14 ++++++++++++++
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/Documentation/media/uapi/rc/lirc-dev-intro.rst b/Documentation/media/uapi/rc/lirc-dev-intro.rst
index ef97e40..a0b3794 100644
--- a/Documentation/media/uapi/rc/lirc-dev-intro.rst
+++ b/Documentation/media/uapi/rc/lirc-dev-intro.rst
@@ -42,15 +42,28 @@ on the following table.
This mode is used only for IR receive.
+.. _lirc-mode-scancode:
+
+``LIRC_MODE_SCANCODE``
+
+ For receiving, the IR signal is decoded internally by the receiver or
+ in the kernel IR decoders. A struct lirc_scancode is returned. The
+ flags will specify the message was a repeat ``LIRC_SCANCODE_FLAG_REPEAT``
+ or the toggle was set ``LIRC_SCANCODE_FLAG_TOGGLE``.
+
+ When using from transmit, either the IR hardware encodes the signal,
+ or the in-kernel encoders. The flags parameter must be 0.
+
+ The ``scancode`` member contains the scancode received or to be sent,
+ and ``rc_type`` the protocol.
+
.. _lirc-mode-lirccode:
``LIRC_MODE_LIRCCODE``
The IR signal is decoded internally by the receiver. The LIRC interface
- returns the scancode as an integer value. This is the usual mode used
- by several TV media cards.
-
- This mode is used only for IR receive.
+ returns the scancode as an integer value. This is a method used by
+ some lirc staging drivers.
.. _lirc-mode-pulse:
diff --git a/Documentation/media/uapi/rc/lirc-get-features.rst b/Documentation/media/uapi/rc/lirc-get-features.rst
index 79e07b4..477c622 100644
--- a/Documentation/media/uapi/rc/lirc-get-features.rst
+++ b/Documentation/media/uapi/rc/lirc-get-features.rst
@@ -58,6 +58,13 @@ LIRC features
The driver is capable of receiving using
:ref:`LIRC_MODE_MODE2 <lirc-mode-MODE2>`.
+.. _LIRC-CAN-REC-SCANCODE:
+
+``LIRC_CAN_REC_SCANCODE``
+
+ The driver is capable of receiving using
+ :ref:`LIRC_MODE_SCANCODE <lirc-mode-scancode>`.
+
.. _LIRC-CAN-REC-LIRCCODE:
``LIRC_CAN_REC_LIRCCODE``
@@ -164,6 +171,13 @@ LIRC features
The driver supports sending using :ref:`LIRC_MODE_MODE2 <lirc-mode-mode2>`.
+.. _LIRC-CAN-SEND-SCANCODE:
+
+``LIRC_CAN_SEND_SCANCODE``
+
+ The driver supports sending using
+ :ref:`LIRC_MODE_SCANCODE <lirc-mode-scancode>`.
+
.. _LIRC-CAN-SEND-LIRCCODE:
``LIRC_CAN_SEND_LIRCCODE``
--
2.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 0/9] Teach lirc how to send and receive scancodes
2017-01-06 12:49 [PATCH 0/9] Teach lirc how to send and receive scancodes Sean Young
` (8 preceding siblings ...)
2017-01-06 12:49 ` [PATCH 9/9] [media] lirc: LIRC_MODE_SCANCODE documentation Sean Young
@ 2017-01-29 22:35 ` Sean Young
9 siblings, 0 replies; 11+ messages in thread
From: Sean Young @ 2017-01-29 22:35 UTC (permalink / raw)
To: linux-media
On Fri, Jan 06, 2017 at 12:49:03PM +0000, Sean Young wrote:
> This patch series introduces a new lirc mode, LIRC_MODE_SCANCODE. This
> allows scancodes to be sent and received. This depends on earlier
> series which introduces IR encoders.
I've been testing these patches further and I've discovered some bugs,
the biggest issue is some nasty use-after-frees with unplug. It would
be much better if lirc used proper kobject reference counting, so I will
first focus on that and then revisit these patches.
Thanks
Sean
^ permalink raw reply [flat|nested] 11+ messages in thread