[PATCH 1/3] ir-kbd-i2c: Allow use of ir-kdb-i2c internal get_key funcs and set ir_type

[Andy Walls]

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.


Regards,
Andy

diff -r d754a2d5a376 linux/drivers/media/video/ir-kbd-i2c.c
--- a/linux/drivers/media/video/ir-kbd-i2c.c    Wed Jul 15 07:28:02 2009 -0300
+++ b/linux/drivers/media/video/ir-kbd-i2c.c    Fri Jul 17 16:05:28 2009 -0400
@@ -478,7 +480,34 @@
 
                ir_codes = init_data->ir_codes;
                name = init_data->name;
+               if (init_data->type)
+                       ir_type = init_data->type;
                ir->get_key = init_data->get_key;
+               switch (init_data->internal_get_key_func) {
+               case IR_KBD_GET_KEY_PIXELVIEW:
+                       ir->get_key = get_key_pixelview;
+                       break;
+               case IR_KBD_GET_KEY_PV951:
+                       ir->get_key = get_key_pv951;
+                       break;
+               case IR_KBD_GET_KEY_HAUP:
+                       ir->get_key = get_key_haup;
+                       break;
+               case IR_KBD_GET_KEY_KNC1:
+                       ir->get_key = get_key_knc1;
+                       break;
+               case IR_KBD_GET_KEY_FUSIONHDTV:
+                       ir->get_key = get_key_fusionhdtv;
+                       break;
+               case IR_KBD_GET_KEY_HAUP_XVR:
+                       ir->get_key = get_key_haup_xvr;
+                       break;
+               case IR_KBD_GET_KEY_AVERMEDIA_CARDBUS:
+                       ir->get_key = get_key_avermedia_cardbus;
+                       break;
+               default:
+                       break;
+               }
        }
 
        /* Make sure we are all setup before going on */
diff -r d754a2d5a376 linux/include/media/ir-kbd-i2c.h
--- a/linux/include/media/ir-kbd-i2c.h  Wed Jul 15 07:28:02 2009 -0300
+++ b/linux/include/media/ir-kbd-i2c.h  Fri Jul 17 16:05:28 2009 -0400
@@ -24,10 +24,27 @@
        int                    (*get_key)(struct IR_i2c*, u32*, u32*);
 };
 
+enum ir_kbd_get_key_fn {
+       IR_KBD_GET_KEY_NONE = 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
 




--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html