diff options
Diffstat (limited to 'include/media/ir-kbd-i2c.h')
-rw-r--r-- | include/media/ir-kbd-i2c.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h index 557c676ab7dc..768aa77925cd 100644 --- a/include/media/ir-kbd-i2c.h +++ b/include/media/ir-kbd-i2c.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _IR_I2C | 1 | #ifndef _IR_I2C |
2 | #define _IR_I2C | 2 | #define _IR_I2C |
3 | 3 | ||
4 | #include <media/ir-common.h> | 4 | #include <media/rc-core.h> |
5 | 5 | ||
6 | #define DEFAULT_POLLING_INTERVAL 100 /* ms */ | 6 | #define DEFAULT_POLLING_INTERVAL 100 /* ms */ |
7 | 7 | ||
@@ -9,11 +9,9 @@ struct IR_i2c; | |||
9 | 9 | ||
10 | struct IR_i2c { | 10 | struct IR_i2c { |
11 | char *ir_codes; | 11 | char *ir_codes; |
12 | |||
13 | struct i2c_client *c; | 12 | struct i2c_client *c; |
14 | struct input_dev *input; | 13 | struct rc_dev *rc; |
15 | struct ir_input_state ir; | 14 | |
16 | u64 ir_type; | ||
17 | /* Used to avoid fast repeating */ | 15 | /* Used to avoid fast repeating */ |
18 | unsigned char old; | 16 | unsigned char old; |
19 | 17 | ||
@@ -39,13 +37,16 @@ enum ir_kbd_get_key_fn { | |||
39 | struct IR_i2c_init_data { | 37 | struct IR_i2c_init_data { |
40 | char *ir_codes; | 38 | char *ir_codes; |
41 | const char *name; | 39 | const char *name; |
42 | u64 type; /* IR_TYPE_RC5, etc */ | 40 | u64 type; /* RC_TYPE_RC5, etc */ |
43 | u32 polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */ | 41 | u32 polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */ |
42 | |||
44 | /* | 43 | /* |
45 | * Specify either a function pointer or a value indicating one of | 44 | * Specify either a function pointer or a value indicating one of |
46 | * ir_kbd_i2c's internal get_key functions | 45 | * ir_kbd_i2c's internal get_key functions |
47 | */ | 46 | */ |
48 | int (*get_key)(struct IR_i2c*, u32*, u32*); | 47 | int (*get_key)(struct IR_i2c*, u32*, u32*); |
49 | enum ir_kbd_get_key_fn internal_get_key_func; | 48 | enum ir_kbd_get_key_fn internal_get_key_func; |
49 | |||
50 | struct rc_dev *rc_dev; | ||
50 | }; | 51 | }; |
51 | #endif | 52 | #endif |