Changeset 4069f5c in mainline for uspace/drv/bus/usb/vhc/connhost.c

Timestamp:

2011-07-17T09:52:42Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

64639256, ca1f1ec

Parents:

27eddb52 (diff), 4118f5f (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/vhc/connhost.c (modified) (1 diff)

uspace/drv/bus/usb/vhc/connhost.c

@@ -141 +141 @@
     size_t max_packet_size, unsigned int interval)
 {
-        VHC_DATA(vhc, fun);
-
-        endpoint_t *ep = malloc(sizeof(endpoint_t));
+        /* TODO: Use usb_endpoint_manager_add_ep */
+        VHC_DATA(vhc, fun);
+
+        endpoint_t *ep = endpoint_get(
+            address, endpoint, direction, transfer_type, USB_SPEED_FULL, 1);
         if (ep == NULL) {
                 return ENOMEM;
         }
 
-        int rc = endpoint_init(ep, address, endpoint, direction, transfer_type,
-            USB_SPEED_FULL, 1);
-        if (rc != EOK) {
-                free(ep);
-                return rc;
-        }
-
-        rc = usb_endpoint_manager_register_ep(&vhc->ep_manager, ep, 1);
+        int rc = usb_endpoint_manager_register_ep(&vhc->ep_manager, ep, 1);
         if (rc != EOK) {
                 endpoint_destroy(ep);