7a569f524d
This patch makes in-kernel decoding with the stock Streamzap PC Remote work out of the box. There are quite a few things going on in this patch, all related to getting this working: 1) I had to enable reporting of a long space at the end of each signal, or I had weird buffering and keybounce issues. 2) The keymap has been reworked slightly to match actual decoded values, the first edition was missing the pre-data bits present in the lirc config file for this remote. 3) There's a whole new decoder included, specifically for the not-quite-RC5 15-bit protocol variant used by the Streamzap PC Remote. The decoder, while usable with other recievers (tested with an mceusb receiver), will only be loaded by the streamzap driver, as its likely not of use in almost all other situations. This can be revisited if/when all keytable loading (and disabling of unneeded protocol decoder engines) is moved to userspace, but for now, I think this makes the most sense. Note that I did try to enable handling the streamzap RC5-ish protocol in the current RC5 decoder, but there's no particularly easy way to tell if its 14-bit RC5 or 15-bit Streamzap until we see bit 14, and even then, in testing an attempted decoder merge, only 2/3 of the keys were properly recognized as being the 15-bit variant and decoded correctly, the rest were close enough to compliant with 14-bit that they were decoded as such (but they have overlap with one another, and thus we can't just shrug and use the 14-bit decoded values). Also of note in this patch is the removal of the streamzap driver's internal delay buffer. Per discussion w/Christoph, it shouldn't be needed by lirc any longer anyway, and it doesn't seem to make any difference to the in-kernel decoder engine. That being the case, I'm yanking it all out, as it greatly simplifies the driver code. Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
190 lines
4.7 KiB
C
190 lines
4.7 KiB
C
/*
|
|
* Remote Controller core raw events header
|
|
*
|
|
* Copyright (C) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
*
|
|
* 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 version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#ifndef _IR_RAW_EVENT
|
|
#define _IR_RAW_EVENT
|
|
|
|
#include <linux/slab.h>
|
|
#include <media/ir-core.h>
|
|
|
|
struct ir_raw_handler {
|
|
struct list_head list;
|
|
|
|
u64 protocols; /* which are handled by this handler */
|
|
int (*decode)(struct input_dev *input_dev, struct ir_raw_event event);
|
|
|
|
/* These two should only be used by the lirc decoder */
|
|
int (*raw_register)(struct input_dev *input_dev);
|
|
int (*raw_unregister)(struct input_dev *input_dev);
|
|
};
|
|
|
|
struct ir_raw_event_ctrl {
|
|
struct list_head list; /* to keep track of raw clients */
|
|
struct task_struct *thread;
|
|
struct kfifo kfifo; /* fifo for the pulse/space durations */
|
|
ktime_t last_event; /* when last event occurred */
|
|
enum raw_event_type last_type; /* last event type */
|
|
struct input_dev *input_dev; /* pointer to the parent input_dev */
|
|
u64 enabled_protocols; /* enabled raw protocol decoders */
|
|
|
|
/* raw decoder state follows */
|
|
struct ir_raw_event prev_ev;
|
|
struct ir_raw_event this_ev;
|
|
struct nec_dec {
|
|
int state;
|
|
unsigned count;
|
|
u32 bits;
|
|
bool is_nec_x;
|
|
bool necx_repeat;
|
|
} nec;
|
|
struct rc5_dec {
|
|
int state;
|
|
u32 bits;
|
|
unsigned count;
|
|
unsigned wanted_bits;
|
|
} rc5;
|
|
struct rc6_dec {
|
|
int state;
|
|
u8 header;
|
|
u32 body;
|
|
bool toggle;
|
|
unsigned count;
|
|
unsigned wanted_bits;
|
|
} rc6;
|
|
struct sony_dec {
|
|
int state;
|
|
u32 bits;
|
|
unsigned count;
|
|
} sony;
|
|
struct jvc_dec {
|
|
int state;
|
|
u16 bits;
|
|
u16 old_bits;
|
|
unsigned count;
|
|
bool first;
|
|
bool toggle;
|
|
} jvc;
|
|
struct rc5_sz_dec {
|
|
int state;
|
|
u32 bits;
|
|
unsigned count;
|
|
unsigned wanted_bits;
|
|
} rc5_sz;
|
|
struct lirc_codec {
|
|
struct ir_input_dev *ir_dev;
|
|
struct lirc_driver *drv;
|
|
int carrier_low;
|
|
} lirc;
|
|
};
|
|
|
|
/* macros for IR decoders */
|
|
static inline bool geq_margin(unsigned d1, unsigned d2, unsigned margin)
|
|
{
|
|
return d1 > (d2 - margin);
|
|
}
|
|
|
|
static inline bool eq_margin(unsigned d1, unsigned d2, unsigned margin)
|
|
{
|
|
return ((d1 > (d2 - margin)) && (d1 < (d2 + margin)));
|
|
}
|
|
|
|
static inline bool is_transition(struct ir_raw_event *x, struct ir_raw_event *y)
|
|
{
|
|
return x->pulse != y->pulse;
|
|
}
|
|
|
|
static inline void decrease_duration(struct ir_raw_event *ev, unsigned duration)
|
|
{
|
|
if (duration > ev->duration)
|
|
ev->duration = 0;
|
|
else
|
|
ev->duration -= duration;
|
|
}
|
|
|
|
#define TO_US(duration) DIV_ROUND_CLOSEST((duration), 1000)
|
|
#define TO_STR(is_pulse) ((is_pulse) ? "pulse" : "space")
|
|
#define IS_RESET(ev) (ev.duration == 0)
|
|
/*
|
|
* Routines from ir-sysfs.c - Meant to be called only internally inside
|
|
* ir-core
|
|
*/
|
|
|
|
int ir_register_class(struct input_dev *input_dev);
|
|
void ir_unregister_class(struct input_dev *input_dev);
|
|
|
|
/*
|
|
* Routines from ir-raw-event.c to be used internally and by decoders
|
|
*/
|
|
u64 ir_raw_get_allowed_protocols(void);
|
|
int ir_raw_event_register(struct input_dev *input_dev);
|
|
void ir_raw_event_unregister(struct input_dev *input_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_init(void);
|
|
|
|
int ir_rcmap_init(void);
|
|
void ir_rcmap_cleanup(void);
|
|
/*
|
|
* Decoder initialization code
|
|
*
|
|
* Those load logic are called during ir-core init, and automatically
|
|
* loads the compiled decoders for their usage with IR raw events
|
|
*/
|
|
|
|
/* from ir-nec-decoder.c */
|
|
#ifdef CONFIG_IR_NEC_DECODER_MODULE
|
|
#define load_nec_decode() request_module("ir-nec-decoder")
|
|
#else
|
|
#define load_nec_decode() 0
|
|
#endif
|
|
|
|
/* from ir-rc5-decoder.c */
|
|
#ifdef CONFIG_IR_RC5_DECODER_MODULE
|
|
#define load_rc5_decode() request_module("ir-rc5-decoder")
|
|
#else
|
|
#define load_rc5_decode() 0
|
|
#endif
|
|
|
|
/* from ir-rc6-decoder.c */
|
|
#ifdef CONFIG_IR_RC6_DECODER_MODULE
|
|
#define load_rc6_decode() request_module("ir-rc6-decoder")
|
|
#else
|
|
#define load_rc6_decode() 0
|
|
#endif
|
|
|
|
/* from ir-jvc-decoder.c */
|
|
#ifdef CONFIG_IR_JVC_DECODER_MODULE
|
|
#define load_jvc_decode() request_module("ir-jvc-decoder")
|
|
#else
|
|
#define load_jvc_decode() 0
|
|
#endif
|
|
|
|
/* from ir-sony-decoder.c */
|
|
#ifdef CONFIG_IR_SONY_DECODER_MODULE
|
|
#define load_sony_decode() request_module("ir-sony-decoder")
|
|
#else
|
|
#define load_sony_decode() 0
|
|
#endif
|
|
|
|
/* from ir-lirc-codec.c */
|
|
#ifdef CONFIG_IR_LIRC_CODEC_MODULE
|
|
#define load_lirc_codec() request_module("ir-lirc-codec")
|
|
#else
|
|
#define load_lirc_codec() 0
|
|
#endif
|
|
|
|
|
|
#endif /* _IR_RAW_EVENT */
|