Changeset 651b352 in mainline for uspace/lib/usb/include

Timestamp:

2011-04-13T15:00:43Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8b4ce802

Parents:

4deca9b (diff), d6522dd (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:

Major rework

UHCI uses one buffer for both structures and data
OHCI uses new architecture that actually follows OHCI specification

Location:

uspace/lib/usb/include/usb/host

Files:

• batch.h (modified) (3 diffs)
• endpoint.h (modified) (2 diffs)

uspace/lib/usb/include/usb/host/batch.h

@@ -58 +58 @@
         ddf_fun_t *fun;
         void *private_data;
+        void (*private_data_dtor)(void *p_data);
 };
 
 void usb_transfer_batch_init(
     usb_transfer_batch_t *instance,
-                endpoint_t *ep,
+    endpoint_t *ep,
     char *buffer,
     char *data_buffer,
@@ -72 +73 @@
     void *arg,
     ddf_fun_t *fun,
-    void *private_data
+    void *private_data,
+    void (*private_data_dtor)(void *p_data)
 );
 
-static inline usb_transfer_batch_t *usb_transfer_batch_from_link(link_t *l)
-{
-        assert(l);
-        return list_get_instance(l, usb_transfer_batch_t, link);
-}
-
-void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
-void usb_transfer_batch_call_out(usb_transfer_batch_t *instance);
+void usb_transfer_batch_call_in_and_dispose(usb_transfer_batch_t *instance);
+void usb_transfer_batch_call_out_and_dispose(usb_transfer_batch_t *instance);
 void usb_transfer_batch_finish(usb_transfer_batch_t *instance);
+void usb_transfer_batch_dispose(usb_transfer_batch_t *instance);
 
 static inline void usb_transfer_batch_finish_error(
@@ -93 +90 @@
 }
 
+static inline usb_transfer_batch_t *usb_transfer_batch_from_link(link_t *l)
+{
+        assert(l);
+        return list_get_instance(l, usb_transfer_batch_t, link);
+}
+
 #endif
 /**

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

@@ -54 +54 @@
         fibril_condvar_t avail;
         volatile bool active;
+        struct {
+                void *data;
+                int (*toggle_get)(void *);
+                void (*toggle_set)(void *, int);
+        } hc_data;
 } endpoint_t;
 
@@ -61 +66 @@
 
 void endpoint_destroy(endpoint_t *instance);
+
+void endpoint_set_hc_data(endpoint_t *instance,
+    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int));
+
+void endpoint_clear_hc_data(endpoint_t *instance);
 
 void endpoint_use(endpoint_t *instance);