Changes in uspace/drv/bus/usb/ohci/hw_struct/hcca.h [3e48c93:acdb5bac] in mainline

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