Changeset cd3fa47 in mainline for uspace/drv/bus/usb/ohci/ohci_rh.c


Ignore:
Timestamp:
2018-01-21T18:35:09Z (7 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3f02935
Parents:
32b2a6f2
Message:

usb: definition of status bits have changed between USB 2 and 3, remove the confusion

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/ohci/ohci_rh.c

    r32b2a6f2 rcd3fa47  
    340340                }
    341341
    342         case USB_HUB_FEATURE_PORT_ENABLE:         /*1*/
     342        case USB2_HUB_FEATURE_PORT_ENABLE:         /*1*/
    343343                OHCI_WR(hub->registers->rh_port_status[port],
    344344                    RHPS_CLEAR_PORT_ENABLE);
    345345                return EOK;
    346346
    347         case USB_HUB_FEATURE_PORT_SUSPEND:        /*2*/
     347        case USB2_HUB_FEATURE_PORT_SUSPEND:        /*2*/
    348348                OHCI_WR(hub->registers->rh_port_status[port],
    349349                    RHPS_CLEAR_PORT_SUSPEND);
     
    351351
    352352        case USB_HUB_FEATURE_C_PORT_CONNECTION:   /*16*/
    353         case USB_HUB_FEATURE_C_PORT_ENABLE:       /*17*/
    354         case USB_HUB_FEATURE_C_PORT_SUSPEND:      /*18*/
     353        case USB2_HUB_FEATURE_C_PORT_ENABLE:       /*17*/
     354        case USB2_HUB_FEATURE_C_PORT_SUSPEND:      /*18*/
    355355        case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: /*19*/
    356356        case USB_HUB_FEATURE_C_PORT_RESET:        /*20*/
     
    401401                /* Fall through, for per port power */
    402402                /* Fallthrough */
    403         case USB_HUB_FEATURE_PORT_ENABLE:  /*1*/
    404         case USB_HUB_FEATURE_PORT_SUSPEND: /*2*/
     403        case USB2_HUB_FEATURE_PORT_ENABLE:  /*1*/
     404        case USB2_HUB_FEATURE_PORT_SUSPEND: /*2*/
    405405        case USB_HUB_FEATURE_PORT_RESET:   /*4*/
    406406                usb_log_debug2("Setting port POWER, ENABLE, SUSPEND or RESET "
Note: See TracChangeset for help on using the changeset viewer.