Changeset 9014dcd in mainline for uspace/drv/ohci

Timestamp:

2011-04-22T12:47:39Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

32aef25b, 54d71e1

Parents:

44b1674

Message:

fix for usb hub
loc in ohci root hub

Location:

uspace/drv/ohci

Files:

• root_hub.c (modified) (2 diffs)
• root_hub.h (modified) (1 diff)

uspace/drv/ohci/root_hub.c

@@ -217 +217 @@
         instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
         instance->unfinished_interrupt_transfer = NULL;
+        instance->interrupt_buffer = malloc((instance->port_count + 8)/8);
         usb_log_info("OHCI root hub with %d ports.\n", instance->port_count);
         return EOK;
@@ -471 +472 @@
         size_t * buffer_size) {
         int bit_count = instance->port_count + 1;
-        (*buffer_size) = (bit_count / 8) + ((bit_count % 8 == 0) ? 0 : 1);
-
-        (*buffer) = malloc(*buffer_size);
+        (*buffer_size) = (bit_count+7 / 8);
+
+        (*buffer) = instance->interrupt_buffer;//malloc(*buffer_size);
         uint8_t * bitmap = (uint8_t*) (*buffer);
         uint32_t mask = (1 << (USB_HUB_FEATURE_C_HUB_LOCAL_POWER + 16))

uspace/drv/ohci/root_hub.h

@@ -56 +56 @@
         /** interrupt transfer waiting for an actual interrupt to occur */
         usb_transfer_batch_t * unfinished_interrupt_transfer;
+        /** pre-allocated interrupt mask
+         *
+         * This is allocated when initializing instance, so that memory
+         * allocation is not needed when processing request.
+         */
+        uint8_t * interrupt_buffer;
 } rh_t;