Changeset 4e9ecf4 in mainline

Timestamp:

2011-08-31T22:58:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9a790ad1

Parents:

9c10e51

Message:

libusbhost: remove unused elements

Location:

uspace/lib/usbhost

Files:

• include/usb/host/batch.h (modified) (3 diffs)
• src/batch.c (modified) (5 diffs)
• src/iface.c (modified) (1 diff)

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

@@ -44 +44 @@
 struct usb_transfer_batch {
         endpoint_t *ep;
-        link_t link;
         usbhc_iface_transfer_in_callback_t callback_in;
         usbhc_iface_transfer_out_callback_t callback_out;
         void *arg;
         char *buffer;
-        char *data_buffer;
         size_t buffer_size;
         char *setup_buffer;
         size_t setup_size;
         size_t transfered_size;
-        void (*next_step)(usb_transfer_batch_t *);
         int error;
         ddf_fun_t *fun;
@@ -78 +75 @@
     endpoint_t *ep,
     char *buffer,
-    char *data_buffer,
     size_t buffer_size,
     char *setup_buffer,
@@ -127 +123 @@
         usb_transfer_batch_finish(instance, data, size);
 }
-/*----------------------------------------------------------------------------*/
-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/usbhost/src/batch.c

@@ -43 +43 @@
     endpoint_t *ep,
     char *buffer,
-    char *data_buffer,
     size_t buffer_size,
     char *setup_buffer,
@@ -57 +56 @@
         usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
         if (instance) {
-                link_initialize(&instance->link);
                 instance->ep = ep;
                 instance->callback_in = func_in;
@@ -63 +61 @@
                 instance->arg = arg;
                 instance->buffer = buffer;
-                instance->data_buffer = data_buffer;
                 instance->buffer_size = buffer_size;
                 instance->setup_buffer = setup_buffer;
@@ -71 +68 @@
                 instance->private_data_dtor = private_data_dtor;
                 instance->transfered_size = 0;
-                instance->next_step = NULL;
                 instance->error = EOK;
                 if (instance->ep)
@@ -113 +109 @@
         assert(instance);
         assert(instance->callback_in);
-
-        /* We are data in, we need data */
-        if (instance->data_buffer && (instance->buffer != instance->data_buffer))
-                memcpy(instance->buffer,
-                    instance->data_buffer, instance->buffer_size);
 
         usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " completed (%zuB): %s.\n",

uspace/lib/usbhost/src/iface.c

@@ -78 +78 @@
         /* No private data and no private data dtor */
         usb_transfer_batch_t *batch =
-            usb_transfer_batch_get(ep, data, NULL, size, setup_data,
-                setup_size, in, out, arg, fun, NULL, NULL);
+            usb_transfer_batch_get(ep, data, size, setup_data, setup_size,
+            in, out, arg, fun, NULL, NULL);
         if (!batch) {
                 return ENOMEM;