Index: uspace/drv/bus/usb/ohci/hw_struct/hcca.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
+++ uspace/drv/bus/usb/ohci/hw_struct/hcca.h	(revision 81d5f7464eb965fde049f3e6750f592e8132ed3b)
@@ -37,4 +37,5 @@
 #include <malloc.h>
 #include <sys/types.h>
+#include <macros.h>
 
 #include "mem_access.h"
@@ -50,9 +51,9 @@
 	/** 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;
 
@@ -80,5 +81,5 @@
 {
 	assert(hcca);
-	assert(index < HCCA_INT_EP_COUNT);
+	assert(index < ARRAY_SIZE(hcca->int_ep));
 	OHCI_MEM32_WR(hcca->int_ep[index], pa);
 
Index: uspace/drv/bus/usb/ohci/hw_struct/mem_access.h
===================================================================
--- uspace/drv/bus/usb/ohci/hw_struct/mem_access.h	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
+++ uspace/drv/bus/usb/ohci/hw_struct/mem_access.h	(revision 81d5f7464eb965fde049f3e6750f592e8132ed3b)
@@ -47,3 +47,2 @@
  * @}
  */
-