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

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/ohci/hw_struct/hcca.h (modified) (4 diffs)

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

@@ -35 +35 @@
 #define DRV_OHCI_HW_STRUCT_HCCA_H
 
-#include <stdint.h>
 #include <malloc.h>
+#include <sys/types.h>
+#include <macros.h>
 
 #include "mem_access.h"
@@ -50 +51 @@
         /** Frame number. */
         uint16_t frame_number;
-        uint16_t pad1;
+        PADD16;
         /** Pointer to the last completed TD. (useless) */
         uint32_t done_head;
         /** Padding to make the size 256B */
-        uint32_t reserved[30];
+        PADD32[30];
 } hcca_t;
+
+STATIC_ASSERT(sizeof(hcca_t) == 256);
 
 /** Allocate properly aligned structure.
@@ -65 +68 @@
 static inline hcca_t * hcca_get(void)
 {
-        static_assert(sizeof(hcca_t) == 256);
-        hcca_t *hcca = memalign(256, sizeof(hcca_t));
+        hcca_t *hcca = memalign(sizeof(hcca_t), sizeof(hcca_t));
         if (hcca)
                 memset(hcca, 0, sizeof(hcca_t));
@@ -80 +82 @@
 {
         assert(hcca);
-        assert(index < HCCA_INT_EP_COUNT);
+        assert(index < ARRAY_SIZE(hcca->int_ep));
         OHCI_MEM32_WR(hcca->int_ep[index], pa);
-
 }
 #endif