Changeset 2896ff6 in mainline

Timestamp:

2017-10-19T20:52:35Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

913007f

Parents:

1a9a72a

Message:

Vaguer log level. Extracted timeout constant from command completion waiting and increased it for a bit.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (1 diff)
• commands.h (modified) (1 diff)
• endpoint.c (modified) (2 diffs)
• hc.c (modified) (1 diff)
• main.c (modified) (1 diff)
• rh.c (modified) (3 diffs)

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

@@ -76 +76 @@
 }
 
-int xhci_cmd_wait(xhci_cmd_t *cmd, suseconds_t timeout)
-{
+int xhci_cmd_wait(xhci_cmd_t *cmd)
+{
+        const suseconds_t timeout = 1000000;
         int rv = EOK;
 

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

@@ -67 +67 @@
 xhci_cmd_t *xhci_cmd_alloc(void);
 void xhci_cmd_init(xhci_cmd_t *);
-int xhci_cmd_wait(xhci_cmd_t *, suseconds_t);
+int xhci_cmd_wait(xhci_cmd_t *);
 void xhci_cmd_fini(xhci_cmd_t *);
 void xhci_cmd_free(xhci_cmd_t *);

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

@@ -257 +257 @@
                 cmd.slot_id = dev->slot_id;
                 xhci_send_configure_endpoint_command(dev->hc, &cmd, ictx);
-                if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
+                if ((err = xhci_cmd_wait(&cmd)) != EOK)
                         goto err_cmd;
 
@@ -324 +324 @@
         cmd.slot_id = dev->slot_id;
         xhci_send_configure_endpoint_command(hc, &cmd, ictx);
-        if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
+        if ((err = xhci_cmd_wait(&cmd)) != EOK)
                 goto err_cmd;
 

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

@@ -634 +634 @@
         uint32_t v = host2xhci(32, target & BIT_RRANGE(uint32_t, 7));
         pio_write_32(&hc->db_arry[doorbell], v);
-        usb_log_debug("Ringing doorbell %d, target = %d", doorbell, target);
+        usb_log_debug2("Ringing doorbell %d (target: %d)", doorbell, target);
         return EOK;
 }

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

@@ -186 +186 @@
 {
         log_init(NAME);
-        logctl_set_log_level(NAME, LVL_DEBUG2);
+        logctl_set_log_level(NAME, LVL_DEBUG);
         return ddf_driver_main(&xhci_driver);
 }

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

@@ -91 +91 @@
 
         xhci_send_enable_slot_command(hc, &cmd);
-        if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
+        if ((err = xhci_cmd_wait(&cmd)) != EOK)
                 return err;
 
@@ -155 +155 @@
         cmd.slot_id = slot_id;
         xhci_send_address_device_command(hc, &cmd, ictx);
-        if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
+        if ((err = xhci_cmd_wait(&cmd)) != EOK)
                 goto err_dctx;
 
@@ -400 +400 @@
         xhci_get_port_bandwidth_command(dev->hc, &cmd, ctx, speed);
 
-        int err = xhci_cmd_wait(&cmd, 100000);
+        int err = xhci_cmd_wait(&cmd);
         if(err != EOK) {
                 free(ctx);