Changeset 3bacee1 in mainline for uspace/lib/usbdev/src/pipesinit.c


Ignore:
Timestamp:
2018-04-12T16:27:17Z (6 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3cf22f9
Parents:
76d0981d
git-author:
Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)
git-committer:
Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)
Message:

Make ccheck-fix again and commit more good files.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/usbdev/src/pipesinit.c

    r76d0981d r3bacee1  
    136136{
    137137        while (mapping_count > 0) {
    138                 bool interface_number_fits = (mapping->interface_no < 0)
    139                     || (mapping->interface_no == interface_number);
    140 
    141                 bool interface_setting_fits = (mapping->interface_setting < 0)
    142                     || (mapping->interface_setting == interface_setting);
     138                bool interface_number_fits = (mapping->interface_no < 0) ||
     139                    (mapping->interface_no == interface_number);
     140
     141                bool interface_setting_fits = (mapping->interface_setting < 0) ||
     142                    (mapping->interface_setting == interface_setting);
    143143
    144144                bool endpoint_descriptions_fits = endpoint_fits_description(
    145145                    mapping->description, found_endpoint);
    146146
    147                 if (interface_number_fits
    148                     && interface_setting_fits
    149                     && endpoint_descriptions_fits
    150                     && !mapping->present) {
     147                if (interface_number_fits &&
     148                    interface_setting_fits &&
     149                    endpoint_descriptions_fits &&
     150                    !mapping->present) {
    151151                        return mapping;
    152152                }
     
    240240                        /* Check if companion descriptor is present too, it should immediatelly follow. */
    241241                        const uint8_t *companion_desc = usb_dp_get_nested_descriptor(parser,
    242                                 parser_data, descriptor);
     242                            parser_data, descriptor);
    243243                        if (companion_desc && !is_superspeed_companion_descriptor(companion_desc)) {
    244244                                /* Not what we wanted, don't pass it further. */
     
    248248                        (void) process_endpoint(mapping, mapping_count,
    249249                            (usb_standard_interface_descriptor_t *)
    250                                 interface_descriptor,
     250                            interface_descriptor,
    251251                            (usb_standard_endpoint_descriptor_t *)
    252                                 descriptor,
     252                            descriptor,
    253253                            (usb_superspeed_endpoint_companion_descriptor_t *)
    254                                 companion_desc,
     254                            companion_desc,
    255255                            bus_session);
    256256                }
Note: See TracChangeset for help on using the changeset viewer.