Changeset 8cbd512 in mainline

Timestamp:

2011-05-06T07:53:06Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

10849ffc

Parents:

3facf63a (diff), 054537b (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:

Changes from development

Location:

uspace

Files:

• drv/usbhid/usbhid.c (modified) (1 diff)
• drv/usbhub/usbhub.c (modified) (2 diffs)
• lib/usb/src/hiddescriptor.c (modified) (2 diffs)

uspace/drv/usbhid/usbhid.c

@@ -490 +490 @@
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
         
-        int allocated = (hid_dev->input_report == NULL);
+        int allocated = (hid_dev->input_report != NULL);
         
         if (!allocated

uspace/drv/usbhub/usbhub.c

@@ -411 +411 @@
 static int usb_process_hub_power_change(usb_hub_info_t * hub_info,
     usb_hub_status_t status) {
-        int opResult;
+        int opResult = EOK;
         if (!usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
                 //restart power on hub
@@ -431 +431 @@
                         }
                 }
-                opResult = usb_hub_clear_feature(hub_info->control_pipe,
-                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+        }
+        if(opResult!=EOK){
+                return opResult;//no feature clearing
+        }
+        opResult = usb_hub_clear_feature(hub_info->control_pipe,
+            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
                 if (opResult != EOK) {
-                        usb_log_error("cannnot clear hub power change flag: "
-                            "%d\n",
-                            opResult);
-                }
+                usb_log_error("cannnot clear hub power change flag: "
+                    "%d\n",
+                    opResult);
         }
         return opResult;

uspace/lib/usb/src/hiddescriptor.c

@@ -629 +629 @@
 
                 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
-                usb_log_debug("\t\tSIZE: %X\n", report_item->size);                             
+                usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
                 usb_log_debug("\t\tLOGMIN: %d\n", report_item->logical_minimum);
                 usb_log_debug("\t\tLOGMAX: %d\n", report_item->logical_maximum);                
@@ -666 +666 @@
                 usb_log_debug("Report ID: %d\n", report_des->report_id);
                 usb_log_debug("\tType: %d\n", report_des->type);
-                usb_log_debug("\tLength: %d\n", report_des->bit_length);                
-                usb_log_debug("\tItems: %d\n", report_des->item_length);                
+                usb_log_debug("\tLength: %zu\n", report_des->bit_length);
+                usb_log_debug("\tItems: %zu\n", report_des->item_length);
 
                 usb_hid_descriptor_print_list(&report_des->report_items);