Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / rc / rc-core-priv.h

diff --git a/drivers/media/IR/ir-core-priv.h b/drivers/media/rc/rc-core-priv.h
similarity index 83%
rename from drivers/media/IR/ir-core-priv.h
rename to drivers/media/rc/rc-core-priv.h
index 81c936bd793f1bf5c7b337c1dfbf09709be24891..873b387897511f59b446bfe4a9a94659a8f0611c 100644 (file)
--- a/drivers/media/IR/ir-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -13,22 +13,22 @@
  *  GNU General Public License for more details.
  */
 
-#ifndef _IR_RAW_EVENT
-#define _IR_RAW_EVENT
+#ifndef _RC_CORE_PRIV
+#define _RC_CORE_PRIV
 
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 
 struct ir_raw_handler {
        struct list_head list;
 
        u64 protocols; /* which are handled by this handler */
-       int (*decode)(struct input_dev *input_dev, struct ir_raw_event event);
+       int (*decode)(struct rc_dev *dev, struct ir_raw_event event);
 
        /* These two should only be used by the lirc decoder */
-       int (*raw_register)(struct input_dev *input_dev);
-       int (*raw_unregister)(struct input_dev *input_dev);
+       int (*raw_register)(struct rc_dev *dev);
+       int (*raw_unregister)(struct rc_dev *dev);
 };
 
 struct ir_raw_event_ctrl {
@@ -38,7 +38,7 @@ struct ir_raw_event_ctrl {
        struct kfifo                    kfifo;          /* fifo for the pulse/space durations */
        ktime_t                         last_event;     /* when last event occurred */
        enum raw_event_type             last_type;      /* last event type */
-       struct input_dev                *input_dev;     /* pointer to the parent input_dev */
+       struct rc_dev                   *dev;           /* pointer to the parent rc_dev */
        u64                             enabled_protocols; /* enabled raw protocol decoders */
 
        /* raw decoder state follows */
@@ -85,7 +85,7 @@ struct ir_raw_event_ctrl {
                unsigned wanted_bits;
        } rc5_sz;
        struct lirc_codec {
-               struct ir_input_dev *ir_dev;
+               struct rc_dev *dev;
                struct lirc_driver *drv;
                int carrier_low;
 
@@ -129,27 +129,17 @@ static inline bool is_timing_event(struct ir_raw_event ev)
 
 #define TO_US(duration)                        DIV_ROUND_CLOSEST((duration), 1000)
 #define TO_STR(is_pulse)               ((is_pulse) ? "pulse" : "space")
-/*
- * Routines from ir-sysfs.c - Meant to be called only internally inside
- * ir-core
- */
-int ir_register_input(struct input_dev *input_dev);
-
-int ir_register_class(struct input_dev *input_dev);
-void ir_unregister_class(struct input_dev *input_dev);
 
 /*
- * Routines from ir-raw-event.c to be used internally and by decoders
+ * Routines from rc-raw.c to be used internally and by decoders
  */
 u64 ir_raw_get_allowed_protocols(void);
-int ir_raw_event_register(struct input_dev *input_dev);
-void ir_raw_event_unregister(struct input_dev *input_dev);
+int ir_raw_event_register(struct rc_dev *dev);
+void ir_raw_event_unregister(struct rc_dev *dev);
 int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler);
 void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler);
 void ir_raw_init(void);
 
-int ir_rcmap_init(void);
-void ir_rcmap_cleanup(void);
 /*
  * Decoder initialization code
  *
@@ -200,4 +190,4 @@ void ir_rcmap_cleanup(void);
 #endif
 
 
-#endif /* _IR_RAW_EVENT */
+#endif /* _RC_CORE_PRIV */