Changes in uspace/lib/usbdev/src/hub.c [ffa96c2:56fd7cf] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbdev/src/hub.c
rffa96c2 r56fd7cf 155 155 * request or requests for descriptors when creating match ids). 156 156 */ 157 int usb_hc_new_device_wrapper(ddf_dev_t *parent, ddf_fun_t *fun,157 int usb_hc_new_device_wrapper(ddf_dev_t *parent, 158 158 usb_hc_connection_t *hc_conn, usb_speed_t dev_speed, 159 159 int (*enable_port)(void *arg), void *arg, usb_address_t *assigned_address, 160 ddf_dev_ops_t *dev_ops )160 ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun) 161 161 { 162 if ( hc_conn == NULL)162 if ((new_fun == NULL) || (hc_conn == NULL)) 163 163 return EINVAL; 164 164 … … 271 271 /* Register the device with devman. */ 272 272 /* FIXME: create device_register that will get opened ctrl pipe. */ 273 ddf_fun_t *child_fun; 273 274 rc = usb_device_register_child_in_devman(&ctrl_pipe, 274 parent, fun, dev_ops);275 parent, dev_ops, new_dev_data, &child_fun); 275 276 if (rc != EOK) { 276 277 goto leave_release_free_address; … … 279 280 const usb_hub_attached_device_t new_device = { 280 281 .address = dev_addr, 281 .fun = fun,282 .fun = child_fun, 282 283 }; 283 284 … … 287 288 if (rc != EOK) { 288 289 /* The child function is already created. */ 290 ddf_fun_destroy(child_fun); 289 291 rc = EDESTADDRREQ; 290 292 goto leave_release_free_address; … … 294 296 *assigned_address = dev_addr; 295 297 } 298 299 *new_fun = child_fun; 296 300 297 301 rc = EOK;
Note:
See TracChangeset
for help on using the changeset viewer.