diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-23 00:23:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:07 -0400 |
commit | c72ba8e6ae7376d20e509a9a54a2dd45fb483fc2 (patch) | |
tree | 4f2b407b086309b411e7d7ea80c2a0a71ac604d9 /include/media/ir-kbd-i2c.h | |
parent | 44243fc2ef99948bc9b046901880885616dd5e89 (diff) |
V4L/DVB: saa7134: get rid of I2C_HW_SAA7134
The only reason for keeping I2C_HW_SAA7134 is to allow setting a
per-device polling interval. Just move this info to the platform
data, allowing drivers to change it per device, where needed.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/ir-kbd-i2c.h')
-rw-r--r-- | include/media/ir-kbd-i2c.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h index 4102f0dd5c40..557c676ab7dc 100644 --- a/include/media/ir-kbd-i2c.h +++ b/include/media/ir-kbd-i2c.h | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | #include <media/ir-common.h> | 4 | #include <media/ir-common.h> |
5 | 5 | ||
6 | #define DEFAULT_POLLING_INTERVAL 100 /* ms */ | ||
7 | |||
6 | struct IR_i2c; | 8 | struct IR_i2c; |
7 | 9 | ||
8 | struct IR_i2c { | 10 | struct IR_i2c { |
@@ -15,6 +17,8 @@ struct IR_i2c { | |||
15 | /* Used to avoid fast repeating */ | 17 | /* Used to avoid fast repeating */ |
16 | unsigned char old; | 18 | unsigned char old; |
17 | 19 | ||
20 | u32 polling_interval; /* in ms */ | ||
21 | |||
18 | struct delayed_work work; | 22 | struct delayed_work work; |
19 | char name[32]; | 23 | char name[32]; |
20 | char phys[32]; | 24 | char phys[32]; |
@@ -34,8 +38,9 @@ enum ir_kbd_get_key_fn { | |||
34 | /* Can be passed when instantiating an ir_video i2c device */ | 38 | /* Can be passed when instantiating an ir_video i2c device */ |
35 | struct IR_i2c_init_data { | 39 | struct IR_i2c_init_data { |
36 | char *ir_codes; | 40 | char *ir_codes; |
37 | const char *name; | 41 | const char *name; |
38 | u64 type; /* IR_TYPE_RC5, etc */ | 42 | u64 type; /* IR_TYPE_RC5, etc */ |
43 | u32 polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */ | ||
39 | /* | 44 | /* |
40 | * Specify either a function pointer or a value indicating one of | 45 | * Specify either a function pointer or a value indicating one of |
41 | * ir_kbd_i2c's internal get_key functions | 46 | * ir_kbd_i2c's internal get_key functions |