Changeset 1e70157 in mainline

Timestamp:

2011-04-06T19:52:17Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8dc762e0

Parents:

fb8927d

Message:

Header fixes, add qh to endpoint structure, add endpoint toggle reset

Location:

uspace/drv/uhci-hcd

Files:

• endpoint.c (modified) (2 diffs)
• endpoint.h (modified) (2 diffs)
• hw_struct/queue_head.h (modified) (1 diff)
• iface.c (modified) (4 diffs)
• transfer_list.h (modified) (1 diff)
• utils/malloc32.h (modified) (1 diff)

uspace/drv/uhci-hcd/endpoint.c

@@ -34 +34 @@
  */
 
+#include <errno.h>
+
 #include "endpoint.h"
+#include "utils/malloc32.h"
 
-void endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type,
+int endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type,
     usb_speed_t speed, size_t max_packet_size)
 {
@@ -45 +48 @@
         instance->max_packet_size = max_packet_size;
         instance->toggle = 0;
+        instance->qh = malloc32(sizeof(qh_t));
+        if (instance->qh == NULL)
+                return ENOMEM;
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
-void endpoint_destroy(void *instance)
+void endpoint_destroy(void *ep)
 {
+        endpoint_t *instance = ep;
         assert(instance);
+        list_remove(&instance->same_device_eps);
+        free32(instance->qh);
         free(instance);
+}
+/*----------------------------------------------------------------------------*/
+void endpoint_toggle_reset(link_t *ep)
+{
+        endpoint_t *instance =
+            list_get_instance(ep, endpoint_t, same_device_eps);
+        assert(instance);
+        instance->toggle = 0;
 }
 /**

uspace/drv/uhci-hcd/endpoint.h

@@ -41 +41 @@
 #include <usb/usb.h>
 
+#include "hw_struct/queue_head.h"
+
 typedef struct endpoint {
         link_t same_device_eps;
@@ -48 +50 @@
         bool active;
         int toggle:1;
+        qh_t *qh;
 } endpoint_t;
 
-void endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type,
+int endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type,
     usb_speed_t speed, size_t max_packet_size);
 
-void endpoint_destroy(void *instance);
+void endpoint_destroy(void *ep);
+
+void endpoint_toggle_reset(link_t *ep);
 
 #endif

uspace/drv/uhci-hcd/hw_struct/queue_head.h

@@ -39 +39 @@
 
 #include "link_pointer.h"
-#include "utils/malloc32.h"
 
 typedef struct queue_head {

uspace/drv/uhci-hcd/iface.c

@@ -160 +160 @@
             usb_device_keeper_get_speed(&hc->manager, address);
         const size_t size = max_packet_size;
+        int ret;
 
         endpoint_t *ep = malloc(sizeof(endpoint_t));
         if (ep == NULL)
                 return ENOMEM;
-        endpoint_init(ep, transfer_type, speed, max_packet_size);
+        ret = endpoint_init(ep, transfer_type, speed, max_packet_size);
+        if (ret != EOK) {
+                free(ep);
+                return ret;
+        }
 
         usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
@@ -176 +181 @@
             0;
 
-        int ret = usb_endpoint_manager_register_ep(&hc->ep_manager,
+        ret = usb_endpoint_manager_register_ep(&hc->ep_manager,
             address, endpoint, direction, ep, endpoint_destroy, bw);
         if (ret != EOK) {
                 endpoint_destroy(ep);
+        } else {
+                usb_device_keeper_add_ep(&hc->manager, address, &ep->same_device_eps);
         }
         return ret;
@@ -345 +352 @@
         assert(ep->transfer_type == USB_TRANSFER_BULK);
 
-
         usb_transfer_batch_t *batch =
             batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
@@ -394 +400 @@
 
         usb_transfer_batch_t *batch =
-            batch_get(fun, target, ep->transfer_type, ep->max_packet_size, ep->speed,
-                data, size, NULL, 0, callback, NULL, arg, &hc->manager);
+            batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
+                ep->speed, data, size, NULL, 0, callback, NULL, arg,
+                &hc->manager);
         if (!batch)
                 return ENOMEM;

uspace/drv/uhci-hcd/transfer_list.h

@@ -39 +39 @@
 #include "batch.h"
 #include "hw_struct/queue_head.h"
+#include "utils/malloc32.h"
 
 typedef struct transfer_list

uspace/drv/uhci-hcd/utils/malloc32.h

@@ -36 +36 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <malloc.h>
 #include <mem.h>