Changeset c86ca9a in mainline

Timestamp:

2015-06-29T00:35:29Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

68a61f19

Parents:

92900e2

Message:

libusbhost: Add more debugging output

Location:

uspace/lib/usbhost/src

Files:

• ddf_helpers.c (modified) (11 diffs)
• usb_bus.c (modified) (3 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -472 +472 @@
         }
 
+        usb_log_debug("Found new %s speed USB device\n", usb_str_speed(speed));
+
         static const usb_target_t default_target = {{
                 .address = USB_ADDRESS_DEFAULT,
@@ -481 +483 @@
                 return address;
 
+        usb_log_debug("Reserved new address: %d\n", address);
+
         const usb_target_t target = {{
                 .address = address,
@@ -489 +493 @@
 
         /* Add default pipe on default address */
+        usb_log_debug("Device(%d): Adding default target(0:0)\n", address);
         ret = hcd_add_ep(hcd,
             default_target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
             CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE, 1,
             tt_address, port);
-
         if (ret != EOK) {
                 hcd_release_address(hcd, address);
@@ -505 +509 @@
 
         // TODO CALLBACKS
+        usb_log_debug("Device(%d): Requesting first 8B of device descriptor\n",
+            address);
         ssize_t got = hcd_send_batch_sync(hcd, default_target, USB_DIRECTION_IN,
             &desc, CTRL_PIPE_MIN_PACKET_SIZE, *(uint64_t *)&get_device_desc_8,
@@ -516 +522 @@
 
         /* Register EP on the new address */
+        usb_log_debug("Device(%d): Registering control EP\n", address);
         ret = hcd_add_ep(hcd, target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
             ED_MPS_PACKET_SIZE_GET(uint16_usb2host(desc.max_packet_size)),
@@ -532 +539 @@
             SET_ADDRESS(target.address);
 
+        usb_log_debug("Device(%d): Setting USB address.\n", 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);
         hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);
 
@@ -547 +556 @@
             GET_DEVICE_DESC(sizeof(desc));
 
+        usb_log_debug("Device(%d): Requesting full device descriptor\n",
+            address);
         got = hcd_send_batch_sync(hcd, target, USB_DIRECTION_IN,
             &desc, sizeof(desc), *(uint64_t *)&get_device_desc,
@@ -560 +571 @@
         init_match_ids(&mids);
 
+        usb_log_debug("Device(%d): Creating match IDs\n", address);
         ret = create_match_ids(&mids, &desc);
         if (ret != EOK) {
@@ -568 +580 @@
 
         /* Register device */
+        usb_log_debug("Device(%d): Registering DDF device\n", address);
         ret = hcd_ddf_add_device(device, hub, port, address, speed, NULL, &mids);
         clean_match_ids(&mids);
@@ -848 +861 @@
         hw_res_list_parsed_clean(&hw_res);
         if (ret != EOK) {
-                usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));
+                usb_log_error("Failed to init HCD: %s.\n", str_error(ret));
                 goto irq_unregister;
         }
@@ -871 +884 @@
         ret = hcd_ddf_setup_root_hub(device);
         if (ret != EOK) {
-                usb_log_error("Failed to setup UHCI root hub: %s.\n",
+                usb_log_error("Failed to setup HC root hub: %s.\n",
                     str_error(ret));
                 driver_fini(dev_to_hcd(device));

uspace/lib/usbhost/src/usb_bus.c

@@ -34 +34 @@
 
 #include <usb/host/usb_bus.h>
+#include <usb/debug.h>
 
 #include <assert.h>
@@ -244 +245 @@
 
         instance->free_bw -= ep->bandwidth;
+        usb_log_debug("Registered EP(%d:%d:%s:%s)\n", ep->address, ep->endpoint,
+            usb_str_transfer_type_short(ep->transfer_type),
+            usb_str_direction(ep->direction));
         fibril_mutex_unlock(&instance->guard);
         return EOK;
@@ -267 +271 @@
         list_remove(&ep->link);
         instance->free_bw += ep->bandwidth;
+        usb_log_debug("Unregistered EP(%d:%d:%s:%s)\n", ep->address,
+            ep->endpoint, usb_str_transfer_type_short(ep->transfer_type),
+            usb_str_direction(ep->direction));
         fibril_mutex_unlock(&instance->guard);
         return EOK;