Changeset a39cfb8 in mainline for uspace/lib/usb/include

Timestamp:

2011-04-14T07:54:33Z (15 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

Location:

uspace/lib/usb/include/usb/host

Files:

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

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

@@ -43 +43 @@
 typedef struct usb_transfer_batch usb_transfer_batch_t;
 struct usb_transfer_batch {
+        endpoint_t *ep;
         link_t link;
-        usb_target_t target;
-        usb_transfer_type_t transfer_type;
-        usb_speed_t speed;
-        usb_direction_t direction;
         usbhc_iface_transfer_in_callback_t callback_in;
         usbhc_iface_transfer_out_callback_t callback_out;
+        void *arg;
         char *buffer;
-        char *transport_buffer;
+        char *data_buffer;
         size_t buffer_size;
         char *setup_buffer;
         size_t setup_size;
-        size_t max_packet_size;
         size_t transfered_size;
         void (*next_step)(usb_transfer_batch_t *);
         int error;
         ddf_fun_t *fun;
-        void *arg;
-        endpoint_t *ep;
         void *private_data;
+        void (*private_data_dtor)(void *p_data);
 };
 
 void usb_transfer_batch_init(
     usb_transfer_batch_t *instance,
-    usb_target_t target,
-    usb_transfer_type_t transfer_type,
-    usb_speed_t speed,
-    size_t max_packet_size,
+    endpoint_t *ep,
     char *buffer,
-    char *transport_buffer,
+    char *data_buffer,
     size_t buffer_size,
     char *setup_buffer,
@@ -80 +73 @@
     void *arg,
     ddf_fun_t *fun,
-                endpoint_t *ep,
-    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(
@@ -102 +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/device_keeper.h

@@ -54 +54 @@
         usb_speed_t speed;
         bool occupied;
-        link_t endpoints;
-        uint16_t control_used;
         devman_handle_t handle;
 };
@@ -65 +63 @@
         struct usb_device_info devices[USB_ADDRESS_COUNT];
         fibril_mutex_t guard;
-        fibril_condvar_t change;
         usb_address_t last_address;
 } usb_device_keeper_t;
 
 void usb_device_keeper_init(usb_device_keeper_t *instance);
-
-void usb_device_keeper_reserve_default_address(
-    usb_device_keeper_t *instance, usb_speed_t speed);
-
-void usb_device_keeper_release_default_address(usb_device_keeper_t *instance);
-
-void usb_device_keeper_reset_if_need(usb_device_keeper_t *instance,
-    usb_target_t target, const uint8_t *setup_data);
 
 usb_address_t device_keeper_get_free_address(usb_device_keeper_t *instance,

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);

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

@@ -66 +66 @@
     endpoint_t *ep, size_t data_size);
 
-int usb_endpoint_manager_register_ep_wait(usb_endpoint_manager_t *instance,
-    usb_address_t address, usb_endpoint_t ep, usb_direction_t direction,
-    void *data, void (*data_remove_callback)(void* data, void* arg), void *arg,
-    size_t bw);
-
 int usb_endpoint_manager_unregister_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t ep, usb_direction_t direction);
@@ -80 +75 @@
 void usb_endpoint_manager_reset_if_need(
     usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data);
+
+static inline int usb_endpoint_manager_add_ep(usb_endpoint_manager_t *instance,
+    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,
+    size_t data_size)
+{
+        endpoint_t *ep = malloc(sizeof(endpoint_t));
+        if (ep == NULL)
+                return ENOMEM;
+
+        int ret = endpoint_init(ep, address, endpoint, direction, type, speed,
+            max_packet_size);
+        if (ret != EOK) {
+                free(ep);
+                return ret;
+        }
+
+        ret = usb_endpoint_manager_register_ep(instance, ep, data_size);
+        if (ret != EOK) {
+                endpoint_destroy(ep);
+                return ret;
+        }
+        return EOK;
+}
 #endif
 /**