Changeset 7ec7b7e in mainline for uspace/drv/bus/usb/xhci/hw_struct/context.h

Timestamp:

2018-01-19T21:04:32Z (6 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

726af29

Parents:

c6f82e5

Message:

Handling HCs with 32 or 64-bytes context size

File:

• uspace/drv/bus/usb/xhci/hw_struct/context.h (modified) (2 diffs)

uspace/drv/bus/usb/xhci/hw_struct/context.h

@@ -175 +175 @@
 
 /**
+ * Handling HCs with 32 or 64-bytes context size (CSZ)
+ */
+#define XHCI_CTX_SIZE_SMALL 32
+#define XHCI_ONE_CTX_SIZE(hc) (XHCI_CTX_SIZE_SMALL << hc->csz)
+#define XHCI_SLOT_CTX_OFFSET 0
+#define XHCI_EP_ARRAY_OFFSET 1
+#define XHCI_DEVICE_CTX_SIZE(hc) ((XHCI_EP_ARRAY_OFFSET + XHCI_EP_COUNT) * XHCI_ONE_CTX_SIZE(hc))
+
+/**
  * Device context: section 6.2.1
  */
+#define XHCI_GET_SLOT_CTX(dev_ctx, hc) (xhci_slot_ctx_t *)((char*)dev_ctx + XHCI_SLOT_CTX_OFFSET * XHCI_ONE_CTX_SIZE(hc))
+#define XHCI_GET_EP_CTX(dev_ctx, hc, dci) (xhci_ep_ctx_t *)((char*)dev_ctx + (dci + XHCI_EP_ARRAY_OFFSET) * XHCI_ONE_CTX_SIZE(hc))
+
 typedef struct xhci_device_ctx {
-        xhci_slot_ctx_t slot_ctx;
-        xhci_ep_ctx_t endpoint_ctx[XHCI_EP_COUNT];
-} __attribute__((packed)) xhci_device_ctx_t;
+} xhci_device_ctx_t;
 
 /**
@@ -228 +238 @@
  * Input context: section 6.2.5
  */
+
+#define XHCI_CTRL_CTX_OFFSET 0
+#define XHCI_DEVICE_CTX_OFFSET 1
+#define XHCI_INPUT_CTX_SIZE(hc) (XHCI_DEVICE_CTX_OFFSET * XHCI_ONE_CTX_SIZE(hc) + XHCI_DEVICE_CTX_SIZE(hc))
+#define XHCI_GET_CTRL_CTX(ictx, hc) (xhci_input_ctrl_ctx_t*)((char*)ictx + XHCI_CTRL_CTX_OFFSET * XHCI_ONE_CTX_SIZE(hc))
+#define XHCI_GET_DEVICE_CTX(ictx, hc) (xhci_device_ctx_t *)((char*)ictx + XHCI_DEVICE_CTX_OFFSET * XHCI_ONE_CTX_SIZE(hc))
+
 typedef struct xhci_input_ctx {
-        xhci_input_ctrl_ctx_t ctrl_ctx;
-        xhci_slot_ctx_t slot_ctx;
-        xhci_ep_ctx_t endpoint_ctx[XHCI_EP_COUNT];
-} __attribute__((packed)) xhci_input_ctx_t;
+} xhci_input_ctx_t;
 
 /**