Changeset 7786cea in mainline

Timestamp:

2011-04-08T21:54:12Z (14 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

Location:

uspace/drv/ohci

Files:

• Makefile (modified) (1 diff)
• batch.c (modified) (7 diffs)
• hw_struct/endpoint_descriptor.c (added)
• hw_struct/endpoint_descriptor.h (modified) (3 diffs)
• transfer_list.c (modified) (1 diff)
• utils/malloc32.h (modified) (1 diff)

uspace/drv/ohci/Makefile

@@ -40 +40 @@
         pci.c \
         root_hub.c \
-        transfer_list.c
+        transfer_list.c \
+        hw_struct/endpoint_descriptor.c
 
 

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);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -38 +38 @@
 #include <stdint.h>
 
+#include <usb/host/endpoint.h>
+
 #include "utils/malloc32.h"
 
@@ -52 +54 @@
 #define ED_STATUS_D_IN (0x1)
 #define ED_STATUS_D_OUT (0x2)
+#define ED_STATUS_D_TRANSFER (0x3)
 
-#define ED_STATUS_S_FLAG (1 << 13) /* speed flag */
+#define ED_STATUS_S_FLAG (1 << 13) /* speed flag: 1 = low */
 #define ED_STATUS_K_FLAG (1 << 14) /* skip flag (no not execute this ED) */
 #define ED_STATUS_F_FLAG (1 << 15) /* format: 1 = isochronous*/
@@ -75 +78 @@
 } __attribute__((packed)) ed_t;
 
-static inline void ed_init_dummy(ed_t *instance)
+void ed_init(ed_t *instance, endpoint_t *ep);
+
+static inline void ed_add_tds(ed_t *instance, uint32_t head, uint32_t tail)
 {
         assert(instance);
-        bzero(instance, sizeof(ed_t));
-        instance->status |= ED_STATUS_K_FLAG;
+        instance->td_head = head & ED_TDHEAD_PTR_MASK;
+        instance->td_tail = tail & ED_TDTAIL_PTR_MASK;
 }
 

uspace/drv/ohci/transfer_list.c

@@ -61 +61 @@
             name, instance->list_head, instance->list_head_pa);
 
-        ed_init_dummy(instance->list_head);
+        ed_init(instance->list_head, NULL);
         list_initialize(&instance->batch_list);
         fibril_mutex_initialize(&instance->guard);

uspace/drv/ohci/utils/malloc32.h

@@ -37 +37 @@
 #include <assert.h>
 #include <malloc.h>
+#include <errno.h>
 #include <mem.h>
 #include <as.h>