Changeset e67c50a in mainline for uspace/drv/bus/usb/ohci/hw_struct

Timestamp:

2018-02-01T21:13:23Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

64ce0c1

Parents:

3e6ff9a

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-01 21:13:22)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-01 21:13:23)

Message:

ohci: use dma memory responsibly

Instead of leaving arbitrary TD behind to be used by next transfer,
prepare two of them in endpoint and use them in a cyclic manner. This
reduces the number of pages allocated per transfer to one.

Location:

uspace/drv/bus/usb/ohci/hw_struct

Files:

• endpoint_descriptor.h (modified) (1 diff)
• transfer_descriptor.c (modified) (1 diff)
• transfer_descriptor.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h

@@ -165 +165 @@
 
 /**
+ * Set the HeadP of ED. Do not call unless the ED is Halted.
+ * @param instance ED
+ */
+static inline void ed_set_head_td(ed_t *instance, const td_t *td)
+{
+        assert(instance);
+        const uintptr_t pa = addr_to_phys(td);
+        OHCI_MEM32_WR(instance->td_head, pa & ED_TDHEAD_PTR_MASK);
+}
+
+/**
  * Set next ED in ED chain.
  * @param instance ED to modify

uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c

@@ -88 +88 @@
         }
 
+        td_set_next(instance, next);
+}
+
+void td_set_next(td_t *instance, const td_t *next)
+{
         OHCI_MEM32_WR(instance->next, addr_to_phys(next) & TD_NEXT_PTR_MASK);
+}
 
-}
 /**
  * @}

uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h

@@ -92 +92 @@
 } __attribute__((packed)) td_t;
 
-void td_init(td_t *instance, const td_t *next,
-    usb_direction_t dir, const void *buffer, size_t size, int toggle);
+void td_init(td_t *, const td_t *, usb_direction_t, const void *, size_t, int);
+void td_set_next(td_t *, const td_t *);
 
 /**