Changeset e7f21884 in mainline

Timestamp:

2018-01-18T17:11:10Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

fb28cde

Parents:

05770666

Message:

xhci: fixed field named wrong

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (3 diffs)
• commands.h (modified) (1 diff)

uspace/drv/bus/usb/xhci/commands.c

@@ -43 +43 @@
 #include "hw_struct/trb.h"
 
-#define TRB_SET_TCS(trb, tcs)   (trb).control |= host2xhci(32, ((tcs &0x1) << 9))
+#define TRB_SET_TSP(trb, tsp)   (trb).control |= host2xhci(32, (((tsp) & 0x1) << 9))
 #define TRB_SET_TYPE(trb, type) (trb).control |= host2xhci(32, (type) << 10)
 #define TRB_SET_DC(trb, dc)     (trb).control |= host2xhci(32, (dc) << 9)
@@ -51 +51 @@
 #define TRB_SET_SLOT(trb, slot) (trb).control |= host2xhci(32, (slot) << 24)
 #define TRB_SET_DEV_SPEED(trb, speed)   (trb).control |= host2xhci(32, (speed & 0xF) << 16)
-
-/**
- * TODO: Not sure about SCT and DCS (see section 6.4.3.9).
- */
 #define TRB_SET_DEQUEUE_PTR(trb, dptr) (trb).parameter |= host2xhci(64, (dptr))
 #define TRB_SET_ICTX(trb, phys) (trb).parameter |= host2xhci(64, (phys) & (~0xF))
@@ -512 +508 @@
         assert(cmd);
 
-        /**
-         * Note: TCS can have values 0 or 1. If it is set to 0, see sectuon 4.5.8 for
-         *       information about this flag.
-         */
         xhci_trb_clean(&cmd->_header.trb);
 
         TRB_SET_TYPE(cmd->_header.trb, XHCI_TRB_TYPE_RESET_ENDPOINT_CMD);
-        TRB_SET_TCS(cmd->_header.trb, cmd->tcs);
+        TRB_SET_TSP(cmd->_header.trb, cmd->tsp);
         TRB_SET_EP(cmd->_header.trb, cmd->endpoint_id);
         TRB_SET_SLOT(cmd->_header.trb, cmd->slot_id);

uspace/drv/bus/usb/xhci/commands.h

@@ -117 +117 @@
         uintptr_t dequeue_ptr;
 
-        uint8_t tcs;
+        bool tsp;
         uint8_t susp;
         uint8_t device_speed;