Changeset 481af21e in mainline

Timestamp:

2017-07-12T19:44:01Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

f8315ed

Parents:

fd9f4ffe

Message:

Moved common tail of command sending functions into a separate function, fixed trb setup for enable slot command.

File:

• uspace/drv/bus/usb/xhci/commands.c (modified) (3 diffs)

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

@@ -43 +43 @@
 #include "hw_struct/trb.h"
 
-static int ring_doorbell(xhci_hc_t *hc, unsigned doorbell, unsigned target)
+static inline int ring_doorbell(xhci_hc_t *hc, unsigned doorbell, unsigned target)
 {
         uint32_t v = host2xhci(32, target & BIT_RRANGE(uint32_t, 7));
         pio_write_32(&hc->db_arry[doorbell], v);
+        return EOK;
+}
+
+static inline int enqueue_trb(xhci_hc_t *hc, xhci_trb_t *trb,
+                              unsigned doorbell, unsigned target)
+{
+        xhci_trb_ring_enqueue(&hc->command_ring, trb);
+        ring_doorbell(hc, doorbell, target);
+
+        xhci_dump_trb(trb);
+        usb_log_debug2("HC(%p): Sent TRB", hc);
+
         return EOK;
 }
@@ -57 +69 @@
         trb.control = host2xhci(32, XHCI_TRB_TYPE_NO_OP_CMD << 10);
 
-        xhci_trb_ring_enqueue(&hc->command_ring, &trb);
-        ring_doorbell(hc, 0, 0);
-
-        xhci_dump_trb(&trb);
-        usb_log_debug2("HC(%p): Sent TRB", hc);
-        return EOK;
+        return enqueue_trb(hc, &trb, 0, 0);
 }
 
@@ -72 +79 @@
         trb.control = host2xhci(32, XHCI_TRB_TYPE_ENABLE_SLOT_CMD << 10);
         trb.control |= host2xhci(32, XHCI_REG_RD(hc->xecp, XHCI_EC_SP_SLOT_TYPE) << 16);
+        trb.control |= host2xhci(32, hc->command_ring.pcs);
 
         // TODO: Setup input control context.
 
-        xhci_trb_ring_enqueue(&hc->command_ring, &trb);
-        ring_doorbell(hc, 0, 0);
-
-        xhci_dump_trb(&trb);
-        usb_log_debug2("HC(%p): Sent TRB", hc);
-        return EOK;
+        return enqueue_trb(hc, &trb, 0, 0);
 }