Changeset 159b91f4 in mainline


Ignore:
Timestamp:
2011-04-03T17:00:34Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0b4e7ca
Parents:
7526e3d
Message:

Pipe mapping respects alternate interface setting

Location:
uspace/lib/usb
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usb/include/usb/pipes.h

    r7526e3d r159b91f4  
    107107        /** Interface number the endpoint must belong to (-1 for any). */
    108108        int interface_no;
     109        /** Alternate interface setting to choose. */
     110        int interface_setting;
    109111        /** Found descriptor fitting the description. */
    110112        usb_standard_endpoint_descriptor_t *descriptor;

  • uspace/lib/usb/src/devdrv.c

    r7526e3d r159b91f4  
    135135                dev->pipes[i].description = drv->endpoints[i];
    136136                dev->pipes[i].interface_no = dev->interface_no;
     137                dev->pipes[i].interface_setting = 0;
    137138        }
    138139
    … …  
    439440}
    440441
     442
    441443/**
    442444 * @}

  • uspace/lib/usb/src/pipesinit.c

    r7526e3d r159b91f4  
    121121    usb_endpoint_mapping_t *mapping, size_t mapping_count,
    122122    usb_endpoint_description_t *found_endpoint,
    123     int interface_number)
     123    int interface_number, int interface_setting)
    124124{
    125125        while (mapping_count > 0) {
    … …  
    127127                    || (mapping->interface_no == interface_number);
    128128
     129                bool interface_setting_fits = (mapping->interface_setting < 0)
     130                    || (mapping->interface_setting == interface_setting);
     131
    129132                bool endpoint_descriptions_fits = endpoint_fits_description(
    130133                    mapping->description, found_endpoint);
    131134
    132                 if (interface_number_fits && endpoint_descriptions_fits) {
     135                if (interface_number_fits
     136                    && interface_setting_fits
     137                    && endpoint_descriptions_fits) {
    133138                        return mapping;
    134139                }
    … …  
    181186         */
    182187        usb_endpoint_mapping_t *ep_mapping = find_endpoint_mapping(mapping,
    183             mapping_count, &description, interface->interface_number);
     188            mapping_count, &description,
     189            interface->interface_number, interface->alternate_setting);
    184190        if (ep_mapping == NULL) {
    185191                return ENOENT;
Note: See TracChangeset for help on using the changeset viewer.