diff options
Diffstat (limited to 'drivers/media/rc/rc-core-priv.h')
| -rw-r--r-- | drivers/media/rc/rc-core-priv.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h index 1eeab277a08e..4967d87ec4b7 100644 --- a/drivers/media/rc/rc-core-priv.h +++ b/drivers/media/rc/rc-core-priv.h @@ -85,8 +85,8 @@ struct ir_raw_event_ctrl { struct rc6_dec { int state; u8 header; - u32 body; bool toggle; + u32 body; unsigned count; unsigned wanted_bits; } rc6; @@ -127,8 +127,8 @@ struct ir_raw_event_ctrl { struct mce_kbd_dec { /* locks key up timer */ spinlock_t keylock; - struct timer_list rx_timeout; int state; + struct timer_list rx_timeout; u8 header; u32 body; unsigned count; @@ -190,10 +190,9 @@ static inline void decrease_duration(struct ir_raw_event *ev, unsigned duration) /* Returns true if event is normal pulse/space event */ static inline bool is_timing_event(struct ir_raw_event ev) { - return !ev.carrier_report && !ev.reset; + return !ev.carrier_report && !ev.overflow; } -#define TO_US(duration) DIV_ROUND_CLOSEST((duration), 1000) #define TO_STR(is_pulse) ((is_pulse) ? "pulse" : "space") /* functions for IR encoders */ @@ -322,20 +321,20 @@ void ir_raw_init(void); #ifdef CONFIG_LIRC int lirc_dev_init(void); void lirc_dev_exit(void); -void ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev); -void ir_lirc_scancode_event(struct rc_dev *dev, struct lirc_scancode *lsc); -int ir_lirc_register(struct rc_dev *dev); -void ir_lirc_unregister(struct rc_dev *dev); -struct rc_dev *rc_dev_get_from_fd(int fd); +void lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev); +void lirc_scancode_event(struct rc_dev *dev, struct lirc_scancode *lsc); +int lirc_register(struct rc_dev *dev); +void lirc_unregister(struct rc_dev *dev); +struct rc_dev *rc_dev_get_from_fd(int fd, bool write); #else static inline int lirc_dev_init(void) { return 0; } static inline void lirc_dev_exit(void) {} -static inline void ir_lirc_raw_event(struct rc_dev *dev, - struct ir_raw_event ev) { } -static inline void ir_lirc_scancode_event(struct rc_dev *dev, - struct lirc_scancode *lsc) { } -static inline int ir_lirc_register(struct rc_dev *dev) { return 0; } -static inline void ir_lirc_unregister(struct rc_dev *dev) { } +static inline void lirc_raw_event(struct rc_dev *dev, + struct ir_raw_event ev) { } +static inline void lirc_scancode_event(struct rc_dev *dev, + struct lirc_scancode *lsc) { } +static inline int lirc_register(struct rc_dev *dev) { return 0; } +static inline void lirc_unregister(struct rc_dev *dev) { } #endif /* |