Changeset 32aef25b in mainline

Timestamp:

2011-04-22T12:51:10Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

564a2b3, 9bff1ea

Parents:

c7d19d84 (diff), 9014dcd (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:

fix for usbhub

Location:

uspace/drv

Files:

• ohci/root_hub.c (modified) (2 diffs)
• ohci/root_hub.h (modified) (1 diff)
• usbhub/usbhub.c (modified) (9 diffs)

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;
 

uspace/drv/usbhub/usbhub.c

@@ -105 +105 @@
         }
 
-        //usb_pipe_start_session(hub_info->control_pipe);
         //set hub configuration
         opResult = usb_hub_set_configuration(hub_info);
@@ -122 +121 @@
                 return opResult;
         }
-        //usb_pipe_end_session(hub_info->control_pipe);
-
 
         usb_log_debug("Creating 'hub' function in DDF.\n");
@@ -176 +173 @@
 leave:
         /* FIXME: proper interval. */
-        async_usleep(1000 * 1000 * 10);
+        async_usleep(1000 * 250);
 
         return true;
@@ -218 +215 @@
         // get hub descriptor
         usb_log_debug("creating serialized descriptor\n");
-        //void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
         uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE];
         usb_hub_descriptor_t * descriptor;
@@ -253 +249 @@
             sizeof (usb_hub_port_t) * (hub_info->port_count + 1));
         size_t port;
-        for (port = 0; port < hub_info->port_count + 1; port++) {
+        for (port = 0; port < hub_info->port_count + 1; ++port) {
                 usb_hub_port_init(&hub_info->ports[port]);
         }
         if(is_power_switched){
                 usb_log_debug("is_power_switched\n");
-                if(has_individual_port_powering){
-                        usb_log_debug("has_individual_port_powering\n");
-                        for (port = 0; port < hub_info->port_count; port++) {
-                                opResult = usb_hub_set_port_feature(hub_info->control_pipe,
-                                    port+1, USB_HUB_FEATURE_PORT_POWER);
-                                if (opResult != EOK) {
-                                        usb_log_error("cannot power on port %zu: %s.\n",
-                                            port+1, str_error(opResult));
-                                }
+                
+                for (port = 1; port <= hub_info->port_count; ++port) {
+                        usb_log_debug("powering port %d\n",port);
+                        opResult = usb_hub_set_port_feature(hub_info->control_pipe,
+                            port, USB_HUB_FEATURE_PORT_POWER);
+                        if (opResult != EOK) {
+                                usb_log_error("cannot power on port %zu: %s.\n",
+                                    port, str_error(opResult));
                         }
-                }else{
+                }
+                if(!has_individual_port_powering){
                         usb_log_debug("!has_individual_port_powering\n");
                         opResult = usb_hub_set_feature(hub_info->control_pipe,
@@ -281 +277 @@
         }
         usb_log_debug2("freeing data\n");
-        //free(serialized_descriptor);
-        //free(descriptor->devices_removable);
         free(descriptor);
         return EOK;
@@ -415 +409 @@
     usb_hub_status_t status) {
         int opResult;
-        if (usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
+        if (!usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
                 //restart power on hub
                 opResult = usb_hub_set_feature(hub_info->control_pipe,
@@ -425 +419 @@
         } else {//power reestablished on hub- restart ports
                 size_t port;
-                for (port = 0; port < hub_info->port_count; ++port) {
+                for (port = 1; port <= hub_info->port_count; ++port) {
                         opResult = usb_hub_set_port_feature(
                             hub_info->control_pipe,
@@ -434 +428 @@
                         }
                 }
+                opResult = usb_hub_clear_feature(hub_info->control_pipe,
+                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+                if (opResult != EOK) {
+                        usb_log_error("cannnot clear hub power change flag: "
+                            "%d\n",
+                            opResult);
+                }
         }
         return opResult;