Changeset 96e2d01 in mainline for uspace/lib/usbhost/src/batch.c

Timestamp:

2011-08-31T15:31:42Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b991d37

Parents:

af2b806

Message:

libusbhost: make batch call interface public

add pointer checks

File:

• uspace/lib/usbhost/src/batch.c (modified) (5 diffs)

uspace/lib/usbhost/src/batch.c

@@ -40 +40 @@
 #include <usb/host/hcd.h>
 
-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_init(
     usb_transfer_batch_t *instance,
@@ -76 +73 @@
         instance->next_step = NULL;
         instance->error = EOK;
-        endpoint_use(instance->ep);
-}
-/*----------------------------------------------------------------------------*/
-/** Helper function, calls callback and correctly destroys batch structure.
- *
- * @param[in] instance Batch structure to use.
- */
-void usb_transfer_batch_call_in_and_dispose(usb_transfer_batch_t *instance)
-{
-        assert(instance);
-        usb_transfer_batch_call_in(instance);
-        usb_transfer_batch_dispose(instance);
-}
-/*----------------------------------------------------------------------------*/
-/** Helper function calls callback and correctly destroys batch structure.
- *
- * @param[in] instance Batch structure to use.
- */
-void usb_transfer_batch_call_out_and_dispose(usb_transfer_batch_t *instance)
-{
-        assert(instance);
-        usb_transfer_batch_call_out(instance);
-        usb_transfer_batch_dispose(instance);
+        if (instance->ep)
+                endpoint_use(instance->ep);
 }
 /*----------------------------------------------------------------------------*/
@@ -109 +85 @@
 {
         assert(instance);
-        assert(instance->ep);
-        assert(instance->next_step);
-        endpoint_release(instance->ep);
-        instance->next_step(instance);
+        if (instance->ep)
+                endpoint_release(instance->ep);
+        if (instance->next_step)
+                instance->next_step(instance);
 }
 /*----------------------------------------------------------------------------*/
@@ -125 +101 @@
         assert(instance);
         assert(instance->callback_in);
-        assert(instance->ep);
 
         /* We are data in, we need data */
@@ -171 +146 @@
 void usb_transfer_batch_dispose(usb_transfer_batch_t *instance)
 {
-        assert(instance);
+        if (!instance)
+                return;
         usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " disposing.\n",
             instance, USB_TRANSFER_BATCH_ARGS(*instance));