Changeset aa81adc in mainline

Timestamp:

2011-07-11T09:28:00Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ece7f78

Parents:

1cb4f05

Message:

libusbhost: endpoint_t uses get/destroy pair, instead of init/destroy.

endpoint_init always returned EOK, thus allocation could be moved in.
Also, it makes no sense to create this structures on stack.

Location:

uspace

Files:

• drv/bus/usb/ohci/hc.c (modified) (3 diffs)
• drv/bus/usb/vhc/connhost.c (modified) (1 diff)
• lib/usbhost/include/usb/host/endpoint.h (modified) (1 diff)
• lib/usbhost/include/usb/host/usb_endpoint_manager.h (modified) (1 diff)
• lib/usbhost/src/endpoint.c (modified) (1 diff)

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

@@ -235 +235 @@
     size_t mps, size_t size, unsigned interval)
 {
-        endpoint_t *ep = malloc(sizeof(endpoint_t));
+        endpoint_t *ep =
+            endpoint_get(address, endpoint, direction, type, speed, mps);
         if (ep == NULL)
                 return ENOMEM;
-        int ret =
-            endpoint_init(ep, address, endpoint, direction, type, speed, mps);
-        if (ret != EOK) {
-                free(ep);
-                return ret;
-        }
 
         hcd_endpoint_t *hcd_ep = hcd_endpoint_assign(ep);
@@ -251 +246 @@
         }
 
-        ret = usb_endpoint_manager_register_ep(&instance->ep_manager, ep, size);
+        int ret =
+            usb_endpoint_manager_register_ep(&instance->ep_manager, ep, size);
         if (ret != EOK) {
                 hcd_endpoint_clear(ep);
@@ -279 +275 @@
                     &instance->lists[ep->transfer_type], hcd_ep);
                 instance->registers->control |= C_PLE | C_IE;
-                break;
-        default:
                 break;
         }

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);

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -61 +61 @@
 } endpoint_t;
 
-int endpoint_init(endpoint_t *instance, usb_address_t address,
-    usb_endpoint_t endpoint, usb_direction_t direction,
-    usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size);
+endpoint_t * endpoint_get(usb_address_t address, usb_endpoint_t endpoint,
+    usb_direction_t direction, usb_transfer_type_t type, usb_speed_t speed,
+    size_t max_packet_size);
 
 void endpoint_destroy(endpoint_t *instance);

uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

@@ -82 +82 @@
     size_t data_size)
 {
-        endpoint_t *ep = malloc(sizeof(endpoint_t));
-        if (ep == NULL)
+        endpoint_t *ep = endpoint_get(
+            address, endpoint, direction, type, speed, max_packet_size);
+        if (!ep)
                 return ENOMEM;
 
-        int ret = endpoint_init(ep, address, endpoint, direction, type, speed,
-            max_packet_size);
-        if (ret != EOK) {
-                free(ep);
-                return ret;
-        }
-
-        ret = usb_endpoint_manager_register_ep(instance, ep, data_size);
+        const int ret =
+            usb_endpoint_manager_register_ep(instance, ep, data_size);
         if (ret != EOK) {
                 endpoint_destroy(ep);
-                return ret;
         }
-        return EOK;
+        return ret;
 }
 #endif

uspace/lib/usbhost/src/endpoint.c

@@ -39 +39 @@
 #include <usb/host/endpoint.h>
 
-int endpoint_init(endpoint_t *instance, usb_address_t address,
-    usb_endpoint_t endpoint, usb_direction_t direction,
-    usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size)
+endpoint_t * endpoint_get(usb_address_t address, usb_endpoint_t endpoint,
+    usb_direction_t direction, usb_transfer_type_t type, usb_speed_t speed,
+    size_t max_packet_size)
 {
-        assert(instance);
-        instance->address = address;
-        instance->endpoint = endpoint;
-        instance->direction = direction;
-        instance->transfer_type = type;
-        instance->speed = speed;
-        instance->max_packet_size = max_packet_size;
-        instance->toggle = 0;
-        instance->active = false;
-        fibril_mutex_initialize(&instance->guard);
-        fibril_condvar_initialize(&instance->avail);
-        endpoint_clear_hc_data(instance);
-        return EOK;
+        endpoint_t *instance = malloc(sizeof(endpoint_t));
+        if (instance) {
+                instance->address = address;
+                instance->endpoint = endpoint;
+                instance->direction = direction;
+                instance->transfer_type = type;
+                instance->speed = speed;
+                instance->max_packet_size = max_packet_size;
+                instance->toggle = 0;
+                instance->active = false;
+                fibril_mutex_initialize(&instance->guard);
+                fibril_condvar_initialize(&instance->avail);
+                endpoint_clear_hc_data(instance);
+        }
+        return instance;
 }
 /*----------------------------------------------------------------------------*/