Changeset 7786cea in mainline for uspace/drv/ohci/batch.c

Timestamp:

2011-04-08T21:54:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b854e56

Parents:

96b8f322

Message:

Implement endpoint descriptor initialization

File:

• uspace/drv/ohci/batch.c (modified) (7 diffs)

uspace/drv/ohci/batch.c

@@ -51 +51 @@
 } ohci_batch_t;
 
+static void batch_control(usb_transfer_batch_t *instance);
 static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
 static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
@@ -83 +84 @@
         instance->private_data = data;
 
+        /* we needs + 1 transfer descriptor as the last one won't be executed */
         data->td_count =
-            (buffer_size + OHCI_MAX_TRANSFER - 1) / OHCI_MAX_TRANSFER;
+            1 + ((buffer_size + OHCI_MAX_TRANSFER - 1) / OHCI_MAX_TRANSFER);
         if (ep->transfer_type == USB_TRANSFER_CONTROL) {
                 data->td_count += 2;
@@ -135 +137 @@
             instance->buffer_size);
         instance->next_step = batch_call_out_and_dispose;
-        /* TODO: implement */
+        batch_control(instance);
         usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
 }
@@ -143 +145 @@
         assert(instance);
         instance->next_step = batch_call_in_and_dispose;
-        /* TODO: implement */
+        batch_control(instance);
         usb_log_debug("Batch(%p) CONTROL READ initialized.\n", instance);
 }
@@ -150 +152 @@
 {
         assert(instance);
-        instance->direction = USB_DIRECTION_IN;
+        assert(instance->direction == USB_DIRECTION_IN);
         instance->next_step = batch_call_in_and_dispose;
         /* TODO: implement */
@@ -159 +161 @@
 {
         assert(instance);
-        instance->direction = USB_DIRECTION_OUT;
+        assert(instance->direction == USB_DIRECTION_OUT);
         /* We are data out, we are supposed to provide data */
         memcpy(instance->transport_buffer, instance->buffer,
@@ -188 +190 @@
 ed_t * batch_ed(usb_transfer_batch_t *instance)
 {
-        return NULL;
+        assert(instance);
+        ohci_batch_t *data = instance->private_data;
+        assert(data);
+        return data->ed;
+}
+/*----------------------------------------------------------------------------*/
+static void batch_control(usb_transfer_batch_t *instance)
+{
+        assert(instance);
+        ohci_batch_t *data = instance->private_data;
+        assert(data);
+        ed_init(data->ed, instance->ep);
 }
 /*----------------------------------------------------------------------------*/