Changes in uspace/drv/usbhid/usbhid.c [054537b:4125b7d] in mainline

File:

• uspace/drv/usbhid/usbhid.c (modified) (10 diffs)

uspace/drv/usbhid/usbhid.c

@@ -136 +136 @@
         
         // set the init callback
-        hid_dev->subdrivers[0].init = usb_generic_hid_init;
+        hid_dev->subdrivers[0].init = NULL;
         
         // set the polling callback
@@ -158 +158 @@
     const usb_hid_subdriver_mapping_t *mapping)
 {
-        assert(hid_dev != NULL);
-        assert(hid_dev->usb_dev != NULL);
-        
-        return (hid_dev->usb_dev->descriptors.device.vendor_id 
-            == mapping->vendor_id
-            && hid_dev->usb_dev->descriptors.device.product_id 
-            == mapping->product_id);
+        return false;
 }
 
@@ -198 +192 @@
         }
         
-        assert(hid_dev->report != NULL);
+        assert(hid_dev->parser != NULL);
         
         usb_log_debug("Compare flags: %d\n", mapping->compare);
-        size_t size = usb_hid_report_input_length(hid_dev->report, usage_path, 
+        size_t size = usb_hid_report_input_length(hid_dev->parser, usage_path, 
             mapping->compare);
         usb_log_debug("Size of the input report: %zuB\n", size);
@@ -257 +251 @@
         while (count < USB_HID_MAX_SUBDRIVERS &&
             (mapping->usage_path != NULL
-            || mapping->vendor_id >= 0 || mapping->product_id >= 0)) {
+            || mapping->vendor_id != 0 || mapping->product_id != 0)) {
                 // check the vendor & product ID
-                if (mapping->vendor_id >= 0 && mapping->product_id < 0) {
-                        usb_log_warning("Missing Product ID for Vendor ID %d\n",
+                if (mapping->vendor_id != 0 && mapping->product_id == 0) {
+                        usb_log_warning("Missing Product ID for Vendor ID %u\n",
                             mapping->vendor_id);
                         return EINVAL;
                 }
-                if (mapping->product_id >= 0 && mapping->vendor_id < 0) {
-                        usb_log_warning("Missing Vendor ID for Product ID %d\n",
+                if (mapping->product_id != 0 && mapping->vendor_id == 0) {
+                        usb_log_warning("Missing Vendor ID for Product ID %u\n",
                             mapping->product_id);
                         return EINVAL;
@@ -273 +267 @@
                 matched = false;
                 
-                if (mapping->vendor_id >= 0) {
-                        assert(mapping->product_id >= 0);
+                if (mapping->vendor_id != 0) {
+                        assert(mapping->product_id != 0);
                         usb_log_debug("Comparing device against vendor ID %u"
                             " and product ID %u.\n", mapping->vendor_id,
@@ -347 +341 @@
         }
         
-        hid_dev->report = (usb_hid_report_t *)(malloc(sizeof(
-            usb_hid_report_t)));
-        if (hid_dev->report == NULL) {
+        hid_dev->parser = (usb_hid_report_parser_t *)(malloc(sizeof(
+            usb_hid_report_parser_t)));
+        if (hid_dev->parser == NULL) {
                 usb_log_fatal("No memory!\n");
                 free(hid_dev);
@@ -388 +382 @@
                 return rc;
         }
-                
+        
+        /* Initialize the report parser. */
+        rc = usb_hid_parser_init(hid_dev->parser);
+        if (rc != EOK) {
+                usb_log_error("Failed to initialize report parser.\n");
+                //usb_hid_free(&hid_dev);
+                return rc;
+        }
+        
         /* Get the report descriptor and parse it. */
         rc = usb_hid_process_report_descriptor(hid_dev->usb_dev, 
-            hid_dev->report);
+            hid_dev->parser);
         
         bool fallback = false;
@@ -490 +492 @@
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
         
-        int allocated = (hid_dev->input_report != NULL);
-        
-        if (!allocated
-            || hid_dev->input_report_size < buffer_size) {
-                uint8_t *input_old = hid_dev->input_report;
-                uint8_t *input_new = (uint8_t *)malloc(buffer_size);
-                
-                if (input_new == NULL) {
-                        usb_log_error("Failed to allocate space for input "
-                            "buffer. This event may not be reported\n");
-                        memset(hid_dev->input_report, 0, 
-                            hid_dev->input_report_size);
-                } else {
-                        memcpy(input_new, input_old, 
-                            hid_dev->input_report_size);
-                        hid_dev->input_report = input_new;
-                        if (allocated) {
-                                free(input_old);
-                        }
-                }
-        }
-        
-        /*! @todo This should probably be atomic. */
-        memcpy(hid_dev->input_report, buffer, buffer_size);
-        hid_dev->input_report_size = buffer_size;
-        
         bool cont = false;
         
@@ -554 +530 @@
 /*----------------------------------------------------------------------------*/
 
-//const char *usb_hid_get_function_name(const usb_hid_dev_t *hid_dev)
-//{
-//      switch (hid_dev->poll_pipe_index) {
-//      case USB_HID_KBD_POLL_EP_NO:
-//              return HID_KBD_FUN_NAME;
-//              break;
-//      case USB_HID_MOUSE_POLL_EP_NO:
-//              return HID_MOUSE_FUN_NAME;
-//              break;
-//      default:
-//              return HID_GENERIC_FUN_NAME;
-//      }
-//}
-
-/*----------------------------------------------------------------------------*/
-
-//const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev)
-//{
-//      // this means that only boot protocol keyboards will be connected
-//      // to the console; there is probably no better way to do this
-        
-//      switch (hid_dev->poll_pipe_index) {
-//      case USB_HID_KBD_POLL_EP_NO:
-//              return HID_KBD_CLASS_NAME;
-//              break;
-//      case USB_HID_MOUSE_POLL_EP_NO:
-//              return HID_MOUSE_CLASS_NAME;
-//              break;
-//      default:
-//              return HID_GENERIC_CLASS_NAME;
-//      }
-//}
+const char *usb_hid_get_function_name(const usb_hid_dev_t *hid_dev)
+{
+        switch (hid_dev->poll_pipe_index) {
+        case USB_HID_KBD_POLL_EP_NO:
+                return HID_KBD_FUN_NAME;
+                break;
+        case USB_HID_MOUSE_POLL_EP_NO:
+                return HID_MOUSE_FUN_NAME;
+                break;
+        default:
+                return HID_GENERIC_FUN_NAME;
+        }
+}
+
+/*----------------------------------------------------------------------------*/
+
+const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev)
+{
+        // this means that only boot protocol keyboards will be connected
+        // to the console; there is probably no better way to do this
+        
+        switch (hid_dev->poll_pipe_index) {
+        case USB_HID_KBD_POLL_EP_NO:
+                return HID_KBD_CLASS_NAME;
+                break;
+        case USB_HID_MOUSE_POLL_EP_NO:
+                return HID_MOUSE_CLASS_NAME;
+                break;
+        default:
+                return HID_GENERIC_CLASS_NAME;
+        }
+}
 
 /*----------------------------------------------------------------------------*/
@@ -615 +591 @@
 
         // destroy the parser
-        if ((*hid_dev)->report != NULL) {
-                usb_hid_free_report((*hid_dev)->report);
+        if ((*hid_dev)->parser != NULL) {
+                usb_hid_free_report_parser((*hid_dev)->parser);
         }