Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

[safe/jmp/linux-2.6] / include / media / ir-core.h

diff --git a/include/media/ir-core.h b/include/media/ir-core.h
index 299d201..61c223b 100644 (file)
--- a/include/media/ir-core.h
+++ b/include/media/ir-core.h
@@ -21,13 +21,11 @@ extern int ir_core_debug;
 #define IR_dprintk(level, fmt, arg...) if (ir_core_debug >= level) \
        printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
 
-enum ir_type {
-       IR_TYPE_UNKNOWN = 0,
-       IR_TYPE_RC5     = 1,
-       IR_TYPE_PD      = 2,             /* Pulse distance encoded IR */
-       IR_TYPE_NEC     = 3,
-       IR_TYPE_OTHER   = 99,
-};
+#define IR_TYPE_UNKNOWN        0
+#define IR_TYPE_RC5    (1  << 0)       /* Philips RC5 protocol */
+#define IR_TYPE_PD     (1  << 1)       /* Pulse distance encoded IR */
+#define IR_TYPE_NEC    (1  << 2)
+#define IR_TYPE_OTHER  (((u64)1) << 63l)
 
 struct ir_scancode {
        u16     scancode;
@@ -37,26 +35,40 @@ struct ir_scancode {
 struct ir_scancode_table {
        struct ir_scancode      *scan;
        int                     size;
-       enum                    ir_type ir_type;
+       u64             ir_type;
        spinlock_t              lock;
 };
 
+struct ir_dev_props {
+       unsigned long allowed_protos;
+       void            *priv;
+       int (*change_protocol)(void *priv, u64 ir_type);
+};
+
+
 struct ir_input_dev {
-       struct input_dev                *dev;
-       struct ir_scancode_table        rc_tab;
+       struct input_dev                *dev;           /* Input device*/
+       struct ir_scancode_table        rc_tab;         /* scan/key table */
+       unsigned long                   devno;          /* device number */
+       struct attribute_group          attr;           /* IR attributes */
+       struct device                   *class_dev;     /* virtual class dev */
+       const struct ir_dev_props       *props;         /* Device properties */
 };
+#define to_ir_input_dev(_attr) container_of(_attr, struct ir_input_dev, attr)
 
 /* Routines from ir-keytable.c */
 
 u32 ir_g_keycode_from_table(struct input_dev *input_dev,
                            u32 scancode);
 
-int ir_set_keycode_table(struct input_dev *input_dev,
-                        struct ir_scancode_table *rc_tab);
-
-int ir_roundup_tablesize(int n_elems);
 int ir_input_register(struct input_dev *dev,
-                     struct ir_scancode_table *ir_codes);
+                     const struct ir_scancode_table *ir_codes,
+                     const struct ir_dev_props *props);
 void ir_input_unregister(struct input_dev *input_dev);
 
+/* Routines from ir-sysfs.c */
+
+int ir_register_class(struct input_dev *input_dev);
+void ir_unregister_class(struct input_dev *input_dev);
+
 #endif