Ignore:
File:
1 edited

Legend:

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

    r58563585 r1cf26ab  
    3434 *
    3535 */
     36#include <usb/usb.h>
    3637#include <usb/dev/pipes.h>
    3738#include <usb/dev/dp.h>
    3839#include <usb/dev/request.h>
    39 #include <usb/usb.h>
    40 #include <usb/descriptor.h>
    41 
     40#include <errno.h>
    4241#include <assert.h>
    43 #include <errno.h>
    4442
    4543#define DEV_DESCR_MAX_PACKET_SIZE_OFFSET 7
     
    150148 * @param interface Interface descriptor under which belongs the @p endpoint.
    151149 * @param endpoint Endpoint descriptor.
     150 * @param wire Connection backing the endpoint pipes.
    152151 * @return Error code.
    153152 */
     
    156155    usb_standard_interface_descriptor_t *interface,
    157156    usb_standard_endpoint_descriptor_t *endpoint_desc,
    158     usb_dev_session_t *bus_session)
     157    usb_device_connection_t *wire)
    159158{
    160159
     
    194193        }
    195194
    196         int rc = usb_pipe_initialize(&ep_mapping->pipe,
     195        int rc = usb_pipe_initialize(&ep_mapping->pipe, wire,
    197196            ep_no, description.transfer_type,
    198             ED_MPS_PACKET_SIZE_GET(
    199                 uint16_usb2host(endpoint_desc->max_packet_size)),
    200             description.direction,
    201             ED_MPS_TRANS_OPPORTUNITIES_GET(
    202                 uint16_usb2host(endpoint_desc->max_packet_size)), bus_session);
     197            uint16_usb2host(endpoint_desc->max_packet_size),
     198            description.direction);
    203199        if (rc != EOK) {
    204200                return rc;
     
    224220    usb_endpoint_mapping_t *mapping, size_t mapping_count,
    225221    const usb_dp_parser_t *parser, const usb_dp_parser_data_t *parser_data,
    226     const uint8_t *interface_descriptor, usb_dev_session_t *bus_session)
     222    const uint8_t *interface_descriptor)
    227223{
    228224        const uint8_t *descriptor = usb_dp_get_nested_descriptor(parser,
     
    240236                            (usb_standard_endpoint_descriptor_t *)
    241237                                descriptor,
    242                             bus_session);
     238                            (usb_device_connection_t *) parser_data->arg);
    243239                }
    244240
     
    284280    usb_endpoint_mapping_t *mapping, size_t mapping_count,
    285281    const uint8_t *config_descriptor, size_t config_descriptor_size,
    286     usb_dev_session_t *bus_session)
    287 {
    288         if (config_descriptor == NULL)
     282    usb_device_connection_t *connection)
     283{
     284        assert(connection);
     285
     286        if (config_descriptor == NULL) {
    289287                return EBADMEM;
    290        
    291         if (config_descriptor_size <
    292             sizeof(usb_standard_configuration_descriptor_t)) {
     288        }
     289        if (config_descriptor_size
     290            < sizeof(usb_standard_configuration_descriptor_t)) {
    293291                return ERANGE;
    294292        }
     
    308306                .data = config_descriptor,
    309307                .size = config_descriptor_size,
     308                .arg = connection
    310309        };
    311310
     
    320319        do {
    321320                (void) process_interface(mapping, mapping_count,
    322                     &dp_parser, &dp_data, interface, bus_session);
     321                    &dp_parser, &dp_data, interface);
    323322                interface = usb_dp_get_sibling_descriptor(&dp_parser, &dp_data,
    324323                    config_descriptor, interface);
     
    348347                return EINVAL;
    349348        }
     349
     350
     351        usb_pipe_start_long_transfer(pipe);
    350352
    351353        uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];
     
    365367                }
    366368        }
     369        usb_pipe_end_long_transfer(pipe);
    367370        if (rc != EOK) {
    368371                return rc;
Note: See TracChangeset for help on using the changeset viewer.