Changeset f97717d9 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-03-25T16:22:14Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

da3dafc, e6223239

Parents:

d8421c4 (diff), f08c560 (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 from development

File:

• uspace/drv/usbhub/usbhub.c (modified) (9 diffs)

uspace/drv/usbhub/usbhub.c

@@ -132 +132 @@
                 return opResult;
         }
-        usb_log_info("setting port count to %d\n",descriptor->ports_count);
+        usb_log_debug("setting port count to %d\n",descriptor->ports_count);
         hub_info->port_count = descriptor->ports_count;
         hub_info->attached_devs = (usb_hc_attached_device_t*)
@@ -159 +159 @@
         usb_standard_device_descriptor_t *std_descriptor
             = &hub_info->usb_device->descriptors.device;
-        usb_log_info("hub has %d configurations\n",
+        usb_log_debug("hub has %d configurations\n",
             std_descriptor->configuration_count);
         if(std_descriptor->configuration_count<1){
@@ -288 +288 @@
         //if this hub already uses default address, it cannot request it once more
         if(hub->is_default_address_used) return;
-        usb_log_info("some connection changed\n");
+        usb_log_debug("some connection changed\n");
         assert(hub->control_pipe->hc_phone);
         int opResult = usb_hub_clear_port_feature(hub->control_pipe,
@@ -331 +331 @@
 
         int opResult;
-        usb_log_info("finalizing add device\n");
+        usb_log_debug("finalizing add device\n");
         opResult = usb_hub_clear_port_feature(hub->control_pipe,
             port, USB_HUB_FEATURE_C_PORT_RESET);
@@ -363 +363 @@
                 return;
         }
-        usb_log_info("setting new address %d\n",new_device_address);
+        usb_log_debug("setting new address %d\n",new_device_address);
         //opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
         //    new_device_address);
@@ -403 +403 @@
                 return;
         }
-        usb_log_info("new device address %d, handle %zu\n",
+        usb_log_info("Detected new device on `%s' (port %d), " \
+            "address %d (handle %llu).\n",
+            hub->usb_device->ddf_dev->name, (int) port,
             new_device_address, child_handle);
-
 }
 
@@ -502 +503 @@
         if (usb_port_connect_change(&status)) {
                 if (usb_port_dev_connected(&status)) {
-                        usb_log_info("some connection changed\n");
+                        usb_log_debug("some connection changed\n");
                         usb_hub_init_add_device(hub, port, usb_port_speed(&status));
                 } else {
@@ -514 +515 @@
                         usb_hub_over_current(hub,port);
                 }else{
-                        usb_log_info("over current condition was auto-resolved on port %d\n",
+                        usb_log_debug("over current condition was auto-resolved on port %d\n",
                                         port);
                 }
@@ -520 +521 @@
         //port reset
         if (usb_port_reset_completed(&status)) {
-                usb_log_info("port reset complete\n");
+                usb_log_debug("port reset complete\n");
                 if (usb_port_enabled(&status)) {
                         usb_hub_finalize_add_device(hub, port, usb_port_speed(&status));