Changes in uspace/lib/usbdev/src/hub.c [2179cf95:fb422312] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbdev/src/hub.c
r2179cf95 rfb422312 66 66 * 67 67 * @param connection Opened connection to host controller. 68 * @param preferred Preferred SUB address.69 * @param strict Fail if the preferred address is not avialable.70 68 * @param speed Speed of the new device (device that will be assigned 71 69 * the returned address). … … 73 71 */ 74 72 usb_address_t usb_hc_request_address(usb_hc_connection_t *connection, 75 usb_ address_t preferred, bool strict, usb_speed_t speed)73 usb_speed_t speed) 76 74 { 77 75 CHECK_CONNECTION(connection); … … 80 78 81 79 sysarg_t address; 82 int rc = async_req_4_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), 83 IPC_M_USBHC_REQUEST_ADDRESS, preferred, strict, speed, &address); 80 int rc = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), 81 IPC_M_USBHC_REQUEST_ADDRESS, speed, 82 &address); 84 83 85 84 async_exchange_end(exch); … … 133 132 } 134 133 135 /** Change address of connected device. 136 * This function automatically updates the backing connection to point to 137 * the new address. It also unregisterrs the old endpoint and registers 138 * a new one. 139 * This creates whole bunch of problems: 140 * 1. All pipes using this wire are broken because they are not 141 * registered for new address 142 * 2. All other pipes for this device are using wrong address, 143 * possibly targeting completely different device 144 * 145 * @param pipe Control endpoint pipe (session must be already started). 146 * @param new_address New USB address to be set (in native endianness). 147 * @return Error code. 148 */ 149 static int usb_request_set_address(usb_pipe_t *pipe, usb_address_t new_address, 150 usb_hc_connection_t *hc_conn) 151 { 152 if ((new_address < 0) || (new_address >= USB11_ADDRESS_MAX)) { 153 return EINVAL; 154 } 155 assert(pipe); 156 assert(hc_conn); 157 assert(pipe->wire != NULL); 158 159 const uint16_t addr = uint16_host2usb((uint16_t)new_address); 160 161 int rc = usb_control_request_set(pipe, 162 USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE, 163 USB_DEVREQ_SET_ADDRESS, addr, 0, NULL, 0); 164 165 if (rc != EOK) { 166 return rc; 167 } 168 169 /* TODO: prevent others from accessing the wire now. */ 170 if (usb_pipe_unregister(pipe, hc_conn) != EOK) { 171 usb_log_warning( 172 "Failed to unregister the old pipe on address change.\n"); 173 } 174 /* The address is already changed so set it in the wire */ 175 pipe->wire->address = new_address; 176 rc = usb_pipe_register(pipe, 0, hc_conn); 177 if (rc != EOK) 178 return EADDRNOTAVAIL; 179 180 return EOK; 134 135 static void unregister_control_endpoint_on_default_address( 136 usb_hc_connection_t *connection) 137 { 138 usb_device_connection_t dev_conn; 139 int rc = usb_device_connection_initialize_on_default_address(&dev_conn, 140 connection); 141 if (rc != EOK) { 142 return; 143 } 144 145 usb_pipe_t ctrl_pipe; 146 rc = usb_pipe_initialize_default_control(&ctrl_pipe, &dev_conn); 147 if (rc != EOK) { 148 return; 149 } 150 151 usb_pipe_unregister(&ctrl_pipe, connection); 181 152 } 182 153 … … 200 171 * 201 172 * @param[in] parent Parent device (i.e. the hub device). 202 * @param[in] connection Connection to host controller. Must be non-null.173 * @param[in] connection Connection to host controller. 203 174 * @param[in] dev_speed New device speed. 204 175 * @param[in] enable_port Function for enabling signaling through the port the … … 206 177 * @param[in] arg Any data argument to @p enable_port. 207 178 * @param[out] assigned_address USB address of the device. 208 * @param[in] dev_ops Child device ops. Will use default if not provided.179 * @param[in] dev_ops Child device ops. 209 180 * @param[in] new_dev_data Arbitrary pointer to be stored in the child 210 * as @c driver_data. Will allocate and assign usb_hub_attached_device_t 211 * structure if NULL. 181 * as @c driver_data. 212 182 * @param[out] new_fun Storage where pointer to allocated child function 213 * will be written. Must be non-null.183 * will be written. 214 184 * @return Error code. 215 * @retval EINVAL Either connection or new_fun is a NULL pointer.216 185 * @retval ENOENT Connection to HC not opened. 217 186 * @retval EADDRNOTAVAIL Failed retrieving free address from host controller. … … 226 195 ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun) 227 196 { 228 if (new_fun == NULL || connection == NULL) 229 return EINVAL; 230 197 assert(connection != NULL); 231 198 // FIXME: this is awful, we are accessing directly the structure. 232 // TODO: Why not use provided connection?233 199 usb_hc_connection_t hc_conn = { 234 200 .hc_handle = connection->hc_handle, … … 249 215 } 250 216 217 251 218 /* 252 219 * Request new address. 253 220 */ 254 usb_address_t dev_addr = 255 usb_hc_request_address(&hc_conn, 0, false, dev_speed); 221 usb_address_t dev_addr = usb_hc_request_address(&hc_conn, dev_speed); 256 222 if (dev_addr < 0) { 257 223 rc = EADDRNOTAVAIL; … … 274 240 275 241 usb_pipe_t ctrl_pipe; 276 rc = usb_pipe_initialize_default_control(&ctrl_pipe, &dev_conn); 242 rc = usb_pipe_initialize_default_control(&ctrl_pipe, 243 &dev_conn); 277 244 if (rc != EOK) { 278 245 rc = ENOTCONN; … … 281 248 282 249 do { 283 rc = usb_ hc_request_address(&hc_conn, USB_ADDRESS_DEFAULT,284 true, dev_speed);285 if (rc == ENOENT) {250 rc = usb_pipe_register_with_speed(&ctrl_pipe, dev_speed, 0, 251 &hc_conn); 252 if (rc != EOK) { 286 253 /* Do not overheat the CPU ;-). */ 287 254 async_usleep(ENDPOINT_0_0_REGISTER_ATTEMPT_DELAY_USEC); 288 255 } 289 } while (rc == ENOENT); 290 if (rc < 0) { 291 goto leave_release_free_address; 292 } 293 294 /* Register control pipe on default address. */ 295 rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn); 296 if (rc != EOK) { 297 rc = ENOTCONN; 298 goto leave_release_default_address; 299 } 300 256 } while (rc != EOK); 301 257 struct timeval end_time; 302 258 … … 311 267 * above might use much of this time so we should only wait to fill 312 268 * up the 100ms quota*/ 313 constsuseconds_t elapsed = tv_sub(&end_time, &start_time);269 suseconds_t elapsed = tv_sub(&end_time, &start_time); 314 270 if (elapsed < 100000) { 315 271 async_usleep(100000 - elapsed); 316 272 } 317 273 318 /* Endpoint is registered. We can enable the port and change address. */ 274 /* 275 * Endpoint is registered. We can enable the port and change 276 * device address. 277 */ 319 278 rc = enable_port(arg); 320 279 if (rc != EOK) { … … 328 287 async_usleep(10000); 329 288 330 /* Get max_packet_size value. */331 289 rc = usb_pipe_probe_default_control(&ctrl_pipe); 332 290 if (rc != EOK) { … … 335 293 } 336 294 337 rc = usb_request_set_address(&ctrl_pipe, dev_addr , &hc_conn);295 rc = usb_request_set_address(&ctrl_pipe, dev_addr); 338 296 if (rc != EOK) { 339 297 rc = ESTALL; … … 341 299 } 342 300 343 /* Address changed. We can release the default, thus 344 * allowing other to access the default address. */ 345 usb_hc_unregister_device(&hc_conn, USB_ADDRESS_DEFAULT); 346 347 /* Register the device with devman. */ 301 /* 302 * Address changed. We can release the original endpoint, thus 303 * allowing other to access the default address. 304 */ 305 unregister_control_endpoint_on_default_address(&hc_conn); 306 307 /* 308 * Time to register the new endpoint. 309 */ 310 rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn); 311 if (rc != EOK) { 312 goto leave_release_free_address; 313 } 314 315 /* 316 * It is time to register the device with devman. 317 */ 348 318 /* FIXME: create device_register that will get opened ctrl pipe. */ 349 319 ddf_fun_t *child_fun; 350 rc = usb_device_register_child_in_devman( &ctrl_pipe,320 rc = usb_device_register_child_in_devman(dev_addr, dev_conn.hc_handle, 351 321 parent, dev_ops, new_dev_data, &child_fun); 352 322 if (rc != EOK) { 353 goto leave_release_free_address; 354 } 355 356 const usb_hub_attached_device_t new_device = { 323 rc = ESTALL; 324 goto leave_release_free_address; 325 } 326 327 /* 328 * And now inform the host controller about the handle. 329 */ 330 usb_hub_attached_device_t new_device = { 357 331 .address = dev_addr, 358 332 .fun = child_fun, 359 333 }; 360 361 362 /* Inform the host controller about the handle. */363 334 rc = usb_hc_register_device(&hc_conn, &new_device); 364 335 if (rc != EOK) { 365 /* We know nothing about that data. */366 if (new_dev_data)367 child_fun->driver_data = NULL;368 /* The child function is already created. */369 ddf_fun_destroy(child_fun);370 336 rc = EDESTADDRREQ; 371 337 goto leave_release_free_address; 372 338 } 373 339 340 341 /* 342 * And we are done. 343 */ 374 344 if (assigned_address != NULL) { 375 345 *assigned_address = dev_addr; 376 346 } 377 378 *new_fun = child_fun; 347 if (new_fun != NULL) { 348 *new_fun = child_fun; 349 } 379 350 380 351 rc = EOK; … … 386 357 */ 387 358 leave_release_default_address: 388 usb_ hc_unregister_device(&hc_conn, USB_ADDRESS_DEFAULT);359 usb_pipe_unregister(&ctrl_pipe, &hc_conn); 389 360 390 361 leave_release_free_address: 391 /* This might be either 0:0 or dev_addr:0 */ 392 if (usb_pipe_unregister(&ctrl_pipe, &hc_conn) != EOK) 393 usb_log_warning("%s: Failed to unregister default pipe.\n", 394 __FUNCTION__); 395 396 if (usb_hc_unregister_device(&hc_conn, dev_addr) != EOK) 397 usb_log_warning("%s: Failed to unregister device.\n", 398 __FUNCTION__); 362 usb_hc_unregister_device(&hc_conn, dev_addr); 399 363 400 364 close_connection: 401 365 if (usb_hc_connection_close(&hc_conn) != EOK) 402 usb_log_warning(" %s: Failed to close hc connection.\n",403 __FUNCTION__);366 usb_log_warning("usb_hc_new_device_wrapper(): Failed to close " 367 "connection.\n"); 404 368 405 369 return rc;
Note:
See TracChangeset
for help on using the changeset viewer.