Changeset 82e8861 in mainline

Timestamp:

2011-04-10T09:29:41Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4776ba9, dc4c19e

Parents:

d824daf (diff), 0ede0c3 (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:

Minor fixes (parameter order, endpoint registration for OHCI rh)

Location:

uspace/drv

Files:

• ohci/iface.c (modified) (4 diffs)
• uhci-hcd/iface.c (modified) (4 diffs)

uspace/drv/ohci/iface.c

@@ -63 +63 @@
         }
 
+        usb_log_debug("%s %d:%d %zu(%zu).\n",
+            name, target.address, target.endpoint, size, ep->max_packet_size);
+
         const size_t bw = bandwidth_count_usb11(
             ep->speed, ep->transfer_type, size, ep->max_packet_size);
@@ -68 +71 @@
                 usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
                     "but only %zu is reserved.\n",
-                    name, target.address, target.endpoint, bw, res_bw);
+                    target.address, target.endpoint, name, bw, res_bw);
                 return ENOSPC;
         }
-        usb_log_debug("%s %d:%d %zu(%zu).\n",
-            name, target.address, target.endpoint, size, ep->max_packet_size);
 
         *batch = batch_get(
@@ -157 +158 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-        if (address == hc->rh.address)
-                return EOK;
+
         usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
         if (speed >= USB_SPEED_MAX) {
                 speed = ep_speed;
         }
-        const size_t size =
-            (transfer_type == USB_TRANSFER_INTERRUPT
-            || transfer_type == USB_TRANSFER_ISOCHRONOUS) ?
-            max_packet_size : 0;
+        const size_t size = max_packet_size;
         int ret;
+
+        usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
+            address, endpoint, usb_str_transfer_type(transfer_type),
+            usb_str_speed(speed), direction, size, max_packet_size, interval);
 
         endpoint_t *ep = malloc(sizeof(endpoint_t));
@@ -178 +179 @@
                 return ret;
         }
-
-        usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
-            address, endpoint, usb_str_transfer_type(transfer_type),
-            usb_str_speed(speed), direction, size, max_packet_size, interval);
 
         ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);

uspace/drv/uhci-hcd/iface.c

@@ -63 +63 @@
         }
 
+        usb_log_debug("%s %d:%d %zu(%zu).\n",
+            name, target.address, target.endpoint, size, ep->max_packet_size);
+
         const size_t bw = bandwidth_count_usb11(
             ep->speed, ep->transfer_type, size, ep->max_packet_size);
@@ -68 +71 @@
                 usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
                     "but only %zu is reserved.\n",
-                    name, target.address, target.endpoint, bw, res_bw);
+                    target.address, target.endpoint, name, bw, res_bw);
                 return ENOSPC;
         }
-        usb_log_debug("%s %d:%d %zu(%zu).\n",
-            name, target.address, target.endpoint, size, ep->max_packet_size);
 
         *batch = batch_get(
@@ -146 +147 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
+        const size_t size = max_packet_size;
+        int ret;
         usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
         if (speed >= USB_SPEED_MAX) {
                 speed = ep_speed;
         }
-        const size_t size =
-            (transfer_type == USB_TRANSFER_INTERRUPT
-            || transfer_type == USB_TRANSFER_ISOCHRONOUS) ?
-            max_packet_size : 0;
-        int ret;
+        usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
+            address, endpoint, usb_str_transfer_type(transfer_type),
+            usb_str_speed(speed), direction, size, max_packet_size, interval);
+
 
         endpoint_t *ep = malloc(sizeof(endpoint_t));
@@ -166 +168 @@
         }
 
-        usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
-            address, endpoint, usb_str_transfer_type(transfer_type),
-            usb_str_speed(speed), direction, size, max_packet_size, interval);
-
         ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
         if (ret != EOK) {