Changes in uspace/lib/usbdev/src/pipesinit.c [9d58539:8582076] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbdev/src/pipesinit.c
r9d58539 r8582076 154 154 usb_endpoint_mapping_t *mapping, size_t mapping_count, 155 155 usb_standard_interface_descriptor_t *interface, 156 usb_standard_endpoint_descriptor_t *endpoint ,157 usb_device_connection_t *wire )156 usb_standard_endpoint_descriptor_t *endpoint_desc, 157 usb_device_connection_t *wire, usb_dev_session_t *bus_session) 158 158 { 159 159 … … 163 163 164 164 /* Actual endpoint number is in bits 0..3 */ 165 const usb_endpoint_t ep_no = endpoint ->endpoint_address & 0x0F;165 const usb_endpoint_t ep_no = endpoint_desc->endpoint_address & 0x0F; 166 166 167 167 const usb_endpoint_description_t description = { 168 168 /* Endpoint direction is set by bit 7 */ 169 .direction = (endpoint ->endpoint_address & 128)169 .direction = (endpoint_desc->endpoint_address & 128) 170 170 ? USB_DIRECTION_IN : USB_DIRECTION_OUT, 171 171 /* Transfer type is in bits 0..2 and 172 172 * the enum values corresponds 1:1 */ 173 .transfer_type = endpoint ->attributes & 3,173 .transfer_type = endpoint_desc->attributes & 3, 174 174 175 175 /* Get interface characteristics. */ … … 194 194 195 195 int rc = usb_pipe_initialize(&ep_mapping->pipe, wire, 196 ep_no, description.transfer_type, endpoint->max_packet_size, 197 description.direction); 196 ep_no, description.transfer_type, 197 uint16_usb2host(endpoint_desc->max_packet_size), 198 description.direction, bus_session); 198 199 if (rc != EOK) { 199 200 return rc; … … 201 202 202 203 ep_mapping->present = true; 203 ep_mapping->descriptor = endpoint ;204 ep_mapping->descriptor = endpoint_desc; 204 205 ep_mapping->interface = interface; 205 206 … … 219 220 usb_endpoint_mapping_t *mapping, size_t mapping_count, 220 221 const usb_dp_parser_t *parser, const usb_dp_parser_data_t *parser_data, 221 const uint8_t *interface_descriptor )222 const uint8_t *interface_descriptor, usb_dev_session_t *bus_session) 222 223 { 223 224 const uint8_t *descriptor = usb_dp_get_nested_descriptor(parser, … … 235 236 (usb_standard_endpoint_descriptor_t *) 236 237 descriptor, 237 (usb_device_connection_t *) parser_data->arg); 238 (usb_device_connection_t *) parser_data->arg, 239 bus_session); 238 240 } 239 241 … … 279 281 usb_endpoint_mapping_t *mapping, size_t mapping_count, 280 282 const uint8_t *config_descriptor, size_t config_descriptor_size, 281 usb_device_connection_t *connection )283 usb_device_connection_t *connection, usb_dev_session_t *bus_session) 282 284 { 283 285 assert(connection); … … 318 320 do { 319 321 (void) process_interface(mapping, mapping_count, 320 &dp_parser, &dp_data, interface );322 &dp_parser, &dp_data, interface, bus_session); 321 323 interface = usb_dp_get_sibling_descriptor(&dp_parser, &dp_data, 322 324 config_descriptor, interface);
Note:
See TracChangeset
for help on using the changeset viewer.