Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 2896ff6 in mainline


Ignore:
Timestamp:
2017-10-19T20:52:35Z (3 years ago)
Author:
Petr Manek <petr.manek@…>
Branches:
master
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:
6 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/xhci/commands.c

    r1a9a72a r2896ff6  
    7676}
    7777
    78 int xhci_cmd_wait(xhci_cmd_t *cmd, suseconds_t timeout)
    79 {
     78int xhci_cmd_wait(xhci_cmd_t *cmd)
     79{
     80        const suseconds_t timeout = 1000000;
    8081        int rv = EOK;
    8182
  • uspace/drv/bus/usb/xhci/commands.h

    r1a9a72a r2896ff6  
    6767xhci_cmd_t *xhci_cmd_alloc(void);
    6868void xhci_cmd_init(xhci_cmd_t *);
    69 int xhci_cmd_wait(xhci_cmd_t *, suseconds_t);
     69int xhci_cmd_wait(xhci_cmd_t *);
    7070void xhci_cmd_fini(xhci_cmd_t *);
    7171void xhci_cmd_free(xhci_cmd_t *);
  • uspace/drv/bus/usb/xhci/endpoint.c

    r1a9a72a r2896ff6  
    257257                cmd.slot_id = dev->slot_id;
    258258                xhci_send_configure_endpoint_command(dev->hc, &cmd, ictx);
    259                 if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
     259                if ((err = xhci_cmd_wait(&cmd)) != EOK)
    260260                        goto err_cmd;
    261261
     
    324324        cmd.slot_id = dev->slot_id;
    325325        xhci_send_configure_endpoint_command(hc, &cmd, ictx);
    326         if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
     326        if ((err = xhci_cmd_wait(&cmd)) != EOK)
    327327                goto err_cmd;
    328328
  • uspace/drv/bus/usb/xhci/hc.c

    r1a9a72a r2896ff6  
    634634        uint32_t v = host2xhci(32, target & BIT_RRANGE(uint32_t, 7));
    635635        pio_write_32(&hc->db_arry[doorbell], v);
    636         usb_log_debug("Ringing doorbell %d, target = %d", doorbell, target);
     636        usb_log_debug2("Ringing doorbell %d (target: %d)", doorbell, target);
    637637        return EOK;
    638638}
  • uspace/drv/bus/usb/xhci/main.c

    r1a9a72a r2896ff6  
    186186{
    187187        log_init(NAME);
    188         logctl_set_log_level(NAME, LVL_DEBUG2);
     188        logctl_set_log_level(NAME, LVL_DEBUG);
    189189        return ddf_driver_main(&xhci_driver);
    190190}
  • uspace/drv/bus/usb/xhci/rh.c

    r1a9a72a r2896ff6  
    9191
    9292        xhci_send_enable_slot_command(hc, &cmd);
    93         if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
     93        if ((err = xhci_cmd_wait(&cmd)) != EOK)
    9494                return err;
    9595
     
    155155        cmd.slot_id = slot_id;
    156156        xhci_send_address_device_command(hc, &cmd, ictx);
    157         if ((err = xhci_cmd_wait(&cmd, 100000)) != EOK)
     157        if ((err = xhci_cmd_wait(&cmd)) != EOK)
    158158                goto err_dctx;
    159159
     
    400400        xhci_get_port_bandwidth_command(dev->hc, &cmd, ctx, speed);
    401401
    402         int err = xhci_cmd_wait(&cmd, 100000);
     402        int err = xhci_cmd_wait(&cmd);
    403403        if(err != EOK) {
    404404                free(ctx);
Note: See TracChangeset for help on using the changeset viewer.