Changeset 4deca9b in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-04-12T11:43:35Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

651b352

Parents:

1324ff3 (diff), 910ca3f (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:

Extensive cleanup, preparation for OHCI rework

File:

• uspace/drv/uhci-hcd/iface.c (modified) (2 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -148 +148 @@
         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) {
@@ -157 +156 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-
-        endpoint_t *ep = malloc(sizeof(endpoint_t));
-        if (ep == NULL)
-                return ENOMEM;
-        ret = endpoint_init(ep, address, endpoint, direction,
-            transfer_type, speed, max_packet_size);
-        if (ret != EOK) {
-                free(ep);
-                return ret;
-        }
-
-        ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
-        if (ret != EOK) {
-                endpoint_destroy(ep);
-        }
-        return ret;
+        return usb_endpoint_manager_add_ep(&hc->ep_manager, address, endpoint,
+            direction, transfer_type, speed, max_packet_size, size);
 }
 /*----------------------------------------------------------------------------*/