Changeset fb28cde in mainline

Timestamp:

2018-01-18T17:12:30Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

8fe29a7c

Parents:

e7f21884

Message:

xhci: changed api to get dequeue state of trb ring

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (1 diff)
• hc.c (modified) (1 diff)
• trb_ring.c (modified) (1 diff)
• trb_ring.h (modified) (2 diffs)

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

@@ -546 +546 @@
         TRB_SET_DEQUEUE_PTR(cmd->_header.trb, cmd->dequeue_ptr);
 
-        /**
-         * TODO: Set DCS (see section 4.6.10).
-         */
-
         return enqueue_command(hc, cmd);
 }

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

@@ -477 +477 @@
         XHCI_REG_WR(hc->op_regs, XHCI_OP_MAX_SLOTS_EN, hc->max_slots);
 
-        uint64_t crcr = xhci_trb_ring_get_dequeue_ptr(&hc->cr.trb_ring);
-        if (hc->cr.trb_ring.pcs)
-                crcr |= XHCI_REG_MASK(XHCI_OP_RCS);
+        uintptr_t crcr;
+        xhci_trb_ring_reset_dequeue_state(&hc->cr.trb_ring, &crcr);
         XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_LO, LOWER32(crcr));
         XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_HI, UPPER32(crcr));

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

@@ -272 +272 @@
 }
 
+void xhci_trb_ring_reset_dequeue_state(xhci_trb_ring_t *ring, uintptr_t *addr)
+{
+        assert(ring);
+
+        ring->dequeue = trb_ring_enqueue_phys(ring);
+
+        if (addr)
+                *addr = ring->dequeue | ring->pcs;
+}
+
 /**
  * Initializes an event ring.

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

@@ -79 +79 @@
 int xhci_trb_ring_enqueue_multiple(xhci_trb_ring_t *, xhci_trb_t *, size_t, uintptr_t *);
 
-/**
- * Get the initial value to fill into CRCR.
- */
-static inline uintptr_t xhci_trb_ring_get_dequeue_ptr(xhci_trb_ring_t *ring)
-{
-        return ring->dequeue;
-}
+void xhci_trb_ring_reset_dequeue_state(xhci_trb_ring_t *ring, uintptr_t *addr);
 
 /**
@@ -94 +88 @@
         ring->dequeue = phys;
 }
-
-uintptr_t xhci_trb_ring_get_dequeue_ptr(xhci_trb_ring_t *);
 
 /**