3 files changed, 51 insertions, 19 deletions

diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 768aa77925cd..e221bc74020b 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -37,7 +37,7 @@ enum ir_kbd_get_key_fn {
 struct IR_i2c_init_data {
         char                    *ir_codes;
         const char              *name;
-        u64                     type; /* RC_TYPE_RC5, etc */
+        u64                     type; /* RC_BIT_RC5, etc */
         u32                     polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */
 
         /*
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index b0c494a69079..f03445f3c767 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -50,7 +50,7 @@ enum rc_driver_type {
  * @input_dev: the input child device used to communicate events to userspace
  * @driver_type: specifies if protocol decoding is done in hardware or software
  * @idle: used to keep track of RX state
- * @allowed_protos: bitmask with the supported RC_TYPE_* protocols
+ * @allowed_protos: bitmask with the supported RC_BIT_* protocols
  * @scanmask: some hardware decoders are not capable of providing the full
  *      scancode to the application. As this is a hardware limit, we can't do
  *      anything with it. Yet, as the same keycode table can be used with other
@@ -113,7 +113,7 @@ struct rc_dev {
         u32                             max_timeout;
         u32                             rx_resolution;
         u32                             tx_resolution;
-        int                             (*change_protocol)(struct rc_dev *dev, u64 rc_type);
+        int                             (*change_protocol)(struct rc_dev *dev, u64 *rc_type);
         int                             (*open)(struct rc_dev *dev);
         void                            (*close)(struct rc_dev *dev);
         int                             (*s_tx_mask)(struct rc_dev *dev, u32 mask);
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index cfd5163ff7f3..74f55a3f14eb 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -11,22 +11,54 @@
 
 #include <linux/input.h>
 
-#define RC_TYPE_UNKNOWN 0
-#define RC_TYPE_RC5     (1  << 0)       /* Philips RC5 protocol */
-#define RC_TYPE_NEC     (1  << 1)
-#define RC_TYPE_RC6     (1  << 2)       /* Philips RC6 protocol */
-#define RC_TYPE_JVC     (1  << 3)       /* JVC protocol */
-#define RC_TYPE_SONY    (1  << 4)       /* Sony12/15/20 protocol */
-#define RC_TYPE_RC5_SZ  (1  << 5)       /* RC5 variant used by Streamzap */
-#define RC_TYPE_SANYO   (1  << 6)       /* Sanyo protocol */
-#define RC_TYPE_MCE_KBD (1  << 29)      /* RC6-ish MCE keyboard/mouse */
-#define RC_TYPE_LIRC    (1  << 30)      /* Pass raw IR to lirc userspace */
-#define RC_TYPE_OTHER   (1u << 31)
+enum rc_type {
+        RC_TYPE_UNKNOWN         = 0,    /* Protocol not known */
+        RC_TYPE_OTHER           = 1,    /* Protocol known but proprietary */
+        RC_TYPE_LIRC            = 2,    /* Pass raw IR to lirc userspace */
+        RC_TYPE_RC5             = 3,    /* Philips RC5 protocol */
+        RC_TYPE_RC5X            = 4,    /* Philips RC5x protocol */
+        RC_TYPE_RC5_SZ          = 5,    /* StreamZap variant of RC5 */
+        RC_TYPE_JVC             = 6,    /* JVC protocol */
+        RC_TYPE_SONY12          = 7,    /* Sony 12 bit protocol */
+        RC_TYPE_SONY15          = 8,    /* Sony 15 bit protocol */
+        RC_TYPE_SONY20          = 9,    /* Sony 20 bit protocol */
+        RC_TYPE_NEC             = 10,   /* NEC protocol */
+        RC_TYPE_SANYO           = 11,   /* Sanyo protocol */
+        RC_TYPE_MCE_KBD         = 12,   /* RC6-ish MCE keyboard/mouse */
+        RC_TYPE_RC6_0           = 13,   /* Philips RC6-0-16 protocol */
+        RC_TYPE_RC6_6A_20       = 14,   /* Philips RC6-6A-20 protocol */
+        RC_TYPE_RC6_6A_24       = 15,   /* Philips RC6-6A-24 protocol */
+        RC_TYPE_RC6_6A_32       = 16,   /* Philips RC6-6A-32 protocol */
+        RC_TYPE_RC6_MCE         = 17,   /* MCE (Philips RC6-6A-32 subtype) protocol */
+};
+
+#define RC_BIT_NONE             0
+#define RC_BIT_UNKNOWN          (1 << RC_TYPE_UNKNOWN)
+#define RC_BIT_OTHER            (1 << RC_TYPE_OTHER)
+#define RC_BIT_LIRC             (1 << RC_TYPE_LIRC)
+#define RC_BIT_RC5              (1 << RC_TYPE_RC5)
+#define RC_BIT_RC5X             (1 << RC_TYPE_RC5X)
+#define RC_BIT_RC5_SZ           (1 << RC_TYPE_RC5_SZ)
+#define RC_BIT_JVC              (1 << RC_TYPE_JVC)
+#define RC_BIT_SONY12           (1 << RC_TYPE_SONY12)
+#define RC_BIT_SONY15           (1 << RC_TYPE_SONY15)
+#define RC_BIT_SONY20           (1 << RC_TYPE_SONY20)
+#define RC_BIT_NEC              (1 << RC_TYPE_NEC)
+#define RC_BIT_SANYO            (1 << RC_TYPE_SANYO)
+#define RC_BIT_MCE_KBD          (1 << RC_TYPE_MCE_KBD)
+#define RC_BIT_RC6_0            (1 << RC_TYPE_RC6_0)
+#define RC_BIT_RC6_6A_20        (1 << RC_TYPE_RC6_6A_20)
+#define RC_BIT_RC6_6A_24        (1 << RC_TYPE_RC6_6A_24)
+#define RC_BIT_RC6_6A_32        (1 << RC_TYPE_RC6_6A_32)
+#define RC_BIT_RC6_MCE          (1 << RC_TYPE_RC6_MCE)
 
-#define RC_TYPE_ALL (RC_TYPE_RC5    | RC_TYPE_NEC   | RC_TYPE_RC6     | \
-                     RC_TYPE_JVC    | RC_TYPE_SONY  | RC_TYPE_LIRC    | \
-                     RC_TYPE_RC5_SZ | RC_TYPE_SANYO | RC_TYPE_MCE_KBD | \
-                     RC_TYPE_OTHER)
+#define RC_BIT_ALL      (RC_BIT_UNKNOWN | RC_BIT_OTHER | RC_BIT_LIRC | \
+                         RC_BIT_RC5 | RC_BIT_RC5X | RC_BIT_RC5_SZ | \
+                         RC_BIT_JVC | \
+                         RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20 | \
+                         RC_BIT_NEC | RC_BIT_SANYO | RC_BIT_MCE_KBD | \
+                         RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 | \
+                         RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE)
 
 struct rc_map_table {
         u32     scancode;
@@ -38,7 +70,7 @@ struct rc_map {
         unsigned int            size;   /* Max number of entries */
         unsigned int            len;    /* Used number of entries */
         unsigned int            alloc;  /* Size of *scan in bytes */
-        u64                     rc_type;
+        enum rc_type            rc_type;
         const char              *name;
         spinlock_t              lock;
 };