diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-28 11:44:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-28 11:44:05 -0300 |
| commit | 7059988b9d5badb3606286718c371665ff4a70ae (patch) | |
| tree | e90ad9e81ff1539d7e13c6fb3fab36f053a54623 /linux/include | |
| parent | 8239798d50a90e8d80bafdeade1aa38e77c537e1 (diff) | |
| download | mediapointer-dvb-s2-7059988b9d5badb3606286718c371665ff4a70ae.tar.gz mediapointer-dvb-s2-7059988b9d5badb3606286718c371665ff4a70ae.tar.bz2 | |
ir-kbd-i2c: Allow use of ir-kdb-i2c internal get_key funcs and set ir_type
From: Andy Walls <awalls@radix.net>
This patch augments the init data passed by bridge drivers to
ir-kbd-i2c, so that the ir_type can be set explicitly, and so
ir-kbd-i2c internal get_key functions can be reused without
requiring symbols from ir-kbd-i2c in the bridge driver.
Priority: normal
Signed-off-by: Andy Walls <awalls@radix.net>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/ir-kbd-i2c.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/linux/include/media/ir-kbd-i2c.h b/linux/include/media/ir-kbd-i2c.h index 93a6c933b..2a8da5027 100644 --- a/linux/include/media/ir-kbd-i2c.h +++ b/linux/include/media/ir-kbd-i2c.h @@ -24,10 +24,27 @@ struct IR_i2c { int (*get_key)(struct IR_i2c*, u32*, u32*); }; +enum ir_kbd_get_key_fn { + IR_KBD_GET_KEY_CUSTOM = 0, + IR_KBD_GET_KEY_PIXELVIEW, + IR_KBD_GET_KEY_PV951, + IR_KBD_GET_KEY_HAUP, + IR_KBD_GET_KEY_KNC1, + IR_KBD_GET_KEY_FUSIONHDTV, + IR_KBD_GET_KEY_HAUP_XVR, + IR_KBD_GET_KEY_AVERMEDIA_CARDBUS, +}; + /* Can be passed when instantiating an ir_video i2c device */ struct IR_i2c_init_data { IR_KEYTAB_TYPE *ir_codes; const char *name; + int type; /* IR_TYPE_RC5, IR_TYPE_PD, etc */ + /* + * Specify either a function pointer or a value indicating one of + * ir_kbd_i2c's internal get_key functions + */ int (*get_key)(struct IR_i2c*, u32*, u32*); + enum ir_kbd_get_key_fn internal_get_key_func; }; #endif |