Changeset d1fb591 in mainline

Timestamp:

2011-05-20T10:24:12Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e765ccb

Parents:

4939490

Message:

Saving max input report length and initializing buffer.

Location:

uspace/drv/usbhid

Files:

• usbhid.c (modified) (4 diffs)
• usbhid.h (modified) (1 diff)

uspace/drv/usbhid/usbhid.c

@@ -314 +314 @@
                 
                 if (matched) {
+                        usb_log_debug("Subdriver matched.\n");
                         subdrivers[count++] = &mapping->subdriver;
                 }
@@ -351 +352 @@
         
         return rc;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_hid_init_report(usb_hid_dev_t *hid_dev)
+{
+        assert(hid_dev != NULL && hid_dev->report != NULL);
+        
+        uint8_t report_id = 0;
+        size_t size = usb_hid_report_size(hid_dev->report, report_id, 
+            USB_HID_REPORT_TYPE_INPUT);
+        
+        size_t max_size = 0;
+        
+        while (size > 0) {
+                max_size = (size > max_size) ? size : max_size;
+                size = usb_hid_report_size(hid_dev->report, report_id, 
+                    USB_HID_REPORT_TYPE_INPUT);
+                ++report_id;
+        }
+        
+        usb_log_debug("Max size of input report: %zu\n", max_size);
+        
+        hid_dev->max_input_report_size = max_size;
+        assert(hid_dev->input_report == NULL);
+        
+        hid_dev->input_report = malloc(max_size);
+        if (hid_dev->input_report == NULL) {
+                return ENOMEM;
+        }
+        memset(hid_dev->input_report, 0, max_size);
+        
+        return EOK;
 }
 
@@ -490 +524 @@
         }
         
+        // save max input report size and allocate space for the report
+        rc = usb_hid_init_report(hid_dev);
+        if (rc != EOK) {
+                usb_log_error("Failed to initialize input report buffer.\n");
+        }
+        
         return rc;
 }
@@ -507 +547 @@
         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);
-                        }
-                        usb_hid_new_report();
-                }
-        }
+//      int allocated = (hid_dev->input_report != NULL);
+        assert(hid_dev->input_report != NULL);
+        assert(hid_dev->max_input_report_size >= buffer_size);
+        
+//      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);
+//                      }
+//                      usb_hid_new_report();
+//              }
+//      }
         
         /*! @todo This should probably be atomic. */
         memcpy(hid_dev->input_report, buffer, buffer_size);
         hid_dev->input_report_size = buffer_size;
+        usb_hid_new_report();
         
         bool cont = false;

uspace/drv/usbhid/usbhid.h

@@ -98 +98 @@
         
         size_t input_report_size;
+        size_t max_input_report_size;
 } usb_hid_dev_t;