Changeset f29643d5 in mainline

Timestamp:

2015-07-05T09:25:02Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ff0258f

Parents:

f523daf

Message:

libusbhost: Make sure interrupts are registered before touching hw.

rework error reporting in device enumration

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (13 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -470 +470 @@
         int ret = usb_bus_get_speed(&hcd->bus, USB_ADDRESS_DEFAULT, &speed);
         if (ret != EOK) {
-                return ret;
-        }
-
-        usb_log_debug("Found new %s speed USB device\n", usb_str_speed(speed));
+                usb_log_error("Failed to verify speed: %s.", str_error(ret));
+                return ret;
+        }
+
+        usb_log_debug("Found new %s speed USB device.", usb_str_speed(speed));
 
         static const usb_target_t default_target = {{
@@ -481 +482 @@
 
         const usb_address_t address = hcd_request_address(hcd, speed);
-        if (address < 0)
+        if (address < 0) {
+                usb_log_error("Failed to reserve new address: %s.",
+                    str_error(address));
                 return address;
+        }
 
         usb_log_debug("Reserved new address: %d\n", address);
@@ -500 +504 @@
             tt_address, port);
         if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to add default target: %s.",
+                    address, str_error(ret));
                 hcd_release_address(hcd, address);
                 return ret;
@@ -510 +516 @@
 
         // TODO CALLBACKS
-        usb_log_debug("Device(%d): Requesting first 8B of device descriptor\n",
+        usb_log_debug("Device(%d): Requesting first 8B of device descriptor.",
             address);
         ssize_t got = hcd_send_batch_sync(hcd, default_target, USB_DIRECTION_IN,
@@ -517 +523 @@
 
         if (got != CTRL_PIPE_MIN_PACKET_SIZE) {
+                ret = got < 0 ? got : EOVERFLOW;
+                usb_log_error("Device(%d): Failed to get 8B of dev descr: %s.",
+                    address, str_error(ret));
                 hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);
                 hcd_release_address(hcd, address);
-                return got < 0 ? got : EOVERFLOW;
+                return ret;
         }
 
         /* Register EP on the new address */
-        usb_log_debug("Device(%d): Registering control EP\n", address);
+        usb_log_debug("Device(%d): Registering control EP.", address);
         ret = hcd_add_ep(hcd, target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
             ED_MPS_PACKET_SIZE_GET(uint16_usb2host(desc.max_packet_size)),
@@ -530 +539 @@
             tt_address, port);
         if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to register EP0: %s",
+                    address, str_error(ret));
                 hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);
                 hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
@@ -540 +551 @@
             SET_ADDRESS(target.address);
 
-        usb_log_debug("Device(%d): Setting USB address.\n", address);
+        usb_log_debug("Device(%d): Setting USB address.", address);
         got = hcd_send_batch_sync(hcd, default_target, USB_DIRECTION_OUT,
             NULL, 0, *(uint64_t *)&set_address, "set address");
 
-        usb_log_debug("Device(%d): Removing default (0:0) EP\n", address);
+        usb_log_debug("Device(%d): Removing default (0:0) EP.", address);
         hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);
 
         if (got != 0) {
+                usb_log_error("Device(%d): Failed to set new address: %s.",
+                    address, str_error(got));
                 hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
                 hcd_release_address(hcd, address);
@@ -557 +570 @@
             GET_DEVICE_DESC(sizeof(desc));
 
-        usb_log_debug("Device(%d): Requesting full device descriptor\n",
+        usb_log_debug("Device(%d): Requesting full device descriptor.",
             address);
         got = hcd_send_batch_sync(hcd, target, USB_DIRECTION_IN,
@@ -563 +576 @@
             "read device descriptor");
         if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to set get dev descriptor: %s",
+                    address, str_error(ret));
                 hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
                 hcd_release_address(hcd, target.address);
-                return got < 0 ? got : EOVERFLOW;
+                return ret;
         }
 
@@ -572 +587 @@
         init_match_ids(&mids);
 
-        usb_log_debug("Device(%d): Creating match IDs\n", address);
+        usb_log_debug("Device(%d): Creating match IDs.", address);
         ret = create_match_ids(&mids, &desc);
         if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to create match ids: %s",
+                    address, str_error(ret));
                 hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
                 hcd_release_address(hcd, target.address);
@@ -581 +598 @@
 
         /* Register device */
-        usb_log_debug("Device(%d): Registering DDF device\n", address);
+        usb_log_debug("Device(%d): Registering DDF device.", address);
         ret = hcd_ddf_add_device(device, hub, port, address, speed, NULL, &mids);
         clean_match_ids(&mids);
         if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to register: %s.",
+                    address, str_error(ret));
                 hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
                 hcd_release_address(hcd, target.address);
@@ -844 +863 @@
         }
 
-        if (driver->claim)
-                ret = driver->claim(device);
-        if (ret != EOK) {
-                usb_log_error("Failed to claim `%s' for driver `%s'",
-                    ddf_dev_get_name(device), driver->name);
-                return ret;
-        }
-
         hw_res_list_parsed_t hw_res;
         ret = hcd_ddf_get_registers(device, &hw_res);
@@ -875 +886 @@
                 usb_log_debug("Hw interrupts enabled.\n");
         }
+
+        if (driver->claim)
+                ret = driver->claim(device);
+        if (ret != EOK) {
+                usb_log_error("Failed to claim `%s' for driver `%s'",
+                    ddf_dev_get_name(device), driver->name);
+                return ret;
+        }
+
 
         /* Init hw driver */