Index: uspace/drv/vhc/conn.h =================================================================== --- uspace/drv/vhc/conn.h (revision f0da4eb258211882fbaa5e4b83d61b5fa8df0861) +++ uspace/drv/vhc/conn.h (revision 43178271ecca79c7c77563dbd2a252faa9b39f82) @@ -38,4 +38,5 @@ #include #include +#include #include "vhcd.h" #include "devices.h" @@ -44,4 +45,5 @@ usb_hcd_transfer_ops_t vhc_transfer_ops; +usbhc_iface_t vhc_iface; void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *); Index: uspace/drv/vhc/connhost.c =================================================================== --- uspace/drv/vhc/connhost.c (revision f0da4eb258211882fbaa5e4b83d61b5fa8df0861) +++ uspace/drv/vhc/connhost.c (revision 43178271ecca79c7c77563dbd2a252faa9b39f82) @@ -43,7 +43,7 @@ typedef struct { usb_direction_t direction; - usb_hcd_transfer_callback_out_t out_callback; - usb_hcd_transfer_callback_in_t in_callback; - usb_hc_device_t *hc; + usbhc_iface_transfer_out_callback_t out_callback; + usbhc_iface_transfer_in_callback_t in_callback; + device_t *dev; void *arg; } transfer_info_t; @@ -56,10 +56,10 @@ switch (transfer->direction) { case USB_DIRECTION_IN: - transfer->in_callback(transfer->hc, + transfer->in_callback(transfer->dev, size, outcome, transfer->arg); break; case USB_DIRECTION_OUT: - transfer->out_callback(transfer->hc, + transfer->out_callback(transfer->dev, outcome, transfer->arg); @@ -73,5 +73,5 @@ } -static transfer_info_t *create_transfer_info(usb_hc_device_t *hc, +static transfer_info_t *create_transfer_info(device_t *dev, usb_direction_t direction, void *arg) { @@ -82,27 +82,22 @@ transfer->out_callback = NULL; transfer->arg = arg; - transfer->hc = hc; + transfer->dev = dev; return transfer; } -static int enqueue_transfer_out(usb_hc_device_t *hc, - usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *endpoint, +static int enqueue_transfer_out(device_t *dev, + usb_target_t target, usb_transfer_type_t transfer_type, void *buffer, size_t size, - usb_hcd_transfer_callback_out_t callback, void *arg) + usbhc_iface_transfer_out_callback_t callback, void *arg) { printf(NAME ": transfer OUT [%d.%d (%s); %u]\n", - dev->address, endpoint->endpoint, - usb_str_transfer_type(endpoint->transfer_type), + target.address, target.endpoint, + usb_str_transfer_type(transfer_type), size); transfer_info_t *transfer - = create_transfer_info(hc, USB_DIRECTION_OUT, arg); + = create_transfer_info(dev, USB_DIRECTION_OUT, arg); transfer->out_callback = callback; - - usb_target_t target = { - .address = dev->address, - .endpoint = endpoint->endpoint - }; hc_add_transaction_to_device(false, target, buffer, size, @@ -112,22 +107,17 @@ } -static int enqueue_transfer_setup(usb_hc_device_t *hc, - usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *endpoint, +static int enqueue_transfer_setup(device_t *dev, + usb_target_t target, usb_transfer_type_t transfer_type, void *buffer, size_t size, - usb_hcd_transfer_callback_out_t callback, void *arg) + usbhc_iface_transfer_out_callback_t callback, void *arg) { printf(NAME ": transfer SETUP [%d.%d (%s); %u]\n", - dev->address, endpoint->endpoint, - usb_str_transfer_type(endpoint->transfer_type), + target.address, target.endpoint, + usb_str_transfer_type(transfer_type), size); transfer_info_t *transfer - = create_transfer_info(hc, USB_DIRECTION_OUT, arg); + = create_transfer_info(dev, USB_DIRECTION_OUT, arg); transfer->out_callback = callback; - - usb_target_t target = { - .address = dev->address, - .endpoint = endpoint->endpoint - }; hc_add_transaction_to_device(true, target, buffer, size, @@ -137,22 +127,17 @@ } -static int enqueue_transfer_in(usb_hc_device_t *hc, - usb_hcd_attached_device_info_t *dev, usb_hc_endpoint_info_t *endpoint, +static int enqueue_transfer_in(device_t *dev, + usb_target_t target, usb_transfer_type_t transfer_type, void *buffer, size_t size, - usb_hcd_transfer_callback_in_t callback, void *arg) + usbhc_iface_transfer_in_callback_t callback, void *arg) { printf(NAME ": transfer IN [%d.%d (%s); %u]\n", - dev->address, endpoint->endpoint, - usb_str_transfer_type(endpoint->transfer_type), + target.address, target.endpoint, + usb_str_transfer_type(transfer_type), size); transfer_info_t *transfer - = create_transfer_info(hc, USB_DIRECTION_IN, arg); + = create_transfer_info(dev, USB_DIRECTION_IN, arg); transfer->in_callback = callback; - - usb_target_t target = { - .address = dev->address, - .endpoint = endpoint->endpoint - }; hc_add_transaction_from_device(target, buffer, size, @@ -163,8 +148,91 @@ -usb_hcd_transfer_ops_t vhc_transfer_ops = { - .transfer_out = enqueue_transfer_out, - .transfer_in = enqueue_transfer_in, - .transfer_setup = enqueue_transfer_setup +static int get_address(device_t *dev, devman_handle_t handle, + usb_address_t *address) +{ + return ENOTSUP; +} + +static int interrupt_out(device_t *dev, usb_target_t target, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + return enqueue_transfer_out(dev, target, USB_TRANSFER_INTERRUPT, + data, size, + callback, arg); +} + +static int interrupt_in(device_t *dev, usb_target_t target, + void *data, size_t size, + usbhc_iface_transfer_in_callback_t callback, void *arg) +{ + return enqueue_transfer_in(dev, target, USB_TRANSFER_INTERRUPT, + data, size, + callback, arg); +} + +static int control_write_setup(device_t *dev, usb_target_t target, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + return enqueue_transfer_setup(dev, target, USB_TRANSFER_CONTROL, + data, size, + callback, arg); +} + +static int control_write_data(device_t *dev, usb_target_t target, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + return enqueue_transfer_out(dev, target, USB_TRANSFER_CONTROL, + data, size, + callback, arg); +} + +static int control_write_status(device_t *dev, usb_target_t target, + usbhc_iface_transfer_in_callback_t callback, void *arg) +{ + return enqueue_transfer_in(dev, target, USB_TRANSFER_CONTROL, + NULL, 0, + callback, arg); +} + +static int control_read_setup(device_t *dev, usb_target_t target, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + return enqueue_transfer_setup(dev, target, USB_TRANSFER_CONTROL, + data, size, + callback, arg); +} + +static int control_read_data(device_t *dev, usb_target_t target, + void *data, size_t size, + usbhc_iface_transfer_in_callback_t callback, void *arg) +{ + return enqueue_transfer_in(dev, target, USB_TRANSFER_CONTROL, + data, size, + callback, arg); +} + +static int control_read_status(device_t *dev, usb_target_t target, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + return enqueue_transfer_out(dev, target, USB_TRANSFER_CONTROL, + NULL, 0, + callback, arg); +} + + +usbhc_iface_t vhc_iface = { + .tell_address = get_address, + .interrupt_out = interrupt_out, + .interrupt_in = interrupt_in, + .control_write_setup = control_write_setup, + .control_write_data = control_write_data, + .control_write_status = control_write_status, + .control_read_setup = control_read_setup, + .control_read_data = control_read_data, + .control_read_status = control_read_status }; Index: uspace/drv/vhc/hcd.c =================================================================== --- uspace/drv/vhc/hcd.c (revision f0da4eb258211882fbaa5e4b83d61b5fa8df0861) +++ uspace/drv/vhc/hcd.c (revision 43178271ecca79c7c77563dbd2a252faa9b39f82) @@ -52,7 +52,11 @@ #include "conn.h" +static device_ops_t vhc_ops = { + .interfaces[USBHC_DEV_IFACE] = &vhc_iface, + .default_handler = default_connection_handler +}; static int vhc_count = 0; -static int vhc_add_device(usb_hc_device_t *dev) +static int vhc_add_device(device_t *dev) { /* @@ -65,6 +69,5 @@ vhc_count++; - dev->transfer_ops = &vhc_transfer_ops; - dev->generic->ops->default_handler = default_connection_handler; + dev->ops = &vhc_ops; /* @@ -79,7 +82,11 @@ } -static usb_hc_driver_t vhc_driver = { +static driver_ops_t vhc_driver_ops = { + .add_device = vhc_add_device, +}; + +static driver_t vhc_driver = { .name = NAME, - .add_hc = &vhc_add_device + .driver_ops = &vhc_driver_ops }; @@ -114,5 +121,5 @@ sleep(4); - return usb_hcd_main(&vhc_driver); + return driver_main(&vhc_driver); } Index: uspace/drv/vhc/vhc.ma =================================================================== --- uspace/drv/vhc/vhc.ma (revision f0da4eb258211882fbaa5e4b83d61b5fa8df0861) +++ uspace/drv/vhc/vhc.ma (revision 43178271ecca79c7c77563dbd2a252faa9b39f82) @@ -1,2 +1,2 @@ 10 usb&hc=vhc -10 usb&hc=vhc&hub +