Changeset feeac0d in mainline for uspace/lib/usbhid
- Timestamp:
- 2013-09-10T16:32:35Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4982d87
- Parents:
- e8d6ce2
- Location:
- uspace/lib/usbhid/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbhid/src/hiddescriptor.c
re8d6ce2 rfeeac0d 333 333 } 334 334 335 usb_hid_report_description_t *report_des = NULL; 336 337 list_foreach(report->reports, report_it) { 338 report_des = list_get_instance(report_it, 339 usb_hid_report_description_t, reports_link); 340 335 list_foreach(report->reports, reports_link, 336 usb_hid_report_description_t, report_des) { 341 337 // if report id not set, return the first of the type 342 338 if(((report_des->report_id == report_id) || (report_id == 0)) && … … 902 898 void usb_hid_descriptor_print_list(list_t *list) 903 899 { 904 usb_hid_report_field_t *report_item;905 906 900 if(list == NULL || list_empty(list)) { 907 901 usb_log_debug("\tempty\n"); … … 909 903 } 910 904 911 list_foreach(*list, item) { 912 report_item = list_get_instance(item, usb_hid_report_field_t, 913 ritems_link); 914 905 list_foreach(*list, ritems_link, usb_hid_report_field_t, 906 report_item) { 915 907 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset); 916 908 usb_log_debug("\t\tSIZE: %zu\n", report_item->size); … … 937 929 938 930 usb_log_debug("\n"); 939 940 } 941 931 } 942 932 } 943 933 … … 951 941 void usb_hid_descriptor_print(usb_hid_report_t *report) 952 942 { 953 if (report == NULL) {943 if (report == NULL) 954 944 return; 955 } 956 957 usb_hid_report_description_t *report_des; 958 959 list_foreach(report->reports, report_it) { 960 report_des = list_get_instance(report_it, 961 usb_hid_report_description_t, reports_link); 945 946 list_foreach(report->reports, reports_link, 947 usb_hid_report_description_t, report_des) { 962 948 usb_log_debug("Report ID: %d\n", report_des->report_id); 963 949 usb_log_debug("\tType: %d\n", report_des->type); -
uspace/lib/usbhid/src/hidparser.c
re8d6ce2 rfeeac0d 130 130 size_t size, uint8_t *report_id) 131 131 { 132 usb_hid_report_field_t *item;133 134 132 usb_hid_report_description_t *report_des; 135 133 usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT; 136 134 137 135 if (report == NULL) { 138 136 return EINVAL; … … 153 151 154 152 /* read data */ 155 list_foreach(report_des->report_items, list_item) { 156 item = list_get_instance(list_item, usb_hid_report_field_t, 157 ritems_link); 153 list_foreach(report_des->report_items, ritems_link, 154 usb_hid_report_field_t, item) { 158 155 159 156 if (USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) { 160 157 161 158 if (USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0) { 162 159 /* array */ 163 160 item->value = 164 161 usb_hid_translate_data(item, data); 165 162 166 163 item->usage = USB_HID_EXTENDED_USAGE( 167 164 item->usages[item->value - … … 184 181 /* variable item */ 185 182 item->value = usb_hid_translate_data(item, 186 data); 187 } 183 data); 184 } 188 185 } 189 186 } 190 187 191 188 return EOK; 192 189 } … … 295 292 usb_hid_report_description_t *report_des = NULL; 296 293 297 list_foreach(report->reports, report_it) { 298 report_des = list_get_instance(report_it, 299 usb_hid_report_description_t, reports_link); 300 294 list_foreach(report->reports, reports_link, 295 usb_hid_report_description_t, report_des) { 301 296 if ((report_des->report_id == report_id) && 302 297 (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)) { … … 345 340 int length; 346 341 int32_t tmp_value; 347 342 348 343 if (report == NULL) { 349 344 return EINVAL; … … 351 346 352 347 if (report->use_report_ids != 0) { 353 buffer[0] = report_id; 348 buffer[0] = report_id; 354 349 } 355 350 … … 357 352 report_des = usb_hid_report_find_description(report, report_id, 358 353 USB_HID_REPORT_TYPE_OUTPUT); 359 354 360 355 if (report_des == NULL) { 361 356 return EINVAL; 362 357 } 363 358 364 usb_hid_report_field_t *report_item; 365 366 list_foreach(report_des->report_items, item) { 367 report_item = list_get_instance(item, usb_hid_report_field_t, 368 ritems_link); 369 359 list_foreach(report_des->report_items, ritems_link, 360 usb_hid_report_field_t, report_item) { 370 361 value = usb_hid_translate_data_reverse(report_item, 371 362 report_item->value); … … 373 364 offset = report_des->bit_length - report_item->offset - 1; 374 365 length = report_item->size; 375 366 376 367 usb_log_debug("\ttranslated value: %x\n", value); 377 368 … … 382 373 } 383 374 size_t shift = 8 - offset % 8 - length; 384 value = value << shift; 375 value = value << shift; 385 376 value = value & (((1 << length) - 1) << shift); 386 377 387 378 uint8_t mask = 0; 388 379 mask = 0xff - (((1 << length) - 1) << shift); … … 400 391 401 392 tmp_value = tmp_value << (offset % 8); 402 393 403 394 mask = ~(((1 << (8 - (offset % 8))) - 1) 404 395 << (offset % 8)); … … 407 398 tmp_value; 408 399 } else if (i == ((offset + length - 1) / 8)) { 409 400 410 401 value = value >> (length - 411 402 ((offset + length) % 8)); … … 413 404 value = value & ((1 << (length - 414 405 ((offset + length) % 8))) - 1); 415 406 416 407 mask = (1 << (length - 417 408 ((offset + length) % 8))) - 1; … … 427 418 report_item->value = 0; 428 419 } 429 420 430 421 return EOK; 431 422 } -
uspace/lib/usbhid/src/hidpath.c
re8d6ce2 rfeeac0d 176 176 usb_log_debug("\tLENGTH: %d\n", path->depth); 177 177 178 usb_hid_report_usage_path_t *path_item; 179 180 list_foreach(path->items, item) { 181 path_item = list_get_instance(item, usb_hid_report_usage_path_t, 182 rpath_items_link); 178 list_foreach(path->items, rpath_items_link, 179 usb_hid_report_usage_path_t, path_item) { 183 180 184 181 usb_log_debug("\tUSAGE_PAGE: %X\n", path_item->usage_page); … … 237 234 usb_hid_report_usage_path_t, rpath_items_link); 238 235 239 list_foreach(report_path->items, report_link) { 240 report_item = list_get_instance(report_link, 241 usb_hid_report_usage_path_t, rpath_items_link); 242 236 list_foreach(report_path->items, rpath_items_link, 237 usb_hid_report_usage_path_t, report_item) { 238 243 239 if(USB_HID_SAME_USAGE_PAGE(report_item->usage_page, 244 240 path_item->usage_page)){ 245 241 246 242 if(only_page == 0){ 247 243 if(USB_HID_SAME_USAGE( 248 244 report_item->usage, 249 245 path_item->usage)) { 250 246 251 247 return EOK; 252 248 } … … 266 262 return 1; 267 263 } 268 264 269 265 /* path is prefix of the report_path */ 270 266 case USB_HID_PATH_COMPARE_BEGIN: 271 267 272 268 report_link = report_path->items.head.next; 273 269 path_link = path->items.head.next; 274 270 275 271 while((report_link != &report_path->items.head) && 276 272 (path_link != &path->items.head)) { 277 273 278 274 report_item = list_get_instance(report_link, 279 275 usb_hid_report_usage_path_t, rpath_items_link); 280 276 281 277 path_item = list_get_instance(path_link, 282 278 usb_hid_report_usage_path_t, rpath_items_link); … … 286 282 !USB_HID_SAME_USAGE(report_item->usage, 287 283 path_item->usage))) { 288 284 289 285 return 1; 290 } 291 else { 286 } else { 292 287 report_link = report_link->next; 293 path_link = path_link->next; 288 path_link = path_link->next; 294 289 } 295 296 290 } 297 291 … … 300 294 ((report_link == &report_path->items.head) && 301 295 (path_link == &path->items.head))) { 302 296 303 297 return EOK; 304 298 } … … 405 399 usb_hid_report_path_t *usage_path) 406 400 { 407 usb_hid_report_usage_path_t *path_item;408 401 usb_hid_report_usage_path_t *new_path_item; 409 402 usb_hid_report_path_t *new_usage_path = usb_hid_report_path (); … … 419 412 } 420 413 421 list_foreach(usage_path->items, path_link) { 422 path_item = list_get_instance(path_link, 423 usb_hid_report_usage_path_t, rpath_items_link); 414 list_foreach(usage_path->items, rpath_items_link, 415 usb_hid_report_usage_path_t, path_item) { 424 416 425 417 new_path_item = malloc(sizeof(usb_hid_report_usage_path_t));
Note:
See TracChangeset
for help on using the changeset viewer.