Changeset c9bec1c in mainline

Timestamp:

2017-07-30T16:01:06Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

73e5b62

Parents:

0cabd10

Message:

Refactored the add_command function, the return of the cmd was meant to be used for post config if cmd passed into the command sender was NULL, however the only sender that uses this is no_op sender and that has no post config of the command.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (11 diffs)
• hc.c (modified) (1 diff)

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

@@ -167 +167 @@
 }
 
-static inline xhci_cmd_t *add_cmd(xhci_hc_t *hc, xhci_cmd_t *cmd)
+static inline int add_cmd(xhci_hc_t *hc, xhci_cmd_t *cmd)
 {
         if (cmd == NULL) {
                 cmd = xhci_alloc_command();
                 if (cmd == NULL)
-                        return cmd;
+                        return ENOMEM;
 
                 cmd->has_owner = false;
@@ -180 +180 @@
         cmd->trb = hc->command_ring.enqueue_trb;
 
-        return cmd;
+        return EOK;
 }
 
@@ -273 +273 @@
         TRB_SET_TYPE(trb, XHCI_TRB_TYPE_NO_OP_CMD);
 
-        cmd = add_cmd(hc, cmd);
+        add_cmd(hc, cmd);
 
         return enqueue_trb(hc, &trb, 0, 0);
@@ -288 +288 @@
         trb.control |= host2xhci(32, XHCI_REG_RD(hc->xecp, XHCI_EC_SP_SLOT_TYPE) << 16);
 
-        cmd = add_cmd(hc, cmd);
+        add_cmd(hc, cmd);
 
         return enqueue_trb(hc, &trb, 0, 0);
@@ -337 +337 @@
         TRB_SET_SLOT(trb, cmd->slot_id);
 
-        cmd = add_cmd(hc, cmd);
+        add_cmd(hc, cmd);
 
         return enqueue_trb(hc, &trb, 0, 0);
@@ -357 +357 @@
         TRB_SET_SLOT(trb, cmd->slot_id);
 
-        cmd = add_cmd(hc, cmd);
+        add_cmd(hc, cmd);
 
         return enqueue_trb(hc, &trb, 0, 0);
@@ -383 +383 @@
         TRB_SET_SLOT(trb, cmd->slot_id);
 
-        cmd = add_cmd(hc, cmd);
+        add_cmd(hc, cmd);
 
         return enqueue_trb(hc, &trb, 0, 0);
@@ -405 +405 @@
         TRB_SET_SLOT(trb, cmd->slot_id);
 
+        add_cmd(hc, cmd);
+
         return enqueue_trb(hc, &trb, 0, 0);
 }
@@ -421 +423 @@
         TRB_SET_SLOT(trb, cmd->slot_id);
 
-        cmd = add_cmd(hc, cmd);
+        add_cmd(hc, cmd);
 
         return enqueue_trb(hc, &trb, 0, 0);
@@ -446 +448 @@
          */
 
-        cmd = add_cmd(hc, cmd);
+        add_cmd(hc, cmd);
 
         return enqueue_trb(hc, &trb, 0, 0);
@@ -461 +463 @@
         TRB_SET_TYPE(trb, XHCI_TRB_TYPE_RESET_DEVICE_CMD);
         TRB_SET_SLOT(trb, cmd->slot_id);
+
+        add_cmd(hc, cmd);
 
         return enqueue_trb(hc, &trb, 0, 0);

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

@@ -331 +331 @@
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA_HI, UPPER32(erstptr));
 
-        // TODO: Setup scratchpad buffers
-
         if (irq) {
                 XHCI_REG_SET(intr0, XHCI_INTR_IE, 1);