Index: uspace/drv/bus/usb/xhci/hw_struct/context.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/context.h	(revision 6fa91e4c93068032f387570765baf8ad5ae309d3)
+++ uspace/drv/bus/usb/xhci/hw_struct/context.h	(revision d32d51d3e10cd574c12b571c736c1578affbd6b8)
@@ -51,4 +51,6 @@
 	xhci_dword_t data[5];
 	xhci_dword_t reserved[3];
+
+#define XHCI_EP_COUNT 31
 
 #define XHCI_EP_TYPE_ISOCH_OUT		1
@@ -132,5 +134,5 @@
 typedef struct xhci_device_ctx {
 	xhci_slot_ctx_t slot_ctx;
-	xhci_ep_ctx_t endpoint_ctx [31];
+	xhci_ep_ctx_t endpoint_ctx[XHCI_EP_COUNT];
 } __attribute__((packed)) xhci_device_ctx_t;
 
@@ -165,5 +167,5 @@
 
 #define XHCI_INPUT_CTRL_CTX_ADD_SET(ctx, idx) (ctx).data[1] |= (1 << (idx))
-    
+
 #define XHCI_INPUT_CTRL_CTX_CONFIG_VALUE(ctx)   XHCI_DWORD_EXTRACT((ctx).data[7],  7,  0)
 #define XHCI_INPUT_CTRL_CTX_IFACE_NUMBER(ctx)   XHCI_DWORD_EXTRACT((ctx).data[7], 15,  8)
@@ -177,5 +179,5 @@
 	xhci_input_ctrl_ctx_t ctrl_ctx;
 	xhci_slot_ctx_t slot_ctx;
-	xhci_ep_ctx_t endpoint_ctx [31];
+	xhci_ep_ctx_t endpoint_ctx[XHCI_EP_COUNT];
 } __attribute__((packed)) xhci_input_ctx_t;