Changes in uspace/lib/usbhid/src/consumer.c [07498c1:a28b41d] in mainline

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[] = {
+static const char *usbhid_consumer_usage_str[0x29d] = {
         [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(unsigned usage)
+const char *usbhid_multimedia_usage_to_str(int usage)
 {
-        static const size_t map_length =
-            sizeof(usbhid_consumer_usage_str) / sizeof(char *);
+        size_t map_length = sizeof(usbhid_consumer_usage_str) / sizeof(char *);
 
-        if (usage >= map_length)
+        if ((usage < 0) || ((size_t)usage >= map_length))
                 return "Unknown usage";
 
+        /*! @todo What if the usage is not in the table? */
         return usbhid_consumer_usage_str[usage];
 }