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

Changeset 2fe28ca1 in mainline


Ignore:
Timestamp:
2011-07-11T19:17:32Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
0c224b2
Parents:
302f9b2
Message:

OHCI: Root hub: Set over-current protection mode to match power mode.

Fix typo.

Location:
uspace/drv/bus/usb
Files:
2 edited

Legend:

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

    r302f9b2 r2fe28ca1  
    177177        /* Set port power mode to no power-switching. (always on) */
    178178        instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
     179        /* Set to no overcurrent */
     180        instance->registers->rh_desc_a |= RHDA_NOCP_FLAG;
    179181#elif OHCI_POWER == 1
    180182        /* Set port power mode to no ganged power-switching. */
     
    182184        instance->registers->rh_desc_a &= ~RHDA_PSM_FLAG;
    183185        instance->registers->rh_status = RHS_CLEAR_GLOBAL_POWER;
     186        /* Set to global over-current */
     187        instance->registers->rh_desc_a &= ~RHDA_NOCP_FLAG;
     188        instance->registers->rh_desc_a &= ~RHDA_OCPM_FLAG;
    184189#else
    185190        /* Set port power mode to no per port power-switching. */
     
    193198        instance->registers->rh_desc_b |=
    194199                ((1 << (instance->port_count + 1)) - 1) << RHDB_PCC_SHIFT;
     200        /* Set per port over-current */
     201        instance->registers->rh_desc_a &= ~RHDA_NOCP_FLAG;
     202        instance->registers->rh_desc_a |= RHDA_OCPM_FLAG;
    195203#endif
    196204
  • uspace/drv/bus/usb/usbhub/usbhub.c

    r302f9b2 r2fe28ca1  
    279279                                if (!per_port_power) {
    280280                                        usb_log_debug(
    281                                             "Ganged power switching mode,"
     281                                            "Ganged power switching mode, "
    282282                                            "one port is enough.\n");
    283283                                        break;
Note: See TracChangeset for help on using the changeset viewer.