Changeset acdbd780 in mainline for uspace/lib/usb


Ignore:
Timestamp:
2011-05-06T07:51:28Z (14 years ago)
Author:
Matej Klonfar <maklf@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
10849ffc, 3b5d5b9d
Parents:
b9d7965 (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:

development merge

Location:
uspace/lib/usb
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/usb/include/usb/classes/hidut.h

    rb9d7965 racdbd780  
    5959        USB_HIDUT_USAGE_GENERIC_DESKTOP_GAMEPAD = 5,
    6060        USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD = 6,
    61         USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYPAD = 7
     61        USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYPAD = 7,
     62        USB_HIDUT_USAGE_GENERIC_DESKTOP_X = 0x30,
     63        USB_HIDUT_USAGE_GENERIC_DESKTOP_Y = 0x31,
     64        USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL = 0x38
    6265        /* USB_HIDUT_USAGE_GENERIC_DESKTOP_ = , */
    6366       
  • uspace/lib/usb/src/hiddescriptor.c

    rb9d7965 racdbd780  
    640640
    641641                usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
    642                 usb_log_debug("\t\tSIZE: %X\n", report_item->size);                             
     642                usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
    643643                usb_log_debug("\t\tLOGMIN: %d\n", report_item->logical_minimum);
    644644                usb_log_debug("\t\tLOGMAX: %d\n", report_item->logical_maximum);               
     
    679679                usb_log_debug("Report ID: %d\n", report_des->report_id);
    680680                usb_log_debug("\tType: %d\n", report_des->type);
    681                 usb_log_debug("\tLength: %d\n", report_des->bit_length);               
    682                 usb_log_debug("\tItems: %d\n", report_des->item_length);               
     681                usb_log_debug("\tLength: %zu\n", report_des->bit_length);
     682                usb_log_debug("\tItems: %zu\n", report_des->item_length);
    683683
    684684                usb_hid_descriptor_print_list(&report_des->report_items);
Note: See TracChangeset for help on using the changeset viewer.