Changeset 2759c52 in mainline

Timestamp:

2011-04-13T11:14:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5a2c42b

Parents:

6bb0f43

Message:

Add OHCI endpoint structure to endpoint manager.

Location:

uspace/drv/ohci

Files:

• Makefile (modified) (1 diff)
• hc.c (modified) (3 diffs)
• hcd_endpoint.c (added)
• hcd_endpoint.h (added)

uspace/drv/ohci/Makefile

@@ -35 +35 @@
         batch.c \
         hc.c \
+        hcd_endpoint.c \
         iface.c \
         main.c \

uspace/drv/ohci/hc.c

@@ -43 +43 @@
 
 #include "hc.h"
+#include "hcd_endpoint.h"
 
 static int interrupt_emulator(hc_t *instance);
@@ -149 +150 @@
         }
 
+        hcd_endpoint_t *hcd_ep = hcd_endpoint_assign(ep);
+        if (hcd_ep == NULL) {
+                free(ep);
+                return ENOMEM;
+        }
+        // TODO: enqueue hcd_ep here!
+
         ret = usb_endpoint_manager_register_ep(&instance->ep_manager, ep, size);
         if (ret != EOK) {
@@ -159 +167 @@
     usb_endpoint_t endpoint, usb_direction_t direction)
 {
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&instance->ep_manager,
+            address, endpoint, direction, NULL);
+        if (ep == NULL) {
+                usb_log_error("Endpoint unregister failed.\n");
+                return ENOENT;
+        }
+
+        hcd_endpoint_t *hcd_ep = hcd_endpoint_get(ep);
+        if (hcd_ep) {
+                // TODO: dequeue hcd_ep here!
+                hcd_endpoint_clear(ep);
+        } else {
+                usb_log_warning("Endpoint without hcd equivalent structure.\n");
+        }
         return usb_endpoint_manager_unregister_ep(&instance->ep_manager,
             address, endpoint, direction);