Commit 8abfebdb authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab

Revert "[media] rc: rc-loopback: Add loopback of filter scancodes"

This reverts commit 2e4ebde2.

The current code is not mature enough, the API should allow a single
protocol to be specified. Also, the current code contains heuristics
that will depend on module load order.
Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Acked-by: default avatarAntti Seppälä <a.seppala@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 23f28f2a
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h>
#include <media/rc-core.h> #include <media/rc-core.h>
#define DRIVER_NAME "rc-loopback" #define DRIVER_NAME "rc-loopback"
...@@ -177,39 +176,6 @@ static int loop_set_carrier_report(struct rc_dev *dev, int enable) ...@@ -177,39 +176,6 @@ static int loop_set_carrier_report(struct rc_dev *dev, int enable)
return 0; return 0;
} }
static int loop_set_wakeup_filter(struct rc_dev *dev,
struct rc_scancode_filter *sc_filter)
{
static const unsigned int max = 512;
struct ir_raw_event *raw;
int ret;
int i;
/* fine to disable filter */
if (!sc_filter->mask)
return 0;
/* encode the specified filter and loop it back */
raw = kmalloc_array(max, sizeof(*raw), GFP_KERNEL);
ret = ir_raw_encode_scancode(dev->enabled_wakeup_protocols, sc_filter,
raw, max);
/* still loop back the partial raw IR even if it's incomplete */
if (ret == -ENOBUFS)
ret = max;
if (ret >= 0) {
/* do the loopback */
for (i = 0; i < ret; ++i)
ir_raw_event_store(dev, &raw[i]);
ir_raw_event_handle(dev);
ret = 0;
}
kfree(raw);
return ret;
}
static int __init loop_init(void) static int __init loop_init(void)
{ {
struct rc_dev *rc; struct rc_dev *rc;
...@@ -229,7 +195,6 @@ static int __init loop_init(void) ...@@ -229,7 +195,6 @@ static int __init loop_init(void)
rc->map_name = RC_MAP_EMPTY; rc->map_name = RC_MAP_EMPTY;
rc->priv = &loopdev; rc->priv = &loopdev;
rc->driver_type = RC_DRIVER_IR_RAW; rc->driver_type = RC_DRIVER_IR_RAW;
rc->encode_wakeup = true;
rc->allowed_protocols = RC_BIT_ALL; rc->allowed_protocols = RC_BIT_ALL;
rc->timeout = 100 * 1000 * 1000; /* 100 ms */ rc->timeout = 100 * 1000 * 1000; /* 100 ms */
rc->min_timeout = 1; rc->min_timeout = 1;
...@@ -244,7 +209,6 @@ static int __init loop_init(void) ...@@ -244,7 +209,6 @@ static int __init loop_init(void)
rc->s_idle = loop_set_idle; rc->s_idle = loop_set_idle;
rc->s_learning_mode = loop_set_learning_mode; rc->s_learning_mode = loop_set_learning_mode;
rc->s_carrier_report = loop_set_carrier_report; rc->s_carrier_report = loop_set_carrier_report;
rc->s_wakeup_filter = loop_set_wakeup_filter;
loopdev.txmask = RXMASK_REGULAR; loopdev.txmask = RXMASK_REGULAR;
loopdev.txcarrier = 36000; loopdev.txcarrier = 36000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment