Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 8cbd512 in mainline


Ignore:
Timestamp:
2011-05-06T07:53:06Z (11 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master
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:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/usbhid/usbhid.c

    r3facf63a r8cbd512  
    490490        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
    491491       
    492         int allocated = (hid_dev->input_report == NULL);
     492        int allocated = (hid_dev->input_report != NULL);
    493493       
    494494        if (!allocated
  • uspace/drv/usbhub/usbhub.c

    r3facf63a r8cbd512  
    411411static int usb_process_hub_power_change(usb_hub_info_t * hub_info,
    412412    usb_hub_status_t status) {
    413         int opResult;
     413        int opResult = EOK;
    414414        if (!usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
    415415                //restart power on hub
     
    431431                        }
    432432                }
    433                 opResult = usb_hub_clear_feature(hub_info->control_pipe,
    434                     USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
     433        }
     434        if(opResult!=EOK){
     435                return opResult;//no feature clearing
     436        }
     437        opResult = usb_hub_clear_feature(hub_info->control_pipe,
     438            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
    435439                if (opResult != EOK) {
    436                         usb_log_error("cannnot clear hub power change flag: "
    437                             "%d\n",
    438                             opResult);
    439                 }
     440                usb_log_error("cannnot clear hub power change flag: "
     441                    "%d\n",
     442                    opResult);
    440443        }
    441444        return opResult;
  • uspace/lib/usb/src/hiddescriptor.c

    r3facf63a r8cbd512  
    629629
    630630                usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
    631                 usb_log_debug("\t\tSIZE: %X\n", report_item->size);                             
     631                usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
    632632                usb_log_debug("\t\tLOGMIN: %d\n", report_item->logical_minimum);
    633633                usb_log_debug("\t\tLOGMAX: %d\n", report_item->logical_maximum);               
     
    666666                usb_log_debug("Report ID: %d\n", report_des->report_id);
    667667                usb_log_debug("\tType: %d\n", report_des->type);
    668                 usb_log_debug("\tLength: %d\n", report_des->bit_length);               
    669                 usb_log_debug("\tItems: %d\n", report_des->item_length);               
     668                usb_log_debug("\tLength: %zu\n", report_des->bit_length);
     669                usb_log_debug("\tItems: %zu\n", report_des->item_length);
    670670
    671671                usb_hid_descriptor_print_list(&report_des->report_items);
Note: See TracChangeset for help on using the changeset viewer.