Changes in uspace/lib/usb/src/recognise.c [687efaa:345ea18] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usb/src/recognise.c
r687efaa r345ea18 36 36 #include <usb_iface.h> 37 37 #include <usb/usbdrv.h> 38 #include <usb/pipes.h> 39 #include <usb/recognise.h> 40 #include <usb/request.h> 38 41 #include <usb/classes/classes.h> 39 42 #include <stdio.h> 40 43 #include <errno.h> 44 45 static size_t device_name_index = 0; 46 static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex); 41 47 42 48 /** Callback for getting host controller handle. … … 155 161 /* First, with release number. */ 156 162 rc = usb_add_match_id(matches, 100, 157 "usb&vendor= %d&product=%d&release=" BCD_FMT,163 "usb&vendor=0x%04x&product=0x%04x&release=" BCD_FMT, 158 164 (int) device_descriptor->vendor_id, 159 165 (int) device_descriptor->product_id, … … 164 170 165 171 /* Next, without release number. */ 166 rc = usb_add_match_id(matches, 90, "usb&vendor=%d&product=%d", 172 rc = usb_add_match_id(matches, 90, 173 "usb&vendor=0x%04x&product=0x%04x", 167 174 (int) device_descriptor->vendor_id, 168 175 (int) device_descriptor->product_id); … … 241 248 /** Add match ids based on configuration descriptor. 242 249 * 243 * @param hc Open phone to host controller.250 * @param pipe Control pipe to the device. 244 251 * @param matches Match ids list to add matches to. 245 * @param address USB address of the attached device.246 252 * @param config_count Number of configurations the device has. 247 253 * @return Error code. 248 254 */ 249 static int usb_add_config_descriptor_match_ids(int hc, 250 match_id_list_t *matches, usb_address_t address, 251 int config_count) 255 static int usb_add_config_descriptor_match_ids(usb_endpoint_pipe_t *pipe, 256 match_id_list_t *matches, int config_count) 252 257 { 253 258 int final_rc = EOK; … … 257 262 int rc; 258 263 usb_standard_configuration_descriptor_t config_descriptor; 259 rc = usb_ drv_req_get_bare_configuration_descriptor(hc,260 address,config_index, &config_descriptor);264 rc = usb_request_get_bare_configuration_descriptor(pipe, 265 config_index, &config_descriptor); 261 266 if (rc != EOK) { 262 267 final_rc = rc; … … 267 272 void *full_config_descriptor 268 273 = malloc(config_descriptor.total_length); 269 rc = usb_ drv_req_get_full_configuration_descriptor(hc,270 address,config_index,274 rc = usb_request_get_full_configuration_descriptor(pipe, 275 config_index, 271 276 full_config_descriptor, config_descriptor.total_length, 272 277 &full_config_descriptor_size); … … 299 304 * function exits with error. 300 305 * 301 * @param hc Open phone to host controller. 306 * @param ctrl_pipe Control pipe to given device (session must be already 307 * started). 302 308 * @param matches Initialized list of match ids. 303 * @param address USB address of the attached device. 304 * @return Error code. 305 */ 306 int usb_drv_create_device_match_ids(int hc, match_id_list_t *matches, 307 usb_address_t address) 309 * @return Error code. 310 */ 311 int usb_device_create_match_ids(usb_endpoint_pipe_t *ctrl_pipe, 312 match_id_list_t *matches) 308 313 { 309 314 int rc; 310 311 315 /* 312 316 * Retrieve device descriptor and add matches from it. … … 314 318 usb_standard_device_descriptor_t device_descriptor; 315 319 316 rc = usb_drv_req_get_device_descriptor(hc, address, 317 &device_descriptor); 320 rc = usb_request_get_device_descriptor(ctrl_pipe, &device_descriptor); 318 321 if (rc != EOK) { 319 322 return rc; 320 323 } 321 324 322 325 rc = usb_drv_create_match_ids_from_device_descriptor(matches, 323 326 &device_descriptor); … … 325 328 return rc; 326 329 } 327 330 328 331 /* 329 332 * Go through all configurations and add matches 330 333 * based on interface class. 331 334 */ 332 rc = usb_add_config_descriptor_match_ids( hc, matches,333 address,device_descriptor.configuration_count);335 rc = usb_add_config_descriptor_match_ids(ctrl_pipe, matches, 336 device_descriptor.configuration_count); 334 337 if (rc != EOK) { 335 338 return rc; … … 347 350 } 348 351 349 350 352 /** Probe for device kind and register it in devman. 351 353 * 352 * @param[in] hc Open phone to the host controller. 354 * @param[in] address Address of the (unknown) attached device. 355 * @param[in] hc_handle Handle of the host controller. 353 356 * @param[in] parent Parent device. 354 * @param[in] address Address of the (unknown) attached device.355 357 * @param[out] child_handle Handle of the child device. 356 358 * @return Error code. 357 359 */ 358 int usb_drv_register_child_in_devman(int hc, device_t *parent, 359 usb_address_t address, devman_handle_t *child_handle) 360 { 361 static size_t device_name_index = 0; 362 static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex); 363 360 int usb_device_register_child_in_devman(usb_address_t address, 361 devman_handle_t hc_handle, 362 device_t *parent, devman_handle_t *child_handle) 363 { 364 364 size_t this_device_name_index; 365 365 … … 369 369 fibril_mutex_unlock(&device_name_index_mutex); 370 370 371 372 371 device_t *child = NULL; 373 372 char *child_name = NULL; 374 373 int rc; 374 usb_device_connection_t dev_connection; 375 usb_endpoint_pipe_t ctrl_pipe; 376 377 rc = usb_device_connection_initialize(&dev_connection, hc_handle, address); 378 if (rc != EOK) { 379 goto failure; 380 } 381 382 rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe, 383 &dev_connection); 384 if (rc != EOK) { 385 goto failure; 386 } 375 387 376 388 child = create_device(); … … 391 403 child->name = child_name; 392 404 child->ops = &child_ops; 393 394 rc = usb_drv_create_device_match_ids(hc, &child->match_ids, address); 405 406 rc = usb_endpoint_pipe_start_session(&ctrl_pipe); 407 if (rc != EOK) { 408 goto failure; 409 } 410 411 rc = usb_device_create_match_ids(&ctrl_pipe, &child->match_ids); 412 if (rc != EOK) { 413 goto failure; 414 } 415 416 rc = usb_endpoint_pipe_end_session(&ctrl_pipe); 395 417 if (rc != EOK) { 396 418 goto failure; … … 405 427 *child_handle = child->handle; 406 428 } 407 429 408 430 return EOK; 409 431 … … 419 441 420 442 return rc; 421 422 443 } 423 444
Note:
See TracChangeset
for help on using the changeset viewer.