Changeset a39cfb8 in mainline for uspace/drv/ohci/hcd_endpoint.c

Timestamp:

2011-04-14T07:54:33Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (diff), 34e8bab (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 from development

File:

• uspace/drv/ohci/hcd_endpoint.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (2 diffs)

uspace/drv/ohci/hcd_endpoint.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jan Hudecek
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -27 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup genericproc
+/** @addtogroup drvusbohci
  * @{
  */
-/** @file tasklet.c
- *  @brief Tasklet implementation
+/** @file
+ * @brief OHCI driver
  */
+#include "utils/malloc32.h"
+#include "hcd_endpoint.h"
 
-#include <proc/tasklet.h>
-#include <synch/spinlock.h>
-#include <mm/slab.h>
-#include <config.h>
+hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep)
+{
+        assert(ep);
+        hcd_endpoint_t *hcd_ep = malloc(sizeof(hcd_endpoint_t));
+        if (hcd_ep == NULL)
+                return NULL;
 
-/** Spinlock protecting list of tasklets */
-SPINLOCK_INITIALIZE(tasklet_lock);
+        hcd_ep->ed = malloc32(sizeof(ed_t));
+        if (hcd_ep->ed == NULL) {
+                free(hcd_ep);
+                return NULL;
+        }
 
-/** Array of tasklet lists for every CPU */
-tasklet_descriptor_t **tasklet_list;
+        hcd_ep->td = malloc32(sizeof(td_t));
+        if (hcd_ep->td == NULL) {
+                free32(hcd_ep->ed);
+                free(hcd_ep);
+                return NULL;
+        }
 
-void tasklet_init(void)
+        ed_init(hcd_ep->ed, ep);
+        ed_set_td(hcd_ep->ed, hcd_ep->td);
+        endpoint_set_hc_data(ep, hcd_ep, NULL, NULL);
+
+        return hcd_ep;
+}
+/*----------------------------------------------------------------------------*/
+hcd_endpoint_t * hcd_endpoint_get(endpoint_t *ep)
 {
-        unsigned int i;
-        
-        tasklet_list = malloc(sizeof(tasklet_descriptor_t *) * config.cpu_count, 0);
-        if (!tasklet_list)
-                panic("Error initializing tasklets.");
-        
-        for (i = 0; i < config.cpu_count; i++)
-                tasklet_list[i] = NULL;
-        
-        spinlock_initialize(&tasklet_lock, "tasklet_lock");
+        assert(ep);
+        return ep->hc_data.data;
 }
-
-
-/** @}
+/*----------------------------------------------------------------------------*/
+void hcd_endpoint_clear(endpoint_t *ep)
+{
+        assert(ep);
+        hcd_endpoint_t *hcd_ep = ep->hc_data.data;
+        assert(hcd_ep);
+        free32(hcd_ep->ed);
+        free32(hcd_ep->td);
+        free(hcd_ep);
+}
+/**
+ * @}
  */