Changeset 647492b in mainline

Timestamp:

2010-12-12T22:12:37Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1b29d6fa

Parents:

61efb7f

Message:

Fix wrong SET_ADDRESS in hub driver

Also, polling interval resetted back to 10ms.

Location:

uspace/drv/usbhub

Files:

• main.c (modified) (1 diff)
• utils.c (modified) (3 diffs)

uspace/drv/usbhub/main.c

@@ -50 +50 @@
         while(true){
                 usb_hub_check_hub_changes();
-                async_usleep(10000000);
+                async_usleep(100 * 1000);
         }
         return 0;

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
-                        );
+
+        /* 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");
@@ -543 +549 @@
         printf("[usb_hub] new device address %d, handle %d\n",
             new_device_address, child_handle);
-        sleep(60);
         
 }
@@ -629 +634 @@
         //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);