Changeset f98b8269 in mainline

Timestamp:

2011-04-08T15:15:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6b6e3ed3

Parents:

6bec59b

Message:

Port transfer_list from UHCI

Location:

uspace/drv/ohci

Files:

• Makefile (modified) (1 diff)
• batch.c (modified) (2 diffs)
• batch.h (modified) (2 diffs)
• hw_struct/endpoint_descriptor.h (modified) (2 diffs)
• transfer_list.c (added)
• transfer_list.h (added)

uspace/drv/ohci/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        batch.c \
+        hc.c \
         iface.c \
-        batch.c \
         main.c \
-        hc.c \
         ohci.c \
+        pci.c \
         root_hub.c \
-        pci.c
+        transfer_list.c
+
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/ohci/batch.c

@@ -93 +93 @@
 }
 /*----------------------------------------------------------------------------*/
+bool batch_is_complete(usb_transfer_batch_t *instance)
+{
+        // TODO: implement
+        return false;
+}
+/*----------------------------------------------------------------------------*/
 void batch_control_write(usb_transfer_batch_t *instance)
 {
@@ -151 +157 @@
 }
 /*----------------------------------------------------------------------------*/
+ed_t * batch_ed(usb_transfer_batch_t *instance)
+{
+        return NULL;
+}
+/*----------------------------------------------------------------------------*/
 /** Helper function calls callback and correctly disposes of batch structure.
  *

uspace/drv/ohci/batch.h

@@ -41 +41 @@
 #include <usb/host/batch.h>
 
+#include "hw_struct/endpoint_descriptor.h"
 
 usb_transfer_batch_t * batch_get(
@@ -65 +66 @@
 void batch_bulk_out(usb_transfer_batch_t *instance);
 
+ed_t * batch_ed(usb_transfer_batch_t *instance);
 #endif
 /**

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -35 +35 @@
 #define DRV_OHCI_HW_STRUCT_ENDPOINT_DESCRIPTOR_H
 
+#include <assert.h>
 #include <stdint.h>
+
+#include "utils/malloc32.h"
 
 #include "completion_codes.h"
@@ -71 +74 @@
 #define ED_NEXT_PTR_SHIFT (0)
 } __attribute__((packed)) ed_t;
+
+static inline void ed_init_dummy(ed_t *instance)
+{
+        assert(instance);
+        bzero(instance, sizeof(ed_t));
+        instance->status |= ED_STATUS_K_FLAG;
+}
+
+static inline void ed_append_ed(ed_t *instance, ed_t *next)
+{
+        assert(instance);
+        assert(next);
+        uint32_t pa = addr_to_phys(next);
+        assert((pa & ED_NEXT_PTR_MASK) << ED_NEXT_PTR_SHIFT == pa);
+        instance->next = pa;
+}
+
 #endif
 /**