Changeset 7aaed09 in mainline for uspace/lib/usbhid/src/consumer.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/usbhid/src/consumer.c (modified) (3 diffs)

uspace/lib/usbhid/src/consumer.c

@@ -38 +38 @@
 #include <usb/hid/usages/consumer.h>
 
-static const char *usbhid_consumer_usage_str[0x29d] = {
+static const char *usbhid_consumer_usage_str[] = {
         [0x01] = "Consumer Control",
         [0x02] = "Numeric Key Pad",
@@ -358 +358 @@
         [0x13e] = "Reserved",
         [0x13f] = "Reserved",
-        [0x140] = "Reserved", 
+        [0x140] = "Reserved",
         [0x141] = "Reserved",
         [0x142] = "Reserved",
@@ -717 +717 @@
  * @retval HelenOS key code corresponding to the given USB Consumer Page Usage.
  */
-const char *usbhid_multimedia_usage_to_str(int usage)
+const char *usbhid_multimedia_usage_to_str(unsigned usage)
 {
-        size_t map_length = sizeof(usbhid_consumer_usage_str) / sizeof(char *);
+        static const size_t map_length =
+            sizeof(usbhid_consumer_usage_str) / sizeof(char *);
 
-        if ((usage < 0) || ((size_t)usage >= map_length))
+        if (usage >= map_length)
                 return "Unknown usage";
 
-        /*! @todo What if the usage is not in the table? */
         return usbhid_consumer_usage_str[usage];
 }