Changeset 90dd59d in mainline

Timestamp:

2011-08-25T13:04:59Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

23b0fe8

Parents:

4f0e510

Message:

ohci: implement schedule function, finish batch initialization

Location:

uspace/drv/bus/usb/ohci

Files:

• batch.c (modified) (2 diffs)
• hc.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/batch.c

@@ -43 +43 @@
 #include "hw_struct/endpoint_descriptor.h"
 #include "hw_struct/transfer_descriptor.h"
+/*
+static void batch_control_write(usb_transfer_batch_t *instance);
+static void batch_control_read(usb_transfer_batch_t *instance);
+
+static void batch_interrupt_in(usb_transfer_batch_t *instance);
+static void batch_interrupt_out(usb_transfer_batch_t *instance);
+
+static void batch_bulk_in(usb_transfer_batch_t *instance);
+static void batch_bulk_out(usb_transfer_batch_t *instance);
+*/
+static void batch_setup_control(usb_transfer_batch_t *batch)
+{
+        // TODO Find a better way to do this
+        if (batch->setup_buffer[0] & (1 << 7))
+                batch_control_read(batch);
+        else
+                batch_control_write(batch);
+}
+
+void (*batch_setup[4][3])(usb_transfer_batch_t*) =
+{
+        { NULL, NULL, batch_setup_control },
+        { NULL, NULL, NULL },
+        { batch_bulk_in, batch_bulk_out, NULL },
+        { batch_interrupt_in, batch_interrupt_out, NULL },
+};
+
 
 /** OHCI specific data required for USB transfer */
@@ -140 +167 @@
                 batch->data_buffer = data->device_buffer + batch->setup_size;
         }
+
+        assert(batch_setup[batch->ep->transfer_type][batch->ep->direction]);
+        batch_setup[batch->ep->transfer_type][batch->ep->direction](batch);
 
         return EOK;

uspace/drv/bus/usb/ohci/hc.c

@@ -163 +163 @@
 }
 /*----------------------------------------------------------------------------*/
+static int schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+{
+        assert(hcd);
+        return hc_schedule(hcd->private_data, batch);
+}
+/*----------------------------------------------------------------------------*/
 /** Initialize OHCI hc driver structure
  *
@@ -195 +201 @@
 
         ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11);
-        instance->generic.schedule = NULL;
+        instance->generic.private_data = instance;
+        instance->generic.schedule = schedule;
         instance->generic.batch_init_hook = batch_init_ohci;
         instance->generic.ep_add_hook = NULL;