diff options
Diffstat (limited to 'linux/include/media/ir-kbd-i2c.h')
| -rw-r--r-- | linux/include/media/ir-kbd-i2c.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/linux/include/media/ir-kbd-i2c.h b/linux/include/media/ir-kbd-i2c.h index 18ec1dacd..93a6c933b 100644 --- a/linux/include/media/ir-kbd-i2c.h +++ b/linux/include/media/ir-kbd-i2c.h @@ -7,20 +7,27 @@ struct IR_i2c; struct IR_i2c { IR_KEYTAB_TYPE *ir_codes; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) struct i2c_client c; +#else + struct i2c_client *c; +#endif struct input_dev *input; struct ir_input_state ir; /* Used to avoid fast repeating */ unsigned char old; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - struct work_struct work; - struct timer_list timer; -#else - struct delayed_work work; -#endif + struct delayed_work work; + char name[32]; char phys[32]; int (*get_key)(struct IR_i2c*, u32*, u32*); }; + +/* Can be passed when instantiating an ir_video i2c device */ +struct IR_i2c_init_data { + IR_KEYTAB_TYPE *ir_codes; + const char *name; + int (*get_key)(struct IR_i2c*, u32*, u32*); +}; #endif |