Changeset 6de2d766 in mainline for uspace/drv/bus/usb/ohci/hw_struct/hcca.h

Timestamp:

2012-07-20T18:14:55Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b828907, be67118

Parents:

7030bc9 (diff), 32260a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge USB branch.

USB should be endian agnostic now.
OHCI and pci work on qemu powerpc, but pci locks up on real hw.
Hopefully no regressions on amd64/ia32.
Tested on qemu and Virtualbox.

File:

• uspace/drv/bus/usb/ohci/hw_struct/hcca.h (modified) (1 diff)

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

@@ -38 +38 @@
 #include <malloc.h>
 
+#include "mem_access.h"
+
+#define HCCA_INT_EP_COUNT  32
+
 /** Host controller communication area.
  * Shared memory used for communication between the controller and the driver.
  */
 typedef struct hcca {
-        uint32_t int_ep[32];
+        /** Interrupt endpoints */
+        uint32_t int_ep[HCCA_INT_EP_COUNT];
+        /** Frame number. */
         uint16_t frame_number;
         uint16_t pad1;
+        /** Pointer to the last completed TD. (useless) */
         uint32_t done_head;
+        /** Padding to make the size 256B */
         uint32_t reserved[30];
 } hcca_t;
 
-static inline void * hcca_get(void)
+/** Allocate properly aligned structure.
+ *
+ * The returned structure is zeroed upon allocation.
+ *
+ * @return Usable HCCA memory structure.
+ */
+static inline hcca_t * hcca_get(void)
 {
         assert(sizeof(hcca_t) == 256);
-        return memalign(256, sizeof(hcca_t));
+        hcca_t *hcca = memalign(256, sizeof(hcca_t));
+        if (hcca)
+                bzero(hcca, sizeof(hcca_t));
+        return hcca;
+}
+
+/** Set HCCA interrupt endpoint pointer table entry.
+ * @param hcca HCCA memory structure.
+ * @param index table index.
+ * @param pa Physical address.
+ */
+static inline void hcca_set_int_ep(hcca_t *hcca, unsigned index, uintptr_t pa)
+{
+        assert(hcca);
+        assert(index < HCCA_INT_EP_COUNT);
+        OHCI_MEM32_WR(hcca->int_ep[index], pa);
+
 }
 #endif