V4L/DVB (12366): ir-kbd-i2c: Allow use of ir-kdb-i2c internal get_key funcs and set ir_type
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. 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>
This commit is contained in:

committed by
Mauro Carvalho Chehab

parent
157da2762c
commit
1b6e59e3f4
@@ -20,10 +20,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
|
||||
|
Reference in New Issue
Block a user