The mceusb driver I'm about to submit handles just about any raw IR you
can throw at it. The ir-core loads up all protocol decoders, starting
with NEC, then RC5, then RC6. RUN_DECODER() was trying them in the same
order, and exiting if any of the decoders didn't like the data. The
default mceusb remote talks RC6(6A). Well, the RC6 decoder never gets a
chance to run unless you move the RC6 decoder to the front of the list.

What I believe to be correct is to have RUN_DECODER keep trying all of
the decoders, even when one triggers an error. I don't think the errors
matter so much as it matters that at least one was successful -- i.e.,
that _sumrc is > 0. The following works for me w/my mceusb driver and
the default decoder ordering -- NEC and RC5 still fail, but RC6 still
gets a crack at it, and successfully does its job.

Signed-off-by: Jarod Wilson <ja...@redhat.com>

---
 drivers/media/IR/ir-raw-event.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c
index ea68a3f..44162db 100644
--- a/drivers/media/IR/ir-raw-event.c
+++ b/drivers/media/IR/ir-raw-event.c
@@ -36,14 +36,15 @@ static DEFINE_SPINLOCK(ir_raw_handler_lock);
  */
 #define RUN_DECODER(ops, ...) ({                                           \
        struct ir_raw_handler           *_ir_raw_handler;                   \
-       int _sumrc = 0, _rc;                                                \
+       int _sumrc = 0, _rc, _fail;                                         \
        spin_lock(&ir_raw_handler_lock);                                    \
        list_for_each_entry(_ir_raw_handler, &ir_raw_handler_list, list) {  \
                if (_ir_raw_handler->ops) {                                 \
                        _rc = _ir_raw_handler->ops(__VA_ARGS__);            \
                        if (_rc < 0)                                        \
-                               break;                                      \
-                       _sumrc += _rc;                                      \
+                               _fail++;                                    \
+                       else                                                \
+                               _sumrc += _rc;                              \
                }                                                           \
        }                                                                   \
        spin_unlock(&ir_raw_handler_lock);                                  \

-- 
Jarod Wilson
ja...@redhat.com

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to