Changeset 7428b92 in mainline

Timestamp:

2017-07-31T19:59:24Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

174788f

Parents:

73e5b62

Message:

Fixed a typo, added ADD_SET macros for input ctrl context, removed non-working assertions from ADD/DROP macros for input ctrl context (those contain do {} while(0) and thus cannot be chained in this way).

File:

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

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

@@ -125 +125 @@
         uint32_t data [16];
 #define XHCI_INPUT_CTRL_CTX_DROP(ctx, idx) \
-        (assert((idx) > 1 && (idx) < 32), XHCI_DWORD_EXTRACT((ctx).data[0], (idx), (idx)))
+        XHCI_DWORD_EXTRACT((ctx).data[0], (idx), (idx))
+
+#define XHCI_INPUT_CTRL_CTX_DROP_SET(ctx, idx) (ctx).data[0] |= (1 << (idx))
+
 #define XHCI_INPUT_CTRL_CTX_ADD(ctx, idx) \
-        (assert((idx) >= 0 && (idx) < 32), XHCI_DWORD_EXTRACT((ctx).data[1], (idx), (idx)))
+        XHCI_DWORD_EXTRACT((ctx).data[1], (idx), (idx))
+
+#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)
@@ -137 +143 @@
  */
 typedef struct xhci_input_ctx {
-        xhci_input_ctrl_ctx_t ctr_ctx;
+        xhci_input_ctrl_ctx_t ctrl_ctx;
         xhci_slot_ctx_t slot_ctx;
         xhci_ep_ctx_t endpoint_ctx [31];