[media] rc-core: add separate defines for protocol bitmaps and numbers

The RC_TYPE_* defines are currently used both where a single protocol is
expected and where a bitmap of protocols is expected.

Functions like rc_keydown() and functions which add/remove entries to the
keytable want a single protocol. Future userspace APIs would also
benefit from numeric protocols (rather than bitmap ones). Keytables are
smaller if they can use a small(ish) integer rather than a bitmap.

Other functions or struct members (e.g. allowed_protos,
enabled_protocols, etc) accept multiple protocols and need a bitmap.

Using different types reduces the risk of programmer error. Using a
protocol enum whereever possible also makes for a more future-proof
user-space API as we don't need to worry about a sufficient number of
bits being available (e.g. in structs used for ioctl() calls).

The use of both a number and a corresponding bit is dalso one in e.g.
the input subsystem as well (see all the references to set/clear bit when
changing keytables for example).

This patch separate the different usages in preparation for
upcoming patches.

Where a single protocol is expected, enum rc_type is used; where one or more
protocol(s) are expected, something like u64 is used.

The patch has been rewritten so that the format of the sysfs "protocols"
file is no longer altered (at the loss of some detail). The file itself
should probably be deprecated in the future though.

Signed-off-by: David Härdeman <david@hardeman.nu>
Cc: Andy Walls <awalls@md.metrocast.net>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Antti Palosaari <crope@iki.fi>
Cc: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 41 insertions, 32 deletions

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index cabc19c10515..601d1ac1c688 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -725,25 +725,36 @@ static struct class ir_input_class = {
         .devnode        = ir_devnode,
 };
 
+/*
+ * These are the protocol textual descriptions that are
+ * used by the sysfs protocols file. Note that the order
+ * of the entries is relevant.
+ */
 static struct {
         u64     type;
         char    *name;
 } proto_names[] = {
-        { RC_TYPE_UNKNOWN,      "unknown"       },
-        { RC_TYPE_RC5,          "rc-5"          },
-        { RC_TYPE_NEC,          "nec"           },
-        { RC_TYPE_RC6,          "rc-6"          },
-        { RC_TYPE_JVC,          "jvc"           },
-        { RC_TYPE_SONY,         "sony"          },
-        { RC_TYPE_RC5_SZ,       "rc-5-sz"       },
-        { RC_TYPE_SANYO,        "sanyo"         },
-        { RC_TYPE_MCE_KBD,      "mce_kbd"       },
-        { RC_TYPE_LIRC,         "lirc"          },
-        { RC_TYPE_OTHER,        "other"         },
+        { RC_BIT_NONE,          "none"          },
+        { RC_BIT_OTHER,         "other"         },
+        { RC_BIT_UNKNOWN,       "unknown"       },
+        { RC_BIT_RC5 |
+          RC_BIT_RC5X,          "rc-5"          },
+        { RC_BIT_NEC,           "nec"           },
+        { RC_BIT_RC6_0 |
+          RC_BIT_RC6_6A_20 |
+          RC_BIT_RC6_6A_24 |
+          RC_BIT_RC6_6A_32 |
+          RC_BIT_RC6_MCE,       "rc-6"          },
+        { RC_BIT_JVC,           "jvc"           },
+        { RC_BIT_SONY12 |
+          RC_BIT_SONY15 |
+          RC_BIT_SONY20,        "sony"          },
+        { RC_BIT_RC5_SZ,        "rc-5-sz"       },
+        { RC_BIT_SANYO,         "sanyo"         },
+        { RC_BIT_MCE_KBD,       "mce_kbd"       },
+        { RC_BIT_LIRC,          "lirc"          },
 };
 
-#define PROTO_NONE      "none"
-
 /**
  * show_protocols() - shows the current IR protocol(s)
  * @device:     the device descriptor
@@ -790,6 +801,9 @@ static ssize_t show_protocols(struct device *device,
                         tmp += sprintf(tmp, "[%s] ", proto_names[i].name);
                 else if (allowed & proto_names[i].type)
                         tmp += sprintf(tmp, "%s ", proto_names[i].name);
+
+                if (allowed & proto_names[i].type)
+                        allowed &= ~proto_names[i].type;
         }
 
         if (tmp != buf)
@@ -867,26 +881,20 @@ static ssize_t store_protocols(struct device *device,
                         disable = false;
                 }
 
-                if (!enable && !disable && !strncasecmp(tmp, PROTO_NONE, sizeof(PROTO_NONE))) {
-                        tmp += sizeof(PROTO_NONE);
-                        mask = 0;
-                        count++;
-                } else {
-                        for (i = 0; i < ARRAY_SIZE(proto_names); i++) {
-                                if (!strcasecmp(tmp, proto_names[i].name)) {
-                                        tmp += strlen(proto_names[i].name);
-                                        mask = proto_names[i].type;
-                                        break;
-                                }
-                        }
-                        if (i == ARRAY_SIZE(proto_names)) {
-                                IR_dprintk(1, "Unknown protocol: '%s'\n", tmp);
-                                ret = -EINVAL;
-                                goto out;
+                for (i = 0; i < ARRAY_SIZE(proto_names); i++) {
+                        if (!strcasecmp(tmp, proto_names[i].name)) {
+                                mask = proto_names[i].type;
+                                break;
                         }
-                        count++;
                 }
 
+                if (i == ARRAY_SIZE(proto_names)) {
+                        IR_dprintk(1, "Unknown protocol: '%s'\n", tmp);
+                        return -EINVAL;
+                }
+
+                count++;
+
                 if (enable)
                         type |= mask;
                 else if (disable)
@@ -902,7 +910,7 @@ static ssize_t store_protocols(struct device *device,
         }
 
         if (dev->change_protocol) {
-                rc = dev->change_protocol(dev, type);
+                rc = dev->change_protocol(dev, &type);
                 if (rc < 0) {
                         IR_dprintk(1, "Error setting protocols to 0x%llx\n",
                                    (long long)type);
@@ -1117,7 +1125,8 @@ int rc_register_device(struct rc_dev *dev)
         }
 
         if (dev->change_protocol) {
-                rc = dev->change_protocol(dev, rc_map->rc_type);
+                u64 rc_type = (1 << rc_map->rc_type);
+                rc = dev->change_protocol(dev, &rc_type);
                 if (rc < 0)
                         goto out_raw;
         }