Changeset f1fae414 in mainline for uspace/drv/bus/usb/ohci/root_hub.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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 mainline changes.

File:

• uspace/drv/bus/usb/ohci/root_hub.c (moved) (moved from uspace/drv/ohci/root_hub.c ) (14 diffs)

uspace/drv/bus/usb/ohci/root_hub.c

@@ -232 +232 @@
                 return ENOMEM;
 
-        usb_log_info("OHCI root hub with %zu ports initialized.\n",
+        usb_log_info("Root hub (%zu ports) initialized.\n",
             instance->port_count);
 
@@ -251 +251 @@
         int opResult;
         if (request->ep->transfer_type == USB_TRANSFER_CONTROL) {
-                usb_log_info("Root hub got CONTROL packet\n");
+                usb_log_debug("Root hub got CONTROL packet\n");
                 opResult = process_ctrl_request(instance, request);
                 usb_transfer_batch_finish_error(request, opResult);
         } else if (request->ep->transfer_type == USB_TRANSFER_INTERRUPT) {
-                usb_log_info("Root hub got INTERRUPT packet\n");
+                usb_log_debug("Root hub got INTERRUPT packet\n");
                 create_interrupt_mask_in_instance(instance);
                 if (is_zeros(instance->interrupt_buffer,
@@ -521 +521 @@
                 case USB_DESCTYPE_HUB:
                 {
-                        usb_log_debug("USB_DESCTYPE_HUB\n");
+                        usb_log_debug2("USB_DESCTYPE_HUB\n");
                         result_descriptor = instance->hub_descriptor;
                         size = instance->descriptor_size;
@@ -528 +528 @@
                 case USB_DESCTYPE_DEVICE:
                 {
-                        usb_log_debug("USB_DESCTYPE_DEVICE\n");
+                        usb_log_debug2("USB_DESCTYPE_DEVICE\n");
                         result_descriptor = &ohci_rh_device_descriptor;
                         size = sizeof (ohci_rh_device_descriptor);
@@ -535 +535 @@
                 case USB_DESCTYPE_CONFIGURATION:
                 {
-                        usb_log_debug("USB_DESCTYPE_CONFIGURATION\n");
+                        usb_log_debug2("USB_DESCTYPE_CONFIGURATION\n");
                         result_descriptor = instance->descriptors.configuration;
                         size = instance->descriptors.configuration_size;
@@ -542 +542 @@
                 case USB_DESCTYPE_INTERFACE:
                 {
-                        usb_log_debug("USB_DESCTYPE_INTERFACE\n");
+                        usb_log_debug2("USB_DESCTYPE_INTERFACE\n");
                         result_descriptor = &ohci_rh_iface_descriptor;
                         size = sizeof (ohci_rh_iface_descriptor);
@@ -549 +549 @@
                 case USB_DESCTYPE_ENDPOINT:
                 {
-                        usb_log_debug("USB_DESCTYPE_ENDPOINT\n");
+                        usb_log_debug2("USB_DESCTYPE_ENDPOINT\n");
                         result_descriptor = &ohci_rh_ep_descriptor;
                         size = sizeof (ohci_rh_ep_descriptor);
@@ -556 +556 @@
                 default:
                 {
-                        usb_log_debug("USB_DESCTYPE_EINVAL %d \n",
+                        usb_log_debug2("USB_DESCTYPE_EINVAL %d \n",
                             setup_request->value);
-                        usb_log_debug("\ttype %d\n\trequest %d\n\tvalue "
+                        usb_log_debug2("\ttype %d\n\trequest %d\n\tvalue "
                             "%d\n\tindex %d\n\tlen %d\n ",
                             setup_request->request_type,
@@ -789 +789 @@
                 }
                 if (setup_request->request_type == USB_HUB_REQ_TYPE_SET_PORT_FEATURE) {
-                        usb_log_debug("USB_HUB_REQ_TYPE_SET_PORT_FEATURE\n");
+                        usb_log_debug2("USB_HUB_REQ_TYPE_SET_PORT_FEATURE\n");
                         return process_port_feature_clear_request(instance,
                             setup_request->value,
@@ -854 +854 @@
                 return EINVAL;
         }
-        usb_log_info("CTRL packet: %s.\n",
+        usb_log_debug("CTRL packet: %s.\n",
             usb_debug_str_buffer(
             (const uint8_t *) request->setup_buffer, 8, 8));
@@ -864 +864 @@
                 case USB_DEVREQ_GET_DESCRIPTOR:
                 case USB_DEVREQ_GET_CONFIGURATION:
-                        usb_log_debug("Processing request with output\n");
+                        usb_log_debug2("Processing request with output\n");
                         opResult = process_request_with_output(
                             instance, request);
@@ -871 +871 @@
                 case USB_DEVREQ_SET_FEATURE:
                 case USB_DEVREQ_SET_ADDRESS:
-                        usb_log_debug("Processing request without "
+                        usb_log_debug2("Processing request without "
                             "additional data\n");
                         opResult = process_request_without_data(
@@ -878 +878 @@
                 case USB_DEVREQ_SET_DESCRIPTOR:
                 case USB_DEVREQ_SET_CONFIGURATION:
-                        usb_log_debug("Processing request with "
-                            "input\n");
+                        usb_log_debug2("Processing request with input\n");
                         opResult = process_request_with_input(
                             instance, request);
@@ -885 +884 @@
                         break;
                 default:
-                        usb_log_warning("Received unsuported request: "
-                            "%d\n",
-                            setup_request->request
-                            );
+                        usb_log_warning("Received unsupported request: %d.\n",
+                            setup_request->request);
                         opResult = ENOTSUP;
         }