Changeset b591cab in mainline

Timestamp:

2012-12-22T20:47:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f8d43aa

Parents:

56a07e0

Message:

libusbhost: usb_transfer_batch: Remove private data member.

Nothing used it.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/usb_transfer_batch.h (modified) (2 diffs)
• src/hcd.c (modified) (1 diff)
• src/usb_transfer_batch.c (modified) (3 diffs)

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

@@ -80 +80 @@
          */
         int error;
-
-        /** Driver specific data */
-        void *private_data;
-        /** Callback to properly remove driver data during destruction */
-        void (*private_data_dtor)(void *p_data);
 } usb_transfer_batch_t;
 
@@ -109 +104 @@
     usbhc_iface_transfer_out_callback_t func_out,
     void *arg,
-    ddf_fun_t *fun,
-    void *private_data,
-    void (*private_data_dtor)(void *p_data)
+    ddf_fun_t *fun
 );
 void usb_transfer_batch_destroy(const usb_transfer_batch_t *instance);

uspace/lib/usbhost/src/hcd.c

@@ -109 +109 @@
         usb_transfer_batch_t *batch =
             usb_transfer_batch_create(ep, data, size, setup_data,
-            in, out, arg, fun, NULL, NULL);
+            in, out, arg, fun);
         if (!batch) {
                 return ENOMEM;

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -62 +62 @@
     usbhc_iface_transfer_out_callback_t func_out,
     void *arg,
-    ddf_fun_t *fun,
-    void *private_data,
-    void (*private_data_dtor)(void *)
+    ddf_fun_t *fun
     )
 {
@@ -82 +80 @@
                 instance->setup_size = 0;
                 instance->fun = fun;
-                instance->private_data = private_data;
-                instance->private_data_dtor = private_data_dtor;
                 instance->transfered_size = 0;
                 instance->error = EOK;
@@ -109 +105 @@
         if (instance->ep) {
                 endpoint_release(instance->ep);
-        }
-        if (instance->private_data) {
-                assert(instance->private_data_dtor);
-                instance->private_data_dtor(instance->private_data);
         }
         free(instance);