Changes in uspace/lib/usbhost/src/endpoint.c [17873ac7:f527f58] in mainline

File:

• uspace/lib/usbhost/src/endpoint.c (modified) (2 diffs)

uspace/lib/usbhost/src/endpoint.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
- * Copyright (c) 2017 Ondrej Hlavaty <aearsis@eideo.cz>
  * All rights reserved.
  *
@@ -36 +35 @@
 
 #include <usb/host/endpoint.h>
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/host/bus.h>
 
 #include <assert.h>
+#include <stdlib.h>
 #include <atomic.h>
-#include <mem.h>
-#include <stdlib.h>
 
-/** Initialize provided endpoint structure.
+/** Allocate ad initialize endpoint_t structure.
+ * @param address USB address.
+ * @param endpoint USB endpoint number.
+ * @param direction Communication direction.
+ * @param type USB transfer type.
+ * @param speed Communication speed.
+ * @param max_packet_size Maximum size of data packets.
+ * @param bw Required bandwidth.
+ * @return Pointer to initialized endpoint_t structure, NULL on failure.
  */
-void endpoint_init(endpoint_t *ep, bus_t *bus)
+endpoint_t * endpoint_create(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, unsigned packets, size_t bw,
+    usb_address_t tt_address, unsigned tt_p)
 {
-        memset(ep, 0, sizeof(endpoint_t));
-
-        ep->bus = bus;
-        atomic_set(&ep->refcnt, 0);
-        link_initialize(&ep->link);
-        fibril_mutex_initialize(&ep->guard);
-        fibril_condvar_initialize(&ep->avail);
+        endpoint_t *instance = malloc(sizeof(endpoint_t));
+        if (instance) {
+                atomic_set(&instance->refcnt, 0);
+                instance->address = address;
+                instance->endpoint = endpoint;
+                instance->direction = direction;
+                instance->transfer_type = type;
+                instance->speed = speed;
+                instance->max_packet_size = max_packet_size;
+                instance->packets = packets;
+                instance->bandwidth = bw;
+                instance->toggle = 0;
+                instance->active = false;
+                instance->tt.address = tt_address;
+                instance->tt.port = tt_p;
+                instance->hc_data.data = NULL;
+                instance->hc_data.toggle_get = NULL;
+                instance->hc_data.toggle_set = NULL;
+                link_initialize(&instance->link);
+                fibril_mutex_initialize(&instance->guard);
+                fibril_condvar_initialize(&instance->avail);
+        }
+        return instance;
 }
 
-void endpoint_add_ref(endpoint_t *ep)
+/** Properly dispose of endpoint_t structure.
+ * @param instance endpoint_t structure.
+ */
+void endpoint_destroy(endpoint_t *instance)
 {
-        atomic_inc(&ep->refcnt);
+        assert(instance);
+        assert(!instance->active);
+        assert(instance->hc_data.data == NULL);
+        free(instance);
 }
 
-void endpoint_del_ref(endpoint_t *ep)
+void endpoint_add_ref(endpoint_t *instance)
 {
-        if (atomic_predec(&ep->refcnt) == 0) {
-                if (ep->bus->ops.destroy_endpoint) {
-                        ep->bus->ops.destroy_endpoint(ep);
-                }
-                else {
-                        assert(ep->active_batch == NULL);
+        atomic_inc(&instance->refcnt);
+}
 
-                        /* Assume mostly the eps will be allocated by malloc. */
-                        free(ep);
-                }
-        }
+void endpoint_del_ref(endpoint_t *instance)
+{
+        if (atomic_predec(&instance->refcnt) == 0)
+                endpoint_destroy(instance);
+}
+
+/** Set device specific data and hooks.
+ * @param instance endpoint_t structure.
+ * @param data device specific data.
+ * @param toggle_get Hook to call when retrieving value of toggle bit.
+ * @param toggle_set Hook to call when setting the value of toggle bit.
+ */
+void endpoint_set_hc_data(endpoint_t *instance,
+    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int))
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        instance->hc_data.data = data;
+        instance->hc_data.toggle_get = toggle_get;
+        instance->hc_data.toggle_set = toggle_set;
+        fibril_mutex_unlock(&instance->guard);
+}
+
+/** Clear device specific data and hooks.
+ * @param instance endpoint_t structure.
+ * @note This function does not free memory pointed to by data pointer.
+ */
+void endpoint_clear_hc_data(endpoint_t *instance)
+{
+        assert(instance);
+        endpoint_set_hc_data(instance, NULL, NULL, NULL);
 }
 
 /** Mark the endpoint as active and block access for further fibrils.
- * @param ep endpoint_t structure.
+ * @param instance endpoint_t structure.
  */
-void endpoint_activate_locked(endpoint_t *ep, usb_transfer_batch_t *batch)
+void endpoint_use(endpoint_t *instance)
 {
-        assert(ep);
-        assert(batch);
-        assert(batch->ep == ep);
-        assert(fibril_mutex_is_locked(&ep->guard));
-
-        while (ep->active_batch != NULL)
-                fibril_condvar_wait(&ep->avail, &ep->guard);
-        ep->active_batch = batch;
+        assert(instance);
+        /* Add reference for active endpoint. */
+        endpoint_add_ref(instance);
+        fibril_mutex_lock(&instance->guard);
+        while (instance->active)
+                fibril_condvar_wait(&instance->avail, &instance->guard);
+        instance->active = true;
+        fibril_mutex_unlock(&instance->guard);
 }
 
 /** Mark the endpoint as inactive and allow access for further fibrils.
- * @param ep endpoint_t structure.
+ * @param instance endpoint_t structure.
  */
-void endpoint_deactivate_locked(endpoint_t *ep)
+void endpoint_release(endpoint_t *instance)
 {
-        assert(ep);
-        assert(fibril_mutex_is_locked(&ep->guard));
-
-        if (ep->active_batch && ep->active_batch->error == EOK)
-                usb_transfer_batch_reset_toggle(ep->active_batch);
-
-        ep->active_batch = NULL;
-        fibril_condvar_signal(&ep->avail);
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        instance->active = false;
+        fibril_mutex_unlock(&instance->guard);
+        fibril_condvar_signal(&instance->avail);
+        /* Drop reference for active endpoint. */
+        endpoint_del_ref(instance);
 }
 
-/** Abort an active batch on endpoint, if any.
- *
- * @param[in] ep endpoint_t structure.
+/** Get the value of toggle bit.
+ * @param instance endpoint_t structure.
+ * @note Will use provided hook.
  */
-void endpoint_abort(endpoint_t *ep)
+int endpoint_toggle_get(endpoint_t *instance)
 {
-        assert(ep);
-
-        fibril_mutex_lock(&ep->guard);
-        usb_transfer_batch_t *batch = ep->active_batch;
-        endpoint_deactivate_locked(ep);
-        fibril_mutex_unlock(&ep->guard);
-
-        if (batch)
-                usb_transfer_batch_abort(batch);
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        if (instance->hc_data.toggle_get)
+                instance->toggle =
+                    instance->hc_data.toggle_get(instance->hc_data.data);
+        const int ret = instance->toggle;
+        fibril_mutex_unlock(&instance->guard);
+        return ret;
 }
 
-/** Get the value of toggle bit. Either uses the toggle_get op, or just returns
- * the value of the toggle.
- * @param ep endpoint_t structure.
+/** Set the value of toggle bit.
+ * @param instance endpoint_t structure.
+ * @note Will use provided hook.
  */
-int endpoint_toggle_get(endpoint_t *ep)
+void endpoint_toggle_set(endpoint_t *instance, int toggle)
 {
-        assert(ep);
-
-        return ep->bus->ops.endpoint_get_toggle
-            ? ep->bus->ops.endpoint_get_toggle(ep)
-            : ep->toggle;
+        assert(instance);
+        assert(toggle == 0 || toggle == 1);
+        fibril_mutex_lock(&instance->guard);
+        instance->toggle = toggle;
+        if (instance->hc_data.toggle_set)
+                instance->hc_data.toggle_set(instance->hc_data.data, toggle);
+        fibril_mutex_unlock(&instance->guard);
 }
-
-/** Set the value of toggle bit. Either uses the toggle_set op, or just sets
- * the toggle inside.
- * @param ep endpoint_t structure.
- */
-void endpoint_toggle_set(endpoint_t *ep, bool toggle)
-{
-        assert(ep);
-
-        if (ep->bus->ops.endpoint_set_toggle) {
-                ep->bus->ops.endpoint_set_toggle(ep, toggle);
-        }
-        else {
-                ep->toggle = toggle;
-        }
-}
-
 
 /**