Changes in uspace/drv/vhc/connhost.c [46e078a:357a302] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/vhc/connhost.c
r46e078a r357a302 48 48 usbhc_iface_transfer_out_callback_t out_callback; 49 49 usbhc_iface_transfer_in_callback_t in_callback; 50 d df_fun_t *fun;50 device_t *dev; 51 51 size_t reported_size; 52 52 void *arg; … … 58 58 usbhc_iface_transfer_out_callback_t out_callback; 59 59 usbhc_iface_transfer_in_callback_t in_callback; 60 d df_fun_t *fun;60 device_t *dev; 61 61 void *arg; 62 62 void *data_buffer; … … 75 75 switch (transfer->direction) { 76 76 case USB_DIRECTION_IN: 77 transfer->in_callback(transfer-> fun,77 transfer->in_callback(transfer->dev, 78 78 outcome, size, 79 79 transfer->arg); 80 80 break; 81 81 case USB_DIRECTION_OUT: 82 transfer->out_callback(transfer-> fun,82 transfer->out_callback(transfer->dev, 83 83 outcome, 84 84 transfer->arg); … … 92 92 } 93 93 94 static transfer_info_t *create_transfer_info(d df_fun_t *fun,94 static transfer_info_t *create_transfer_info(device_t *dev, 95 95 usb_direction_t direction, void *arg) 96 96 { … … 101 101 transfer->out_callback = NULL; 102 102 transfer->arg = arg; 103 transfer-> fun = fun;103 transfer->dev = dev; 104 104 transfer->reported_size = (size_t) -1; 105 105 … … 112 112 switch (transfer->direction) { 113 113 case USB_DIRECTION_IN: 114 transfer->in_callback(transfer-> fun,114 transfer->in_callback(transfer->dev, 115 115 outcome, size, 116 116 transfer->arg); 117 117 break; 118 118 case USB_DIRECTION_OUT: 119 transfer->out_callback(transfer-> fun,119 transfer->out_callback(transfer->dev, 120 120 outcome, 121 121 transfer->arg); … … 138 138 } 139 139 140 transfer_info_t *transfer = create_transfer_info(ctrl_transfer-> fun,140 transfer_info_t *transfer = create_transfer_info(ctrl_transfer->dev, 141 141 ctrl_transfer->direction, ctrl_transfer->arg); 142 142 transfer->out_callback = ctrl_transfer->out_callback; … … 195 195 } 196 196 197 static control_transfer_info_t *create_control_transfer_info(d df_fun_t *fun,197 static control_transfer_info_t *create_control_transfer_info(device_t *dev, 198 198 usb_direction_t direction, usb_target_t target, 199 199 void *data_buffer, size_t data_buffer_size, … … 208 208 transfer->out_callback = NULL; 209 209 transfer->arg = arg; 210 transfer-> fun = fun;210 transfer->dev = dev; 211 211 transfer->data_buffer = data_buffer; 212 212 transfer->data_buffer_size = data_buffer_size; … … 215 215 } 216 216 217 static int enqueue_transfer_out(d df_fun_t *fun,217 static int enqueue_transfer_out(device_t *dev, 218 218 usb_target_t target, usb_transfer_type_t transfer_type, 219 219 void *buffer, size_t size, … … 226 226 227 227 transfer_info_t *transfer 228 = create_transfer_info( fun, USB_DIRECTION_OUT, arg);228 = create_transfer_info(dev, USB_DIRECTION_OUT, arg); 229 229 transfer->out_callback = callback; 230 230 … … 235 235 } 236 236 237 static int enqueue_transfer_in(d df_fun_t *fun,237 static int enqueue_transfer_in(device_t *dev, 238 238 usb_target_t target, usb_transfer_type_t transfer_type, 239 239 void *buffer, size_t size, … … 246 246 247 247 transfer_info_t *transfer 248 = create_transfer_info( fun, USB_DIRECTION_IN, arg);248 = create_transfer_info(dev, USB_DIRECTION_IN, arg); 249 249 transfer->in_callback = callback; 250 250 … … 256 256 257 257 258 static int interrupt_out(ddf_fun_t *fun, usb_target_t target, 258 static int interrupt_out(device_t *dev, usb_target_t target, 259 size_t max_packet_size, 259 260 void *data, size_t size, 260 261 usbhc_iface_transfer_out_callback_t callback, void *arg) 261 262 { 262 return enqueue_transfer_out( fun, target, USB_TRANSFER_INTERRUPT,263 return enqueue_transfer_out(dev, target, USB_TRANSFER_INTERRUPT, 263 264 data, size, 264 265 callback, arg); 265 266 } 266 267 267 static int interrupt_in(ddf_fun_t *fun, usb_target_t target, 268 static int interrupt_in(device_t *dev, usb_target_t target, 269 size_t max_packet_size, 268 270 void *data, size_t size, 269 271 usbhc_iface_transfer_in_callback_t callback, void *arg) 270 272 { 271 return enqueue_transfer_in( fun, target, USB_TRANSFER_INTERRUPT,273 return enqueue_transfer_in(dev, target, USB_TRANSFER_INTERRUPT, 272 274 data, size, 273 275 callback, arg); 274 276 } 275 277 276 static int control_write(ddf_fun_t *fun, usb_target_t target, 278 static int control_write(device_t *dev, usb_target_t target, 279 size_t max_packet_size, 277 280 void *setup_packet, size_t setup_packet_size, 278 281 void *data, size_t data_size, … … 280 283 { 281 284 control_transfer_info_t *transfer 282 = create_control_transfer_info( fun, USB_DIRECTION_OUT, target,285 = create_control_transfer_info(dev, USB_DIRECTION_OUT, target, 283 286 data, data_size, arg); 284 287 transfer->out_callback = callback; … … 291 294 } 292 295 293 static int control_read(ddf_fun_t *fun, usb_target_t target, 296 static int control_read(device_t *dev, usb_target_t target, 297 size_t max_packet_size, 294 298 void *setup_packet, size_t setup_packet_size, 295 299 void *data, size_t data_size, … … 297 301 { 298 302 control_transfer_info_t *transfer 299 = create_control_transfer_info( fun, USB_DIRECTION_IN, target,303 = create_control_transfer_info(dev, USB_DIRECTION_IN, target, 300 304 data, data_size, arg); 301 305 transfer->in_callback = callback; … … 310 314 static usb_address_keeping_t addresses; 311 315 312 static int tell_address(d df_fun_t *fun, devman_handle_t handle,316 static int tell_address(device_t *dev, devman_handle_t handle, 313 317 usb_address_t *address) 314 318 { 315 usb_log_debug("tell_address(fun \"%s\", handle %zu)\n",316 fun->name, (size_t) fun->handle);317 319 usb_address_t addr = usb_address_keeping_find(&addresses, handle); 318 320 if (addr < 0) { … … 324 326 } 325 327 326 static int request_address(ddf_fun_t *fun, usb_speed_t ignored, 328 static int reserve_default_address(device_t *dev, usb_speed_t ignored) 329 { 330 usb_address_keeping_reserve_default(&addresses); 331 return EOK; 332 } 333 334 static int release_default_address(device_t *dev) 335 { 336 usb_address_keeping_release_default(&addresses); 337 return EOK; 338 } 339 340 static int request_address(device_t *dev, usb_speed_t ignored, 327 341 usb_address_t *address) 328 342 { … … 336 350 } 337 351 338 static int release_address(d df_fun_t *fun, usb_address_t address)352 static int release_address(device_t *dev, usb_address_t address) 339 353 { 340 354 return usb_address_keeping_release(&addresses, address); 341 355 } 342 356 343 static int bind_address(d df_fun_t *fun, usb_address_t address,357 static int bind_address(device_t *dev, usb_address_t address, 344 358 devman_handle_t handle) 345 359 { … … 348 362 } 349 363 350 static int usb_iface_get_hc_handle_rh_impl(ddf_fun_t *root_hub_fun,351 devman_handle_t *handle)352 {353 ddf_fun_t *hc_fun = root_hub_fun->driver_data;354 assert(hc_fun != NULL);355 356 *handle = hc_fun->handle;357 358 usb_log_debug("usb_iface_get_hc_handle_rh_impl returns %zu\n", *handle);359 360 return EOK;361 }362 363 static int tell_address_rh(ddf_fun_t *root_hub_fun, devman_handle_t handle,364 usb_address_t *address)365 {366 ddf_fun_t *hc_fun = root_hub_fun->driver_data;367 assert(hc_fun != NULL);368 369 return tell_address(hc_fun, root_hub_fun->handle, address);370 }371 372 364 void address_init(void) 373 365 { … … 376 368 377 369 usbhc_iface_t vhc_iface = { 370 .reserve_default_address = reserve_default_address, 371 .release_default_address = release_default_address, 378 372 .request_address = request_address, 379 373 .bind_address = bind_address, … … 392 386 }; 393 387 394 usb_iface_t rh_usb_iface = {395 .get_hc_handle = usb_iface_get_hc_handle_rh_impl,396 .get_address = tell_address_rh397 };398 399 388 400 389 /**
Note:
See TracChangeset
for help on using the changeset viewer.