Changeset f2962621 in mainline for uspace/drv/usbhub/utils.c

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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:

merge with usb/development

File:

• uspace/drv/usbhub/utils.c (modified) (6 diffs)

uspace/drv/usbhub/utils.c

@@ -506 +506 @@
                 int hc, uint16_t port, usb_target_t target) {
 
-        usb_device_request_setup_packet_t request;
         int opResult;
         printf("[usb_hub] finalizing add device\n");
-        usb_address_t new_device_address =
-                        usb_drv_request_address(hc);
-        usb_hub_set_set_address_request
-                        (&request, new_device_address);
-        opResult = usb_drv_sync_control_write(
-                        hc, target,
-                        &request,
-                        NULL, 0
-                        );
+        opResult = usb_hub_clear_port_feature(hc, target.address,
+            port, USB_HUB_FEATURE_C_PORT_RESET);
+        if (opResult != EOK) {
+                goto release;
+        }
+
+        /* Request address at from host controller. */
+        usb_address_t new_device_address = usb_drv_request_address(hc);
+        if (new_device_address < 0) {
+                printf("[usb_hub] failed to get free USB address\n");
+                opResult = new_device_address;
+                goto release;
+        }
+        printf("[usb_hub] setting new address\n");
+        opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
+            new_device_address);
+
         if (opResult != EOK) {
                 printf("[usb_hub] could not set address for new device\n");
-                //will retry later...
-                return;
-        }
-
+                goto release;
+        }
+
+release:
+        printf("[usb_hub] releasing default address\n");
         usb_drv_release_default_address(hc);
+        if (opResult != EOK) {
+                return;
+        }
 
         devman_handle_t child_handle;
         opResult = usb_drv_register_child_in_devman(hc, hub->device,
-        new_device_address, &child_handle);
+            new_device_address, &child_handle);
         if (opResult != EOK) {
                 printf("[usb_hub] could not start driver for new device \n");
@@ -541 +552 @@
                 return;
         }
-        printf("[usb_hub] new device address %d, handle %d\n",
+        printf("[usb_hub] new device address %d, handle %zu\n",
             new_device_address, child_handle);
-        sleep(60);
         
 }
@@ -620 +630 @@
         //something connected/disconnected
         if (usb_port_connect_change(&status)) {
+                opResult = usb_hub_clear_port_feature(hc, target.address,
+                    port, USB_HUB_FEATURE_C_PORT_CONNECTION);
+                // TODO: check opResult
                 if (usb_port_dev_connected(&status)) {
                         printf("[usb_hub] some connection changed\n");
@@ -629 +642 @@
         //port reset
         if (usb_port_reset_completed(&status)) {
-                printf("[usb_hub] finalizing add device\n");
+                printf("[usb_hub] port reset complete\n");
                 if (usb_port_enabled(&status)) {
                         usb_hub_finalize_add_device(hub, hc, port, target);
@@ -670 +683 @@
                         lst_item != &usb_hub_list;
                         lst_item = lst_item->next) {
-                printf("[usb_hub] checking hub changes\n");
                 usb_hub_info_t * hub_info = ((usb_hub_info_t*)lst_item->data);
                 /*
@@ -679 +691 @@
                 target.address = hub_info->usb_device->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
-                printf("checking changes for hub at addr %d \n",target.address);
+                printf("[usb_hub] checking changes for hub at addr %d\n",
+                    target.address);
 
                 size_t port_count = hub_info->port_count;