Changeset 90994fa in mainline for uspace/drv/bus/usb/uhcirh/port.c
- Timestamp:
- 2011-10-12T20:03:36Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 162726b
- Parents:
- 205f0766
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/uhcirh/port.c
r205f0766 r90994fa 100 100 port->number = number; 101 101 port->wait_period_usec = usec; 102 port->attached_device. handle = 0;102 port->attached_device.fun = NULL; 103 103 port->attached_device.address = -1; 104 104 port->rh = rh; … … 169 169 170 170 /* Remove any old device */ 171 if (instance->attached_device. handle) {171 if (instance->attached_device.fun) { 172 172 usb_log_debug2("%s: Removing device.\n", 173 173 instance->id_string); … … 261 261 ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection, 262 262 speed, uhci_port_reset_enable, port->number, port, 263 &port->attached_device.address, 264 &port->attached_device. handle, NULL, NULL, NULL);263 &port->attached_device.address, NULL, NULL, NULL, 264 &port->attached_device.fun); 265 265 } while (ret != EOK && ++count < 4); 266 266 … … 274 274 usb_log_info("New device at port %u, address %d (handle %" PRIun ").\n", 275 275 port->number, port->attached_device.address, 276 port->attached_device. handle);276 port->attached_device.fun->handle); 277 277 return EOK; 278 278 } … … 287 287 assert(port); 288 288 /* There is nothing to remove. */ 289 if (port->attached_device. handle == 0) {289 if (port->attached_device.fun == NULL) { 290 290 usb_log_warning("%s: Removed a ghost device.\n", 291 291 port->id_string); … … 297 297 298 298 /* Stop driver first */ 299 int ret = d evman_remove_function(port->attached_device.handle);299 int ret = ddf_fun_unbind(port->attached_device.fun); 300 300 if (ret != EOK) { 301 301 usb_log_error("%s: Failed to remove child function: %s.\n", … … 303 303 return ret; 304 304 } 305 port->attached_device.handle = 0; 305 ddf_fun_destroy(port->attached_device.fun); 306 port->attached_device.fun = NULL; 306 307 307 308 /* Driver stopped, free used address */
Note:
See TracChangeset
for help on using the changeset viewer.