Changeset a9cdca0 in mainline

Timestamp:

2011-05-26T11:53:33Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

da56be2

Parents:

c0940a85

Message:

Saving byte size of report to usb_hid_dev_t + removed printf from driver.c

Location:

uspace

Files:

• drv/usbhid/usbhid.c (modified) (2 diffs)
• lib/drv/generic/driver.c (modified) (2 diffs)

uspace/drv/usbhid/usbhid.c

@@ -361 +361 @@
         
         uint8_t report_id = 0;
-        size_t size = usb_hid_report_size(hid_dev->report, report_id, 
+        size_t size = usb_hid_report_byte_size(hid_dev->report, report_id, 
             USB_HID_REPORT_TYPE_INPUT);
         
         size_t max_size = 0;
         
-        while (size > 0) {
+        do {
                 max_size = (size > max_size) ? size : max_size;
-                size = usb_hid_report_size(hid_dev->report, report_id, 
+                size = usb_hid_report_byte_size(hid_dev->report, report_id, 
                     USB_HID_REPORT_TYPE_INPUT);
-                ++report_id;
-        }
+                report_id = usb_hid_get_next_report_id(hid_dev->report, 
+                    report_id, USB_HID_REPORT_TYPE_INPUT);
+        } while (report_id != 0);
         
         usb_log_debug("Max size of input report: %zu\n", max_size);
@@ -549 +550 @@
 //      int allocated = (hid_dev->input_report != NULL);
         assert(hid_dev->input_report != NULL);
+        usb_log_debug("Max input report size: %zu, buffer size: %zu\n",
+            hid_dev->max_input_report_size, buffer_size);
         assert(hid_dev->max_input_report_size >= buffer_size);
         

uspace/lib/drv/generic/driver.c

@@ -346 +346 @@
                 sysarg_t method = IPC_GET_IMETHOD(call);
                 int iface_idx;
-                
-                printf("driver_connection_gen(): method: %d\n", method);
                 
                 switch  (method) {
@@ -397 +395 @@
                          * handling ("remote interface").
                          */
-                        printf("iface_idx: %d\n", iface_idx);
                         remote_iface_t *rem_iface = get_remote_iface(iface_idx);
                         assert(rem_iface != NULL);