Changeset 8a951ca in mainline for uspace/drv/ohci/batch.c

Timestamp:

2011-03-21T13:47:30Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a372663

Parents:

f8e1a2c (diff), 48fe0c9 (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 development/ changes

File:

• uspace/drv/ohci/batch.c (modified) (1 diff)

uspace/drv/ohci/batch.c

@@ -39 +39 @@
 
 #include "batch.h"
+#include "utils/malloc32.h"
+
+static void batch_call_in_and_dispose(batch_t *instance);
+static void batch_call_out_and_dispose(batch_t *instance);
 
 #define DEFAULT_ERROR_COUNT 3
+batch_t * batch_get(
+    ddf_fun_t *fun,
+                usb_target_t target,
+    usb_transfer_type_t transfer_type,
+                size_t max_packet_size,
+    usb_speed_t speed,
+                char *buffer,
+                size_t buffer_size,
+                char *setup_buffer,
+                size_t setup_size,
+    usbhc_iface_transfer_in_callback_t func_in,
+    usbhc_iface_transfer_out_callback_t func_out,
+                void *arg,
+                device_keeper_t *manager
+                )
+{
+#define CHECK_NULL_DISPOSE_RETURN(ptr, message...) \
+        if (ptr == NULL) { \
+                usb_log_error(message); \
+                if (instance) { \
+                        batch_dispose(instance); \
+                } \
+                return NULL; \
+        } else (void)0
 
+        batch_t *instance = malloc(sizeof(batch_t));
+        CHECK_NULL_DISPOSE_RETURN(instance,
+            "Failed to allocate batch instance.\n");
+        batch_init(instance, target, transfer_type, speed, max_packet_size,
+            buffer, NULL, buffer_size, NULL, setup_size, func_in,
+            func_out, arg, fun, NULL);
+
+        if (buffer_size > 0) {
+                instance->transport_buffer = malloc32(buffer_size);
+                CHECK_NULL_DISPOSE_RETURN(instance->transport_buffer,
+                    "Failed to allocate device accessible buffer.\n");
+        }
+
+        if (setup_size > 0) {
+                instance->setup_buffer = malloc32(setup_size);
+                CHECK_NULL_DISPOSE_RETURN(instance->setup_buffer,
+                    "Failed to allocate device accessible setup buffer.\n");
+                memcpy(instance->setup_buffer, setup_buffer, setup_size);
+        }
+
+
+        return instance;
+}
+/*----------------------------------------------------------------------------*/
+void batch_dispose(batch_t *instance)
+{
+        assert(instance);
+        free32(instance->transport_buffer);
+        free32(instance->setup_buffer);
+        free(instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_control_write(batch_t *instance)
+{
+        assert(instance);
+        /* We are data out, we are supposed to provide data */
+        memcpy(instance->transport_buffer, instance->buffer,
+            instance->buffer_size);
+        instance->next_step = batch_call_out_and_dispose;
+        /* TODO: implement */
+        usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_control_read(batch_t *instance)
+{
+        assert(instance);
+        instance->next_step = batch_call_in_and_dispose;
+        /* TODO: implement */
+        usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_interrupt_in(batch_t *instance)
+{
+        assert(instance);
+        instance->direction = USB_DIRECTION_IN;
+        instance->next_step = batch_call_in_and_dispose;
+        /* TODO: implement */
+        usb_log_debug("Batch(%p) INTERRUPT IN initialized.\n", instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_interrupt_out(batch_t *instance)
+{
+        assert(instance);
+        instance->direction = USB_DIRECTION_OUT;
+        /* We are data out, we are supposed to provide data */
+        memcpy(instance->transport_buffer, instance->buffer,
+            instance->buffer_size);
+        instance->next_step = batch_call_out_and_dispose;
+        /* TODO: implement */
+        usb_log_debug("Batch(%p) INTERRUPT OUT initialized.\n", instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_bulk_in(batch_t *instance)
+{
+        assert(instance);
+        instance->direction = USB_DIRECTION_IN;
+        instance->next_step = batch_call_in_and_dispose;
+        /* TODO: implement */
+        usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_bulk_out(batch_t *instance)
+{
+        assert(instance);
+        instance->direction = USB_DIRECTION_IN;
+        instance->next_step = batch_call_in_and_dispose;
+        /* TODO: implement */
+        usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
+}
+/*----------------------------------------------------------------------------*/
+/** Helper function calls callback and correctly disposes of batch structure.
+ *
+ * @param[in] instance Batch structure to use.
+ */
+void batch_call_in_and_dispose(batch_t *instance)
+{
+        assert(instance);
+        batch_call_in(instance);
+        batch_dispose(instance);
+}
+/*----------------------------------------------------------------------------*/
+/** Helper function calls callback and correctly disposes of batch structure.
+ *
+ * @param[in] instance Batch structure to use.
+ */
+void batch_call_out_and_dispose(batch_t *instance)
+{
+        assert(instance);
+        batch_call_out(instance);
+        batch_dispose(instance);
+}
 /**
  * @}