Changeset 322a8066 in mainline
- Timestamp:
- 2011-04-02T16:16:24Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4fbcd2a, d8987b1
- Parents:
- 8123695a (diff), 5542b83 (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. - Location:
- uspace
- Files:
-
- 2 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/uhci-hcd/hc.c
r8123695a r322a8066 239 239 usb_log_debug("Initialized device manager.\n"); 240 240 241 ret = bandwidth_init(&instance->bandwidth, BANDWIDTH_AVAILABLE_USB11, 242 bandwidth_count_usb11); 243 assert(ret == true); 244 241 245 return EOK; 242 246 #undef CHECK_RET_DEST_CMDS_RETURN … … 325 329 if (!usb_is_allowed( 326 330 low_speed, batch->transfer_type, batch->max_packet_size)) { 327 usb_log_warning( 328 "Invalid USB transfer specified %s SPEED %d %zu.\n", 329 low_speed ? "LOW" : "FULL" , batch->transfer_type, 331 usb_log_error("Invalid USB transfer specified %s %d %zu.\n", 332 usb_str_speed(batch->speed), batch->transfer_type, 330 333 batch->max_packet_size); 331 334 return ENOTSUP; 332 335 } 333 /* TODO: check available bandwidth here */ 336 /* Check available bandwidth */ 337 if (batch->transfer_type == USB_TRANSFER_INTERRUPT || 338 batch->transfer_type == USB_TRANSFER_ISOCHRONOUS) { 339 int ret = 340 bandwidth_use(&instance->bandwidth, batch->target.address, 341 batch->target.endpoint, batch->direction); 342 if (ret != EOK) { 343 usb_log_warning("Failed(%d) to use reserved bw: %s.\n", 344 ret, str_error(ret)); 345 } 346 } 334 347 335 348 transfer_list_t *list = … … 338 351 if (batch->transfer_type == USB_TRANSFER_CONTROL) { 339 352 usb_device_keeper_use_control( 340 &instance->manager, batch->target .address);353 &instance->manager, batch->target); 341 354 } 342 355 transfer_list_add_batch(list, batch); … … 358 371 { 359 372 assert(instance); 373 // status |= 1; //Uncomment to work around qemu hang 360 374 /* TODO: Resume interrupts are not supported */ 361 375 /* Lower 2 bits are transaction error and transaction complete */ … … 376 390 usb_transfer_batch_t *batch = 377 391 list_get_instance(item, usb_transfer_batch_t, link); 378 if (batch->transfer_type == USB_TRANSFER_CONTROL) { 392 switch (batch->transfer_type) 393 { 394 case USB_TRANSFER_CONTROL: 379 395 usb_device_keeper_release_control( 380 &instance->manager, batch->target.address); 396 &instance->manager, batch->target); 397 break; 398 case USB_TRANSFER_INTERRUPT: 399 case USB_TRANSFER_ISOCHRONOUS: { 400 int ret = bandwidth_free(&instance->bandwidth, 401 batch->target.address, 402 batch->target.endpoint, 403 batch->direction); 404 if (ret != EOK) 405 usb_log_warning("Failed(%d) to free " 406 "reserved bw: %s.\n", ret, 407 str_error(ret)); 408 } 409 default: 410 break; 381 411 } 382 412 batch->next_step(batch); -
uspace/drv/uhci-hcd/hc.h
r8123695a r322a8066 43 43 #include <usbhc_iface.h> 44 44 #include <usb/host/device_keeper.h> 45 #include <usb/host/bandwidth.h> 45 46 46 47 #include "batch.h" … … 84 85 typedef struct hc { 85 86 usb_device_keeper_t manager; 87 bandwidth_t bandwidth; 86 88 87 89 regs_t *registers; -
uspace/drv/uhci-hcd/iface.c
r8123695a r322a8066 128 128 } 129 129 /*----------------------------------------------------------------------------*/ 130 static int register_endpoint( 131 ddf_fun_t *fun, usb_address_t address, usb_endpoint_t endpoint, 132 usb_transfer_type_t transfer_type, usb_direction_t direction, 133 size_t max_packet_size, unsigned int interval) 134 { 135 hc_t *hc = fun_to_hc(fun); 136 assert(hc); 137 const usb_speed_t speed = 138 usb_device_keeper_get_speed(&hc->manager, address); 139 size_t size = max_packet_size; 140 141 usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n", 142 address, endpoint, usb_str_transfer_type(transfer_type), 143 usb_str_speed(speed), direction, size, max_packet_size, interval); 144 return bandwidth_reserve(&hc->bandwidth, address, endpoint, direction, 145 speed, transfer_type, max_packet_size, size, interval); 146 } 147 /*----------------------------------------------------------------------------*/ 148 static int unregister_endpoint( 149 ddf_fun_t *fun, usb_address_t address, 150 usb_endpoint_t endpoint, usb_direction_t direction) 151 { 152 hc_t *hc = fun_to_hc(fun); 153 assert(hc); 154 usb_log_debug("Unregister endpoint %d:%d %d.\n", 155 address, endpoint, direction); 156 return bandwidth_release(&hc->bandwidth, address, endpoint, direction); 157 } 158 /*----------------------------------------------------------------------------*/ 130 159 /** Interrupt out transaction interface function 131 160 * … … 365 394 .release_address = release_address, 366 395 396 .register_endpoint = register_endpoint, 397 .unregister_endpoint = unregister_endpoint, 398 367 399 .interrupt_out = interrupt_out, 368 400 .interrupt_in = interrupt_in, -
uspace/lib/c/generic/adt/hash_table.c
r8123695a r322a8066 54 54 * 55 55 */ 56 inthash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys,56 bool hash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys, 57 57 hash_table_operations_t *op) 58 58 { -
uspace/lib/c/include/adt/hash_table.h
r8123695a r322a8066 38 38 #include <adt/list.h> 39 39 #include <unistd.h> 40 #include <bool.h> 40 41 41 42 typedef unsigned long hash_count_t; … … 83 84 list_get_instance((item), type, member) 84 85 85 extern inthash_table_create(hash_table_t *, hash_count_t, hash_count_t,86 extern bool hash_table_create(hash_table_t *, hash_count_t, hash_count_t, 86 87 hash_table_operations_t *); 87 88 extern void hash_table_insert(hash_table_t *, unsigned long [], link_t *); -
uspace/lib/usb/Makefile
r8123695a r322a8066 53 53 src/hidreport.c \ 54 54 src/host/device_keeper.c \ 55 src/host/batch.c 55 src/host/batch.c \ 56 src/host/bandwidth.c 56 57 57 58 include $(USPACE_PREFIX)/Makefile.common -
uspace/lib/usb/include/usb/host/device_keeper.h
r8123695a r322a8066 51 51 usb_speed_t speed; 52 52 bool occupied; 53 boolcontrol_used;53 uint16_t control_used; 54 54 uint16_t toggle_status[2]; 55 55 devman_handle_t handle; … … 99 99 100 100 void usb_device_keeper_use_control(usb_device_keeper_t *instance, 101 usb_ address_t address);101 usb_target_t target); 102 102 103 103 void usb_device_keeper_release_control(usb_device_keeper_t *instance, 104 usb_ address_t address);104 usb_target_t target); 105 105 106 106 #endif -
uspace/lib/usb/src/host/device_keeper.c
r8123695a r322a8066 54 54 for (; i < USB_ADDRESS_COUNT; ++i) { 55 55 instance->devices[i].occupied = false; 56 instance->devices[i].control_used = false;56 instance->devices[i].control_used = 0; 57 57 instance->devices[i].handle = 0; 58 58 instance->devices[i].toggle_status[0] = 0; … … 311 311 /*----------------------------------------------------------------------------*/ 312 312 void usb_device_keeper_use_control(usb_device_keeper_t *instance, 313 usb_address_t address) 314 { 315 assert(instance); 316 fibril_mutex_lock(&instance->guard); 317 while (instance->devices[address].control_used) { 313 usb_target_t target) 314 { 315 assert(instance); 316 const uint16_t ep = 1 << target.endpoint; 317 fibril_mutex_lock(&instance->guard); 318 while (instance->devices[target.address].control_used & ep) { 318 319 fibril_condvar_wait(&instance->change, &instance->guard); 319 320 } 320 instance->devices[ address].control_used = true;321 instance->devices[target.address].control_used |= ep; 321 322 fibril_mutex_unlock(&instance->guard); 322 323 } 323 324 /*----------------------------------------------------------------------------*/ 324 325 void usb_device_keeper_release_control(usb_device_keeper_t *instance, 325 usb_address_t address) 326 { 327 assert(instance); 328 fibril_mutex_lock(&instance->guard); 329 instance->devices[address].control_used = false; 326 usb_target_t target) 327 { 328 assert(instance); 329 const uint16_t ep = 1 << target.endpoint; 330 fibril_mutex_lock(&instance->guard); 331 assert((instance->devices[target.address].control_used & ep) != 0); 332 instance->devices[target.address].control_used &= ~ep; 330 333 fibril_mutex_unlock(&instance->guard); 331 334 fibril_condvar_signal(&instance->change);
Note:
See TracChangeset
for help on using the changeset viewer.