Changeset 63862a0 in mainline


Ignore:
Timestamp:
2011-05-30T20:01:42Z (13 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
06f9d8fb, d754f59
Parents:
173922f (diff), be8d907 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

removed global hub powering

Location:
uspace/drv/usbhub
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/usbhub/ports.c

    r173922f r63862a0  
    9595 * @param port port number, starting from 1
    9696 */
    97 void usb_hub_process_interrupt(usb_hub_info_t *hub,
     97void usb_hub_process_port_interrupt(usb_hub_info_t *hub,
    9898    uint16_t port) {
    9999        usb_log_debug("Interrupt at port %zu\n", (size_t) port);
  • uspace/drv/usbhub/ports.h

    r173922f r63862a0  
    7070
    7171
    72 void usb_hub_process_interrupt(usb_hub_info_t *hub,
     72void usb_hub_process_port_interrupt(usb_hub_info_t *hub,
    7373        uint16_t port);
    7474
  • uspace/drv/usbhub/usbhub.c

    r173922f r63862a0  
    168168                bool change = (change_bitmap[port / 8] >> (port % 8)) % 2;
    169169                if (change) {
    170                         usb_hub_process_interrupt(hub, port);
     170                        usb_hub_process_port_interrupt(hub, port);
    171171                }
    172172        }
     
    266266
    267267                if (!has_individual_port_powering) {
    268                         usb_log_debug("Has_global powering\n");
    269                         opResult = usb_hub_set_feature(hub_info->control_pipe,
    270                             USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
    271                         if (opResult != EOK) {
    272                                 usb_log_error("Cannot power hub: %s\n",
    273                                     str_error(opResult));
    274                         }
     268                        //this setting actually makes no difference
     269                        usb_log_debug("Hub has global powering\n");
    275270                }
    276271
     
    280275                            port, USB_HUB_FEATURE_PORT_POWER);
    281276                        if (opResult != EOK) {
    282                                 usb_log_error("cannot power on port %zu: %s.\n",
     277                                usb_log_error("Cannot power on port %zu: %s.\n",
    283278                                    port, str_error(opResult));
    284279                        }
Note: See TracChangeset for help on using the changeset viewer.