Changeset 308a5d5 in mainline for uspace/drv/ohci/root_hub.c
- Timestamp:
- 2011-04-24T15:38:10Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 94c0dcbd
- Parents:
- 9b78020 (diff), 564a2b3 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/ohci/root_hub.c
r9b78020 r308a5d5 217 217 instance->registers->rh_desc_a |= RHDA_NPS_FLAG; 218 218 instance->unfinished_interrupt_transfer = NULL; 219 instance->interrupt_buffer = malloc((instance->port_count + 8)/8); 219 220 usb_log_info("OHCI root hub with %d ports.\n", instance->port_count); 220 221 return EOK; … … 471 472 size_t * buffer_size) { 472 473 int bit_count = instance->port_count + 1; 473 (*buffer_size) = (bit_count / 8) + ((bit_count % 8 == 0) ? 0 : 1);474 475 (*buffer) = malloc(*buffer_size);474 (*buffer_size) = (bit_count+7 / 8); 475 476 (*buffer) = instance->interrupt_buffer;//malloc(*buffer_size); 476 477 uint8_t * bitmap = (uint8_t*) (*buffer); 477 478 uint32_t mask = (1 << (USB_HUB_FEATURE_C_HUB_LOCAL_POWER + 16))
Note:
See TracChangeset
for help on using the changeset viewer.