Index: uspace/drv/ns8250/ns8250.c =================================================================== --- uspace/drv/ns8250/ns8250.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/ns8250/ns8250.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -887,5 +887,5 @@ ipc_call_t *call) { - ipcarg_t method = IPC_GET_METHOD(*call); + sysarg_t method = IPC_GET_IMETHOD(*call); int ret; unsigned int baud_rate, parity, word_length, stop_bits; Index: uspace/drv/uhci/main.c =================================================================== --- uspace/drv/uhci/main.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/uhci/main.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -29,4 +29,5 @@ #include #include +#include #include "uhci.h" Index: uspace/drv/usbhub/main.c =================================================================== --- uspace/drv/usbhub/main.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/usbhub/main.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -26,7 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include + #include #include +#include + +#include #include "usbhub.h" #include "usbhub_private.h" @@ -44,7 +47,23 @@ }; +int usb_hub_control_loop(void * noparam){ + while(true){ + usb_hub_check_hub_changes(); + async_usleep(1000 * 1000); + } + return 0; +} + + int main(int argc, char *argv[]) { usb_lst_init(&usb_hub_list); + fid_t fid = fibril_create(usb_hub_control_loop, NULL); + if (fid == 0) { + printf("%s: failed to start fibril for HUB devices\n", NAME); + return ENOMEM; + } + fibril_add_ready(fid); + return driver_main(&hub_driver); } Index: uspace/drv/usbhub/port_status.h =================================================================== --- uspace/drv/usbhub/port_status.h (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/usbhub/port_status.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -55,5 +55,5 @@ request->index = port; request->request_type = USB_HUB_REQ_TYPE_GET_PORT_STATUS; - request->request = USB_HUB_REQUEST_GET_STATE; + request->request = USB_HUB_REQUEST_GET_STATUS; request->value = 0; request->length = 4; Index: uspace/drv/usbhub/usbhub.h =================================================================== --- uspace/drv/usbhub/usbhub.h (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/usbhub/usbhub.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -40,5 +40,9 @@ #include "usb/hcdhubd.h" - +/** basic information about device attached to hub */ +typedef struct{ + usb_address_t address; + devman_handle_t devman_handle; +}usb_hub_attached_device_t; /** Information about attached hub. */ @@ -46,9 +50,35 @@ /** Number of ports. */ int port_count; - /** General device info. */ - usb_hcd_attached_device_info_t * device; + /** attached device handles */ + usb_hub_attached_device_t * attached_devs; + /** General usb device info. */ + usb_hcd_attached_device_info_t * usb_device; + /** General device info*/ + device_t * device; + } usb_hub_info_t; -int usb_add_hub_device(device_t *); +/** + * function running the hub-controlling loop. + * @param noparam fundtion does not need any parameters + */ +int usb_hub_control_loop(void * noparam); + +/** Callback when new hub device is detected. + * + * @param dev New device. + * @return Error code. + */ +int usb_add_hub_device(device_t *dev); + +/** + * check changes on all registered hubs + */ +void usb_hub_check_hub_changes(void); + + +//int usb_add_hub_device(device_t *); + + #endif Index: uspace/drv/usbhub/usbhub.ma =================================================================== --- uspace/drv/usbhub/usbhub.ma (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/usbhub/usbhub.ma (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -1,1 +1,2 @@ 10 usb&hub +10 usb&class=hub Index: uspace/drv/usbhub/usbhub_private.h =================================================================== --- uspace/drv/usbhub/usbhub_private.h (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/usbhub/usbhub_private.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -182,4 +182,22 @@ } +static inline int usb_hub_clear_port_feature(int hc, usb_address_t address, + int port_index, + usb_hub_class_feature_t feature) { + usb_target_t target = { + .address = address, + .endpoint = 0 + }; + usb_device_request_setup_packet_t clear_request = { + .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE, + .request = USB_DEVREQ_CLEAR_FEATURE, + .length = 0, + .index = port_index + }; + clear_request.value = feature; + return usb_drv_psync_control_write(hc, target, &clear_request, + sizeof(clear_request), NULL, 0); +} + Index: uspace/drv/usbhub/utils.c =================================================================== --- uspace/drv/usbhub/utils.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/usbhub/utils.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -34,18 +34,17 @@ */ #include -#include +#include +#include + #include #include #include -#include -#include -#include +#include #include + #include "usbhub.h" #include "usbhub_private.h" #include "port_status.h" -#include - -static void check_hub_changes(void); + size_t USB_HUB_MAX_DESCRIPTOR_SIZE = 71; @@ -302,4 +301,6 @@ //result->device = device; result->port_count = -1; + /// \TODO is this correct? is the device stored? + result->device = device; @@ -316,6 +317,6 @@ }*/ - result->device = usb_new(usb_hcd_attached_device_info_t); - result->device->address = addr; + result->usb_device = usb_new(usb_hcd_attached_device_info_t); + result->usb_device->address = addr; // get hub descriptor @@ -350,4 +351,11 @@ //printf("[usb_hub] setting port count to %d\n",descriptor->ports_count); result->port_count = descriptor->ports_count; + result->attached_devs = (usb_hub_attached_device_t*) + malloc((result->port_count+1) * sizeof(usb_hub_attached_device_t)); + int i; + for(i=0;iport_count+1;++i){ + result->attached_devs[i].devman_handle=0; + result->attached_devs[i].address=0; + } //printf("[usb_hub] freeing data\n"); free(serialized_descriptor); @@ -362,9 +370,4 @@ } -/** Callback when new hub device is detected. - * - * @param dev New device. - * @return Error code. - */ int usb_add_hub_device(device_t *dev) { printf(NAME ": add_hub_device(handle=%d)\n", (int) dev->handle); @@ -387,9 +390,46 @@ usb_device_request_setup_packet_t request; usb_target_t target; - target.address = hub_info->device->address; + target.address = hub_info->usb_device->address; target.endpoint = 0; - for (port = 0; port < hub_info->port_count; ++port) { + + //get configuration descriptor + // this is not fully correct - there are more configurations + // and all should be checked + usb_standard_device_descriptor_t std_descriptor; + opResult = usb_drv_req_get_device_descriptor(hc, target.address, + &std_descriptor); + if(opResult!=EOK){ + printf("[usb_hub] could not get device descriptor, %d\n",opResult); + return 1;///\TODO some proper error code needed + } + printf("[usb_hub] hub has %d configurations\n",std_descriptor.configuration_count); + if(std_descriptor.configuration_count<1){ + printf("[usb_hub] THERE ARE NO CONFIGURATIONS AVAILABLE\n"); + } + usb_standard_configuration_descriptor_t config_descriptor; + opResult = usb_drv_req_get_bare_configuration_descriptor(hc, + target.address, 0, + &config_descriptor); + if(opResult!=EOK){ + printf("[usb_hub] could not get configuration descriptor, %d\n",opResult); + return 1;///\TODO some proper error code needed + } + //set configuration + request.request_type = 0; + request.request = USB_DEVREQ_SET_CONFIGURATION; + request.index=0; + request.length=0; + request.value_high=0; + request.value_low = config_descriptor.configuration_number; + opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0); + if (opResult != EOK) { + printf("[usb_hub]something went wrong when setting hub`s configuration, %d\n", opResult); + } + + + for (port = 1; port < hub_info->port_count+1; ++port) { usb_hub_set_power_port_request(&request, port); opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0); + printf("[usb_hub] powering port %d\n",port); if (opResult != EOK) { printf("[usb_hub]something went wrong when setting hub`s %dth port\n", port); @@ -397,4 +437,5 @@ } //ports powered, hub seems to be enabled + ipc_hangup(hc); @@ -404,5 +445,5 @@ printf("[usb_hub] hub info added to list\n"); //(void)hub_info; - check_hub_changes(); + usb_hub_check_hub_changes(); /// \TODO start the check loop, if not already started... @@ -412,4 +453,8 @@ printf("[usb_hub] hub dev added\n"); + printf("\taddress %d, has %d ports \n", + hub_info->usb_device->address, + hub_info->port_count); + printf("\tused configuration %d\n",config_descriptor.configuration_number); return EOK; @@ -429,10 +474,9 @@ * @param target */ - static void usb_hub_init_add_device(int hc, uint16_t port, usb_target_t target) { usb_device_request_setup_packet_t request; int opResult; printf("[usb_hub] some connection changed\n"); - + //get default address opResult = usb_drv_reserve_default_address(hc); if (opResult != EOK) { @@ -459,14 +503,70 @@ * @param target */ -static void usb_hub_finalize_add_device( +static void usb_hub_finalize_add_device( usb_hub_info_t * hub, int hc, uint16_t port, usb_target_t target) { - usb_device_request_setup_packet_t request; int opResult; printf("[usb_hub] finalizing add device\n"); - usb_address_t new_device_address = - usb_drv_request_address(hc); - usb_hub_set_set_address_request - (&request, new_device_address); + opResult = usb_hub_clear_port_feature(hc, target.address, + port, USB_HUB_FEATURE_C_PORT_RESET); + if (opResult != EOK) { + goto release; + } + + /* Request address at from host controller. */ + usb_address_t new_device_address = usb_drv_request_address(hc); + if (new_device_address < 0) { + printf("[usb_hub] failed to get free USB address\n"); + opResult = new_device_address; + goto release; + } + printf("[usb_hub] setting new address\n"); + opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT, + new_device_address); + + if (opResult != EOK) { + printf("[usb_hub] could not set address for new device\n"); + goto release; + } + +release: + printf("[usb_hub] releasing default address\n"); + usb_drv_release_default_address(hc); + if (opResult != EOK) { + return; + } + + devman_handle_t child_handle; + opResult = usb_drv_register_child_in_devman(hc, hub->device, + new_device_address, &child_handle); + if (opResult != EOK) { + printf("[usb_hub] could not start driver for new device \n"); + return; + } + hub->attached_devs[port].devman_handle = child_handle; + hub->attached_devs[port].address = new_device_address; + + opResult = usb_drv_bind_address(hc, new_device_address, child_handle); + if (opResult != EOK) { + printf("[usb_hub] could not assign address of device in hcd \n"); + return; + } + printf("[usb_hub] new device address %d, handle %zu\n", + new_device_address, child_handle); + +} + +/** + * unregister device address in hc, close the port + * @param hc + * @param port + * @param target + */ +static void usb_hub_removed_device( + usb_hub_info_t * hub, int hc, uint16_t port, usb_target_t target) { + //usb_device_request_setup_packet_t request; + int opResult; + //disable port + /*usb_hub_set_disable_port_request(&request, port); opResult = usb_drv_sync_control_write( hc, target, @@ -475,40 +575,22 @@ ); if (opResult != EOK) { - printf("[usb_hub] could not set address for new device\n"); - //will retry later... - return; - } - usb_drv_release_default_address(hc); - - - /// \TODO driver work - //add_child_device..... -} - -/** - * unregister device address in hc, close the port - * @param hc - * @param port - * @param target - */ -static void usb_hub_removed_device(int hc, uint16_t port, usb_target_t target) { - usb_device_request_setup_packet_t request; - int opResult; - //disable port - usb_hub_set_disable_port_request(&request, port); - opResult = usb_drv_sync_control_write( - hc, target, - &request, - NULL, 0 - ); - if (opResult != EOK) { //continue; printf("[usb_hub] something went wrong when disabling a port\n"); - } - //remove device + }*/ + /// \TODO remove device + + hub->attached_devs[port].devman_handle=0; //close address - // - - ///\TODO this code is not complete + if(hub->attached_devs[port].address!=0){ + opResult = usb_drv_release_address(hc,hub->attached_devs[port].address); + if(opResult != EOK) { + printf("[usb_hub] could not release address of removed device: %d\n",opResult); + } + hub->attached_devs[port].address = 0; + }else{ + printf("[usb_hub] this is strange, disconnected device had no address\n"); + //device was disconnected before it`s port was reset - return default address + usb_drv_release_default_address(hc); + } } @@ -519,7 +601,11 @@ * @param target */ -static void usb_hub_process_interrupt(int hc, uint16_t port, usb_target_t target) { +static void usb_hub_process_interrupt(usb_hub_info_t * hub, int hc, + uint16_t port, usb_address_t address) { printf("[usb_hub] interrupt at port %d\n", port); //determine type of change + usb_target_t target; + target.address=address; + target.endpoint=0; usb_port_status_t status; size_t rcvd_size; @@ -527,4 +613,5 @@ int opResult; usb_hub_set_port_status_request(&request, port); + //endpoint 0 opResult = usb_drv_sync_control_read( @@ -543,16 +630,19 @@ //something connected/disconnected if (usb_port_connect_change(&status)) { + opResult = usb_hub_clear_port_feature(hc, target.address, + port, USB_HUB_FEATURE_C_PORT_CONNECTION); + // TODO: check opResult if (usb_port_dev_connected(&status)) { printf("[usb_hub] some connection changed\n"); usb_hub_init_add_device(hc, port, target); } else { - usb_hub_removed_device(hc, port, target); + usb_hub_removed_device(hub, hc, port, target); } } //port reset if (usb_port_reset_completed(&status)) { - printf("[usb_hub] finalizing add device\n"); + printf("[usb_hub] port reset complete\n"); if (usb_port_enabled(&status)) { - usb_hub_finalize_add_device(hc, port, target); + usb_hub_finalize_add_device(hub, hc, port, target); } else { printf("[usb_hub] ERROR: port reset, but port still not enabled\n"); @@ -565,5 +655,5 @@ usb_port_set_dev_connected(&status, false); if (status) { - printf("[usb_hub]there was some unsupported change on port\n"); + printf("[usb_hub]there was some unsupported change on port %d\n",port); } /// \TODO handle other changes @@ -585,5 +675,5 @@ /** Check changes on all known hubs. */ -static void check_hub_changes(void) { +void usb_hub_check_hub_changes(void) { /* * Iterate through all hubs. @@ -593,25 +683,21 @@ lst_item != &usb_hub_list; lst_item = lst_item->next) { - printf("[usb_hub] checking hub changes\n"); + usb_hub_info_t * hub_info = ((usb_hub_info_t*)lst_item->data); /* * Check status change pipe of this hub. */ - usb_target_t target = { - .address = 5, - .endpoint = 1 - }; - /// \TODO uncomment once it works correctly - //target.address = usb_create_hub_info(lst_item)->device->address; - - size_t port_count = 7; + usb_target_t target; + target.address = hub_info->usb_device->address; + target.endpoint = 1;/// \TODO get from endpoint descriptor + printf("[usb_hub] checking changes for hub at addr %d\n", + target.address); + + size_t port_count = hub_info->port_count; /* * Connect to respective HC. */ - /// \FIXME this is incorrect code: here - /// must be used particular device instead of NULL - //which one? - int hc = usb_drv_hc_connect(NULL, 0); + int hc = usb_drv_hc_connect(hub_info->device, 0); if (hc < 0) { continue; @@ -619,5 +705,5 @@ // FIXME: count properly - size_t byte_length = (port_count / 8) + 1; + size_t byte_length = ((port_count+1) / 8) + 1; void *change_bitmap = malloc(byte_length); @@ -639,8 +725,9 @@ } unsigned int port; - for (port = 0; port < port_count; ++port) { + for (port = 1; port < port_count+1; ++port) { bool interrupt = (((uint8_t*) change_bitmap)[port / 8] >> (port % 8)) % 2; if (interrupt) { - usb_hub_process_interrupt(hc, port, target); + usb_hub_process_interrupt( + hub_info, hc, port, hub_info->usb_device->address); } } Index: uspace/drv/usbkbd/main.c =================================================================== --- uspace/drv/usbkbd/main.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/usbkbd/main.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -40,5 +40,5 @@ #define NAME "usbkbd" -static const usb_endpoint_t CONTROL_EP = 0; +#define GUESSED_POLL_ENDPOINT 1 /* @@ -130,5 +130,5 @@ // default endpoint - kbd_dev->default_ep = CONTROL_EP; + kbd_dev->poll_endpoint = GUESSED_POLL_ENDPOINT; /* @@ -178,8 +178,9 @@ usb_target_t poll_target = { .address = kbd_dev->address, - .endpoint = kbd_dev->default_ep + .endpoint = kbd_dev->poll_endpoint }; while (true) { + async_usleep(1000 * 1000); rc = usb_drv_async_interrupt_in(kbd_dev->device->parent_phone, poll_target, buffer, BUFFER_SIZE, &actual_size, &handle); Index: uspace/drv/usbkbd/usbkbd.ma =================================================================== --- uspace/drv/usbkbd/usbkbd.ma (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/usbkbd/usbkbd.ma (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -1,2 +1,4 @@ 10 usb&class=hid +10 usb&class=HID +10 usb&interface&class=HID 10 usb&hid Index: uspace/drv/vhc/Makefile =================================================================== --- uspace/drv/vhc/Makefile (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/Makefile (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -33,5 +33,5 @@ $(LIBDRV_PREFIX)/libdrv.a EXTRA_CFLAGS += \ - -I$(LIB_PREFIX) \ + -I$(LIBUSBVIRT_PREFIX)/include \ -I$(LIBUSB_PREFIX)/include \ -I$(LIBDRV_PREFIX)/include @@ -39,4 +39,7 @@ SOURCES = \ + hub/hub.c \ + hub/virthub.c \ + hub/virthubops.c \ conndev.c \ connhost.c \ @@ -45,6 +48,5 @@ hc.c \ hcd.c \ - hub.c \ - hubops.c + hub.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/vhc/conn.h =================================================================== --- uspace/drv/vhc/conn.h (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/conn.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -42,5 +42,5 @@ #include "devices.h" -void connection_handler_host(ipcarg_t); +void connection_handler_host(sysarg_t); usb_hcd_transfer_ops_t vhc_transfer_ops; Index: uspace/drv/vhc/conndev.c =================================================================== --- uspace/drv/vhc/conndev.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/conndev.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -47,5 +47,5 @@ { ipc_call_t answer_data; - ipcarg_t answer_rc; + sysarg_t answer_rc; aid_t req; int rc; @@ -83,5 +83,5 @@ ipc_callid_t icallid, ipc_call_t *icall) { - ipcarg_t method = IPC_GET_METHOD(*icall); + sysarg_t method = IPC_GET_IMETHOD(*icall); if (method == IPC_M_CONNECT_TO_ME) { Index: uspace/drv/vhc/connhost.c =================================================================== --- uspace/drv/vhc/connhost.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/connhost.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -93,5 +93,5 @@ usbhc_iface_transfer_out_callback_t callback, void *arg) { - printf(NAME ": transfer OUT [%d.%d (%s); %zu]\n", + dprintf(3, "transfer OUT [%d.%d (%s); %zu]", target.address, target.endpoint, usb_str_transfer_type(transfer_type), @@ -102,5 +102,5 @@ transfer->out_callback = callback; - hc_add_transaction_to_device(false, target, buffer, size, + hc_add_transaction_to_device(false, target, transfer_type, buffer, size, universal_callback, transfer); @@ -113,5 +113,5 @@ usbhc_iface_transfer_out_callback_t callback, void *arg) { - printf(NAME ": transfer SETUP [%d.%d (%s); %zu]\n", + dprintf(3, "transfer SETUP [%d.%d (%s); %zu]", target.address, target.endpoint, usb_str_transfer_type(transfer_type), @@ -122,5 +122,5 @@ transfer->out_callback = callback; - hc_add_transaction_to_device(true, target, buffer, size, + hc_add_transaction_to_device(true, target, transfer_type, buffer, size, universal_callback, transfer); @@ -133,5 +133,5 @@ usbhc_iface_transfer_in_callback_t callback, void *arg) { - printf(NAME ": transfer IN [%d.%d (%s); %zu]\n", + dprintf(3, "transfer IN [%d.%d (%s); %zu]", target.address, target.endpoint, usb_str_transfer_type(transfer_type), @@ -142,5 +142,5 @@ transfer->in_callback = callback; - hc_add_transaction_from_device(target, buffer, size, + hc_add_transaction_from_device(target, transfer_type, buffer, size, universal_callback, transfer); Index: uspace/drv/vhc/debug.c =================================================================== --- uspace/drv/vhc/debug.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/debug.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -42,9 +42,9 @@ /** Debug print informing of invalid call. */ -void dprintf_inval_call(int level, ipc_call_t call, ipcarg_t phone_hash) +void dprintf_inval_call(int level, ipc_call_t call, sysarg_t phone_hash) { dprintf(level, "phone%#x: invalid call [%u (%u, %u, %u, %u, %u)]", phone_hash, - IPC_GET_METHOD(call), + IPC_GET_IMETHOD(call), IPC_GET_ARG1(call), IPC_GET_ARG2(call), IPC_GET_ARG3(call), IPC_GET_ARG4(call), IPC_GET_ARG5(call)); Index: uspace/drv/vhc/devices.c =================================================================== --- uspace/drv/vhc/devices.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/devices.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -47,4 +47,5 @@ #include "devices.h" #include "hub.h" +#include "hub/virthub.h" #include "vhcd.h" @@ -69,5 +70,5 @@ list_append(&dev->link, &devices); - hub_add_device(dev); + virthub_connect_device(&virtual_hub_device, dev); return dev; @@ -78,5 +79,5 @@ void virtdev_destroy_device(virtdev_connection_t *dev) { - hub_remove_device(dev); + virthub_disconnect_device(&virtual_hub_device, dev); list_remove(&dev->link); free(dev); @@ -94,10 +95,10 @@ = list_get_instance(pos, virtdev_connection_t, link); - if (!hub_can_device_signal(dev)) { + if (!virthub_is_device_enabled(&virtual_hub_device, dev)) { continue; } ipc_call_t answer_data; - ipcarg_t answer_rc; + sysarg_t answer_rc; aid_t req; int rc = EOK; @@ -145,11 +146,12 @@ * (if the address matches). */ - if (virthub_dev.address == transaction->target.address) { + if (virtual_hub_device.address == transaction->target.address) { size_t tmp; - dprintf(3, "sending `%s' transaction to hub", + dprintf(1, "sending `%s' transaction to hub", usbvirt_str_transaction_type(transaction->type)); switch (transaction->type) { case USBVIRT_TRANSACTION_SETUP: - virthub_dev.transaction_setup(&virthub_dev, + virtual_hub_device.transaction_setup( + &virtual_hub_device, transaction->target.endpoint, transaction->buffer, transaction->len); @@ -157,5 +159,6 @@ case USBVIRT_TRANSACTION_IN: - virthub_dev.transaction_in(&virthub_dev, + virtual_hub_device.transaction_in( + &virtual_hub_device, transaction->target.endpoint, transaction->buffer, transaction->len, @@ -167,5 +170,6 @@ case USBVIRT_TRANSACTION_OUT: - virthub_dev.transaction_out(&virthub_dev, + virtual_hub_device.transaction_out( + &virtual_hub_device, transaction->target.endpoint, transaction->buffer, transaction->len); Index: uspace/drv/vhc/hc.c =================================================================== --- uspace/drv/vhc/hc.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/hc.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -50,7 +50,7 @@ #include "hub.h" -#define USLEEP_BASE (500 * 1000) - -#define USLEEP_VAR 5000 +#define USLEEP_BASE (0 * 5 * 1000) + +#define USLEEP_VAR 50 #define SHORTENING_VAR 15 @@ -68,7 +68,8 @@ static link_t transaction_list; -#define TRANSACTION_FORMAT "T[%d:%d %s (%d)]" +#define TRANSACTION_FORMAT "T[%d.%d %s/%s (%d)]" #define TRANSACTION_PRINTF(t) \ (t).target.address, (t).target.endpoint, \ + usb_str_transfer_type((t).transfer_type), \ usbvirt_str_transaction_type((t).type), \ (int)(t).len @@ -77,4 +78,6 @@ list_get_instance(lnk, transaction_t, link) +#define HUB_STATUS_MAX_LEN (HUB_PORT_COUNT + 64) + static inline unsigned int pseudo_random(unsigned int *seed) { @@ -89,5 +92,5 @@ usb_transaction_outcome_t outcome) { - dprintf(3, "processing transaction " TRANSACTION_FORMAT ", outcome: %s", + dprintf(3, "transaction " TRANSACTION_FORMAT " done, outcome: %s", TRANSACTION_PRINTF(*transaction), usb_str_transaction_outcome(outcome)); @@ -99,5 +102,5 @@ /** Host controller manager main function. */ -void hc_manager(void) +static int hc_manager_fibril(void *arg) { list_initialize(&transaction_list); @@ -114,8 +117,6 @@ } - char ports[HUB_PORT_COUNT + 2]; - hub_get_port_statuses(ports, HUB_PORT_COUNT + 1); - dprintf(3, "virtual hub: addr=%d ports=%s", - virthub_dev.address, ports); + char ports[HUB_STATUS_MAX_LEN + 1]; + virthub_get_status(&virtual_hub_device, ports, HUB_STATUS_MAX_LEN); link_t *first_transaction_link = transaction_list.next; @@ -124,4 +125,8 @@ list_remove(first_transaction_link); + + dprintf(0, "about to process " TRANSACTION_FORMAT " [%s]", + TRANSACTION_PRINTF(*transaction), ports); + dprintf(3, "processing transaction " TRANSACTION_FORMAT "", TRANSACTION_PRINTF(*transaction)); @@ -134,4 +139,17 @@ free(transaction); } + + assert(false && "unreachable"); + return EOK; +} + +void hc_manager(void) +{ + fid_t fid = fibril_create(hc_manager_fibril, NULL); + if (fid == 0) { + printf(NAME ": failed to start HC manager fibril\n"); + return; + } + fibril_add_ready(fid); } @@ -139,5 +157,5 @@ */ static transaction_t *transaction_create(usbvirt_transaction_type_t type, - usb_target_t target, + usb_target_t target, usb_transfer_type_t transfer_type, void * buffer, size_t len, hc_transaction_done_callback_t callback, void * arg) @@ -147,4 +165,5 @@ list_initialize(&transaction->link); transaction->type = type; + transaction->transfer_type = transfer_type; transaction->target = target; transaction->buffer = buffer; @@ -153,5 +172,5 @@ transaction->callback_arg = arg; - dprintf(1, "creating transaction " TRANSACTION_FORMAT, + dprintf(3, "creating transaction " TRANSACTION_FORMAT, TRANSACTION_PRINTF(*transaction)); @@ -162,9 +181,11 @@ */ void hc_add_transaction_to_device(bool setup, usb_target_t target, + usb_transfer_type_t transfer_type, void * buffer, size_t len, hc_transaction_done_callback_t callback, void * arg) { transaction_t *transaction = transaction_create( - setup ? USBVIRT_TRANSACTION_SETUP : USBVIRT_TRANSACTION_OUT, target, + setup ? USBVIRT_TRANSACTION_SETUP : USBVIRT_TRANSACTION_OUT, + target, transfer_type, buffer, len, callback, arg); list_append(&transaction->link, &transaction_list); @@ -174,9 +195,11 @@ */ void hc_add_transaction_from_device(usb_target_t target, + usb_transfer_type_t transfer_type, void * buffer, size_t len, hc_transaction_done_callback_t callback, void * arg) { transaction_t *transaction = transaction_create(USBVIRT_TRANSACTION_IN, - target, buffer, len, callback, arg); + target, transfer_type, + buffer, len, callback, arg); list_append(&transaction->link, &transaction_list); } Index: uspace/drv/vhc/hc.h =================================================================== --- uspace/drv/vhc/hc.h (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/hc.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -55,4 +55,6 @@ /** Transaction type. */ usbvirt_transaction_type_t type; + /** Transfer type. */ + usb_transfer_type_t transfer_type; /** Device address. */ usb_target_t target; @@ -71,9 +73,11 @@ void hc_manager(void); -void hc_add_transaction_to_device(bool setup, usb_target_t target, +void hc_add_transaction_to_device(bool setup, + usb_target_t target, usb_transfer_type_t transfer_type, void * buffer, size_t len, hc_transaction_done_callback_t callback, void * arg); -void hc_add_transaction_from_device(usb_target_t target, +void hc_add_transaction_from_device( + usb_target_t target, usb_transfer_type_t transfer_type, void * buffer, size_t len, hc_transaction_done_callback_t callback, void * arg); Index: uspace/drv/vhc/hcd.c =================================================================== --- uspace/drv/vhc/hcd.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/hcd.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -79,5 +79,5 @@ * Initialize our hub and announce its presence. */ - hub_init(dev); + virtual_hub_device_init(dev); printf("%s: virtual USB host controller ready.\n", NAME); @@ -95,33 +95,18 @@ }; -/** Fibril wrapper for HC transaction manager. - * - * @param arg Not used. - * @return Nothing, return argument is unreachable. - */ -static int hc_manager_fibril(void *arg) -{ - hc_manager(); - return EOK; -} int main(int argc, char * argv[]) { - printf("%s: virtual USB host controller driver.\n", NAME); - - usb_dprintf_enable(NAME, 10); - - fid_t fid = fibril_create(hc_manager_fibril, NULL); - if (fid == 0) { - printf("%s: failed to start HC manager fibril\n", NAME); - return ENOMEM; - } - fibril_add_ready(fid); - /* * Temporary workaround. Wait a little bit to be the last driver * in devman output. */ - sleep(4); + sleep(5); + + usb_dprintf_enable(NAME, 0); + + printf(NAME ": virtual USB host controller driver.\n"); + + hc_manager(); return driver_main(&vhc_driver); Index: uspace/drv/vhc/hub.c =================================================================== --- uspace/drv/vhc/hub.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/hub.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -40,263 +40,63 @@ #include #include +#include +#include "hub.h" +#include "hub/virthub.h" #include "vhcd.h" -#include "hub.h" -#include "hubintern.h" -#include "conn.h" +usbvirt_device_t virtual_hub_device; -/** Standard device descriptor. */ -usb_standard_device_descriptor_t std_device_descriptor = { - .length = sizeof(usb_standard_device_descriptor_t), - .descriptor_type = USB_DESCTYPE_DEVICE, - .usb_spec_version = 0x110, - .device_class = USB_CLASS_HUB, - .device_subclass = 0, - .device_protocol = 0, - .max_packet_size = 64, - .configuration_count = 1 -}; +static int hub_register_in_devman_fibril(void *arg); -/** Standard interface descriptor. */ -usb_standard_interface_descriptor_t std_interface_descriptor = { - .length = sizeof(usb_standard_interface_descriptor_t), - .descriptor_type = USB_DESCTYPE_INTERFACE, - .interface_number = 0, - .alternate_setting = 0, - .endpoint_count = 1, - .interface_class = USB_CLASS_HUB, - .interface_subclass = 0, - .interface_protocol = 0, - .str_interface = 0 -}; +void virtual_hub_device_init(device_t *hc_dev) +{ + virthub_init(&virtual_hub_device); -hub_descriptor_t hub_descriptor = { - .length = sizeof(hub_descriptor_t), - .type = USB_DESCTYPE_HUB, - .port_count = HUB_PORT_COUNT, - .characteristics = 0, - .power_on_warm_up = 50, /* Huh? */ - .max_current = 100, /* Huh again. */ - .removable_device = { 0 }, - .port_power = { 0xFF } -}; + /* + * We need to register the root hub. + * This must be done in separate fibril because the device + * we are connecting to are ourselves and we cannot connect + * before leaving the add_device() function. + */ + fid_t root_hub_registration + = fibril_create(hub_register_in_devman_fibril, hc_dev); + if (root_hub_registration == 0) { + printf(NAME ": failed to register root hub\n"); + return; + } -/** Endpoint descriptor. */ -usb_standard_endpoint_descriptor_t endpoint_descriptor = { - .length = sizeof(usb_standard_endpoint_descriptor_t), - .descriptor_type = USB_DESCTYPE_ENDPOINT, - .endpoint_address = HUB_STATUS_CHANGE_PIPE | 128, - .attributes = USB_TRANSFER_INTERRUPT, - .max_packet_size = 8, - .poll_interval = 0xFF -}; - -/** Standard configuration descriptor. */ -usb_standard_configuration_descriptor_t std_configuration_descriptor = { - .length = sizeof(usb_standard_configuration_descriptor_t), - .descriptor_type = USB_DESCTYPE_CONFIGURATION, - .total_length = - sizeof(usb_standard_configuration_descriptor_t) - + sizeof(std_interface_descriptor) - + sizeof(hub_descriptor) - + sizeof(endpoint_descriptor) - , - .interface_count = 1, - .configuration_number = HUB_CONFIGURATION_ID, - .str_configuration = 0, - .attributes = 128, /* denotes bus-powered device */ - .max_power = 50 -}; - -/** All hub configuration descriptors. */ -static usbvirt_device_configuration_extras_t extra_descriptors[] = { - { - .data = (uint8_t *) &std_interface_descriptor, - .length = sizeof(std_interface_descriptor) - }, - { - .data = (uint8_t *) &hub_descriptor, - .length = sizeof(hub_descriptor) - }, - { - .data = (uint8_t *) &endpoint_descriptor, - .length = sizeof(endpoint_descriptor) - } -}; - -/** Hub configuration. */ -usbvirt_device_configuration_t configuration = { - .descriptor = &std_configuration_descriptor, - .extra = extra_descriptors, - .extra_count = sizeof(extra_descriptors)/sizeof(extra_descriptors[0]) -}; - -/** Hub standard descriptors. */ -usbvirt_descriptors_t descriptors = { - .device = &std_device_descriptor, - .configuration = &configuration, - .configuration_count = 1, -}; - -/** Hub as a virtual device. */ -usbvirt_device_t virthub_dev = { - .ops = &hub_ops, - .descriptors = &descriptors, - .lib_debug_level = 4, - .lib_debug_enabled_tags = USBVIRT_DEBUGTAG_ALL -}; - -/** Hub device. */ -hub_device_t hub_dev; - -static usb_address_t hub_set_address(usbvirt_device_t *hub) -{ - usb_address_t new_address; - int rc = vhc_iface.request_address(NULL, &new_address); - if (rc != EOK) { - return rc; - } - - usb_device_request_setup_packet_t setup_packet = { - .request_type = 0, - .request = USB_DEVREQ_SET_ADDRESS, - .index = 0, - .length = 0, - }; - setup_packet.value = new_address; - - hub->transaction_setup(hub, 0, &setup_packet, sizeof(setup_packet)); - hub->transaction_in(hub, 0, NULL, 0, NULL); - - return new_address; + fibril_add_ready(root_hub_registration); } -/** Initialize virtual hub. */ -void hub_init(device_t *hc_dev) +/** Register root hub in devman. + * + * @param arg Host controller device (type device_t *). + * @return Error code. + */ +int hub_register_in_devman_fibril(void *arg) { - size_t i; - for (i = 0; i < HUB_PORT_COUNT; i++) { - hub_port_t *port = &hub_dev.ports[i]; - - port->device = NULL; - port->state = HUB_PORT_STATE_NOT_CONFIGURED; - port->status_change = 0; - } - - usbvirt_connect_local(&virthub_dev); - - dprintf(1, "virtual hub (%d ports) created", HUB_PORT_COUNT); + device_t *hc_dev = (device_t *) arg; - usb_address_t hub_address = hub_set_address(&virthub_dev); - if (hub_address < 0) { - dprintf(1, "problem changing hub address (%s)", - str_error(hub_address)); + int hc = usb_drv_hc_connect(hc_dev, IPC_FLAG_BLOCKING); + if (hc < 0) { + printf(NAME ": failed to register root hub\n"); + return hc; } - dprintf(2, "virtual hub address changed to %d", hub_address); + usb_drv_reserve_default_address(hc); - char *id; - int rc = asprintf(&id, "usb&hub"); - if (rc <= 0) { - return; - } + usb_address_t hub_address = usb_drv_request_address(hc); + usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT, hub_address); + + usb_drv_release_default_address(hc); + devman_handle_t hub_handle; - rc = child_device_register_wrapper(hc_dev, "hub", id, 10, &hub_handle); - if (rc != EOK) { - free(id); - } + usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle); + usb_drv_bind_address(hc, hub_address, hub_handle); - vhc_iface.bind_address(NULL, hub_address, hub_handle); - - dprintf(2, "virtual hub has devman handle %d", (int) hub_handle); + return EOK; } - -/** Connect device to the hub. - * - * @param device Device to be connected. - * @return Port where the device was connected to. - */ -size_t hub_add_device(virtdev_connection_t *device) -{ - size_t i; - for (i = 0; i < HUB_PORT_COUNT; i++) { - hub_port_t *port = &hub_dev.ports[i]; - - if (port->device != NULL) { - continue; - } - - port->device = device; - - /* - * TODO: - * If the hub was configured, we can normally - * announce the plug-in. - * Otherwise, we will wait until hub is configured - * and announce changes in single burst. - */ - //if (port->state == HUB_PORT_STATE_DISCONNECTED) { - port->state = HUB_PORT_STATE_DISABLED; - set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION); - //} - - return i; - } - return (size_t)-1; -} - -/** Disconnect device from the hub. */ -void hub_remove_device(virtdev_connection_t *device) -{ - size_t i; - for (i = 0; i < HUB_PORT_COUNT; i++) { - hub_port_t *port = &hub_dev.ports[i]; - - if (port->device != device) { - continue; - } - - port->device = NULL; - port->state = HUB_PORT_STATE_DISCONNECTED; - - set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION); - } -} - -/** Tell whether device port is open. - * - * @return Whether communication to and from the device can go through the hub. - */ -bool hub_can_device_signal(virtdev_connection_t * device) -{ - size_t i; - for (i = 0; i < HUB_PORT_COUNT; i++) { - if (hub_dev.ports[i].device == device) { - return hub_dev.ports[i].state == HUB_PORT_STATE_ENABLED; - } - } - - return false; -} - -/** Format hub port status. - * - * @param result Buffer where to store status string. - * @param len Number of characters that is possible to store in @p result - * (excluding trailing zero). - */ -void hub_get_port_statuses(char *result, size_t len) -{ - if (len > HUB_PORT_COUNT) { - len = HUB_PORT_COUNT; - } - size_t i; - for (i = 0; i < len; i++) { - result[i] = hub_port_state_as_char(hub_dev.ports[i].state); - } - result[len] = 0; -} /** Index: uspace/drv/vhc/hub.h =================================================================== --- uspace/drv/vhc/hub.h (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/hub.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -40,17 +40,10 @@ #include "devices.h" +#include "hub/hub.h" +#include "hub/virthub.h" -#define HUB_PORT_COUNT 6 +extern usbvirt_device_t virtual_hub_device; -#define BITS2BYTES(bits) \ - (bits ? ((((bits)-1)>>3)+1) : 0) - -extern usbvirt_device_t virthub_dev; - -void hub_init(device_t *); -size_t hub_add_device(virtdev_connection_t *); -void hub_remove_device(virtdev_connection_t *); -bool hub_can_device_signal(virtdev_connection_t *); -void hub_get_port_statuses(char *result, size_t len); +void virtual_hub_device_init(device_t *); #endif Index: uspace/drv/vhc/hub/hub.c =================================================================== --- uspace/drv/vhc/hub/hub.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) +++ uspace/drv/vhc/hub/hub.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -0,0 +1,489 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup usb + * @{ + */ +/** @file + * @brief Representation of an USB hub (implementation). + */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "hub.h" + + +/** Produce a byte from bit values. + */ +#define MAKE_BYTE(b0, b1, b2, b3, b4, b5, b6, b7) \ + (( \ + ((b0) << 0) \ + | ((b1) << 1) \ + | ((b2) << 2) \ + | ((b3) << 3) \ + | ((b4) << 4) \ + | ((b5) << 5) \ + | ((b6) << 6) \ + | ((b7) << 7) \ + )) + +/* Static functions. */ +static hub_port_t *get_hub_port(hub_t *, size_t); +static void set_port_status_change(hub_port_t *, hub_status_change_t); +static void clear_port_status_change(hub_port_t *, uint16_t); +static int set_port_state_delayed_fibril(void *); +static void set_port_state_delayed(hub_t *, size_t, suseconds_t, + hub_port_state_t, hub_port_state_t); + +/** Convert hub port state to a char. */ +char hub_port_state_to_char(hub_port_state_t state) { + switch (state) { + case HUB_PORT_STATE_NOT_CONFIGURED: + return '-'; + case HUB_PORT_STATE_POWERED_OFF: + return 'O'; + case HUB_PORT_STATE_DISCONNECTED: + return 'X'; + case HUB_PORT_STATE_DISABLED: + return 'D'; + case HUB_PORT_STATE_RESETTING: + return 'R'; + case HUB_PORT_STATE_ENABLED: + return 'E'; + case HUB_PORT_STATE_SUSPENDED: + return 'S'; + case HUB_PORT_STATE_RESUMING: + return 'F'; + default: + return '?'; + } +} + +/** Initialize single hub port. + * + * @param port Port to be initialized. + * @param index Port index (one based). + */ +static void hub_init_port(hub_port_t *port, size_t index) +{ + port->connected_device = NULL; + port->index = index; + port->state = HUB_PORT_STATE_NOT_CONFIGURED; + port->status_change = 0; +} + +/** Initialize the hub. + * + * @param hub Hub to be initialized. + */ +void hub_init(hub_t *hub) +{ + size_t i; + for (i = 0; i < HUB_PORT_COUNT; i++) { + hub_init_port(&hub->ports[i], i + 1); + } + hub->custom_data = NULL; + fibril_mutex_initialize(&hub->guard); +} + +/** Connect a device to the hub. + * + * @param hub Hub to connect device to. + * @param device Device to be connected. + * @return Index of port the device was connected to. + * @retval -1 No free port available. + */ +size_t hub_connect_device(hub_t *hub, void *device) +{ + size_t i; + for (i = 0; i < HUB_PORT_COUNT; i++) { + hub_port_t *port = &hub->ports[i]; + + if (port->connected_device != NULL) { + continue; + } + + port->connected_device = device; + + /* + * TODO: + * If the hub was configured, we can normally + * announce the plug-in. + * Otherwise, we will wait until hub is configured + * and announce changes in single burst. + */ + //if (port->state == HUB_PORT_STATE_DISCONNECTED) { + port->state = HUB_PORT_STATE_DISABLED; + set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION); + //} + + return i; + } + + return (size_t) -1; +} + +/** Find port device is connected to. + * + * @param hub Hub in question. + * @param device Device in question. + * @return Port index (zero based). + * @retval -1 Device is not connected. + */ +size_t hub_find_device(hub_t *hub, void *device) +{ + size_t i; + for (i = 0; i < HUB_PORT_COUNT; i++) { + hub_port_t *port = &hub->ports[i]; + + if (port->connected_device == device) { + return i; + } + } + + return 0; +} + +/** Acquire exclusive access to the hub. + * + * @param hub Hub in question. + */ +void hub_acquire(hub_t *hub) +{ + fibril_mutex_lock(&hub->guard); +} + +/** Give up exclusive access to the hub. + * + * @param hub Hub in question. + */ +void hub_release(hub_t *hub) +{ + fibril_mutex_unlock(&hub->guard); +} + +/** Change port state. + * + * @param hub Hub the port belongs to. + * @param port_index Port index (zero based). + * @param state New port state. + */ +void hub_set_port_state(hub_t *hub, size_t port_index, hub_port_state_t state) +{ + hub_port_t *port = get_hub_port(hub, port_index); + if (port == NULL) { + return; + } + + switch (state) { + case HUB_PORT_STATE_POWERED_OFF: + clear_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION); + clear_port_status_change(port, HUB_STATUS_C_PORT_ENABLE); + clear_port_status_change(port, HUB_STATUS_C_PORT_RESET); + break; + case HUB_PORT_STATE_RESUMING: + set_port_state_delayed(hub, port_index, + 10, state, HUB_PORT_STATE_ENABLED); + break; + case HUB_PORT_STATE_RESETTING: + set_port_state_delayed(hub, port_index, + 10, state, HUB_PORT_STATE_ENABLED); + break; + case HUB_PORT_STATE_ENABLED: + if (port->state == HUB_PORT_STATE_RESETTING) { + set_port_status_change(port, HUB_STATUS_C_PORT_RESET); + } + break; + default: + break; + } + + port->state = state; +} + +/** Change state of all ports. + * + * @param hub Hub in question. + * @param state New state for all ports. + */ +void hub_set_port_state_all(hub_t *hub, hub_port_state_t state) +{ + size_t i; + for (i = 0; i < HUB_PORT_COUNT; i++) { + hub_set_port_state(hub, i, state); + } +} + +/** Get port state. + * + * @param hub Hub the port belongs to. + * @param port_index Port index (zero based). + * @return Port state. + */ +hub_port_state_t hub_get_port_state(hub_t *hub, size_t port_index) +{ + hub_port_t *port = get_hub_port(hub, port_index); + if (port == NULL) { + return HUB_PORT_STATE_UNKNOWN; + } + + return port->state; +} + +/** Clear port status change bit. + * + * @param hub Hub the port belongs to. + * @param port_index Port index (zero based). + * @param change Change to be cleared. + */ +void hub_clear_port_status_change(hub_t *hub, size_t port_index, + hub_status_change_t change) +{ + hub_port_t *port = get_hub_port(hub, port_index); + if (port == NULL) { + return; + } + + clear_port_status_change(port, change); +} + +/** Get port status change bits. + * + * @param hub Hub the port belongs to. + * @param port_index Port index (zero based). + * @return Port status change bitmap in standard format. + */ +uint16_t hub_get_port_status_change(hub_t *hub, size_t port_index) +{ + hub_port_t *port = get_hub_port(hub, port_index); + if (port == NULL) { + return 0; + } + + return port->status_change; +} + +/** Get port status bits. + * + * @param hub Hub the port belongs to. + * @param port_index Port index (zero based). + * @return Port status bitmap in standard format. + */ +uint32_t hub_get_port_status(hub_t *hub, size_t port_index) +{ + hub_port_t *port = get_hub_port(hub, port_index); + if (port == NULL) { + return 0; + } + + uint32_t status; + status = MAKE_BYTE( + /* Current connect status. */ + port->connected_device == NULL ? 0 : 1, + /* Port enabled/disabled. */ + port->state == HUB_PORT_STATE_ENABLED ? 1 : 0, + /* Suspend. */ + (port->state == HUB_PORT_STATE_SUSPENDED) + || (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0, + /* Over-current. */ + 0, + /* Reset. */ + port->state == HUB_PORT_STATE_RESETTING ? 1 : 0, + /* Reserved. */ + 0, 0, 0) + + | (MAKE_BYTE( + /* Port power. */ + port->state == HUB_PORT_STATE_POWERED_OFF ? 0 : 1, + /* Full-speed device. */ + 0, + /* Reserved. */ + 0, 0, 0, 0, 0, 0 + )) << 8; + + status |= (port->status_change << 16); + + return status; +} + +/** Create hub status change bitmap. + * + * @warning This function assumes that the whole bitmap fits into 8 bits. + * + * @param hub Hub in question. + * @return Hub status change bitmap. + */ +uint8_t hub_get_status_change_bitmap(hub_t *hub) +{ + uint8_t change_map = 0; + + size_t i; + for (i = 0; i < HUB_PORT_COUNT; i++) { + hub_port_t *port = &hub->ports[i]; + + if (port->status_change != 0) { + change_map |= (1 << port->index); + } + } + + return change_map; +} + + +/* + * + * STATIC (HELPER) FUNCTIONS + * + */ + +/** Find a port in a hub. + * + * @param hub Hub in question. + * @param port Port index (zero based). + * @return Port structure. + * @retval NULL Invalid port index. + */ +static hub_port_t *get_hub_port(hub_t *hub, size_t port) +{ + if (port >= HUB_PORT_COUNT) { + return NULL; + } + + return &hub->ports[port]; +} + +/** Adds a port status change to a port. + * + * @param port The port with status change. + * @param change Change to be added to the status. + */ +static void set_port_status_change(hub_port_t *port, + hub_status_change_t change) +{ + assert(port != NULL); + port->status_change |= change; +} + +/** Clears a port status change on a port. + * + * @param port The port with status change. + * @param change Change to be removed from the status. + */ +static void clear_port_status_change(hub_port_t *port, + uint16_t change) +{ + assert(port != NULL); + port->status_change &= (~change); +} + +/** Structure for automatic (delayed) port state change. */ +struct delay_port_state_change { + /** Delay in microseconds. */ + suseconds_t delay; + /** Old state of the port. */ + hub_port_state_t old_state; + /** New state of the port. */ + hub_port_state_t new_state; + /** Port index (zero based). */ + size_t port; + /** Hub. */ + hub_t *hub; +}; + +/** Fibril responsible for delayed port state change. + * + * @param arg Pointer to delay_port_state_change. + * @return Always EOK. + */ +static int set_port_state_delayed_fibril(void *arg) +{ + struct delay_port_state_change *change + = (struct delay_port_state_change *) arg; + + async_usleep(change->delay); + + hub_acquire(change->hub); + + hub_port_t *port = get_hub_port(change->hub, change->port); + assert(port != NULL); + + if (port->state == change->old_state) { + hub_set_port_state(change->hub, change->port, + change->new_state); + } + + hub_release(change->hub); + + free(change); + + return EOK; +} + +/** Change port state with a delay. + * + * @warning If the port state changes during the waiting phase, the state + * is not changed. + * + * @param hub Hub in question. + * @param port_index Port index (zero based). + * @param delay_time_ms Delay time in miliseconds. + * @param old_state Old (current) state of the port. + * @param new_state New state of the port. + */ +static void set_port_state_delayed(hub_t *hub, size_t port_index, + suseconds_t delay_time_ms, + hub_port_state_t old_state, hub_port_state_t new_state) +{ + struct delay_port_state_change *change + = malloc(sizeof(struct delay_port_state_change)); + + change->hub = hub; + change->port = port_index; + change->delay = delay_time_ms * 1000; + change->old_state = old_state; + change->new_state = new_state; + fid_t fibril = fibril_create(set_port_state_delayed_fibril, change); + if (fibril == 0) { + printf("Failed to create fibril\n"); + free(change); + return; + } + fibril_add_ready(fibril); +} + + + +/** + * @} + */ Index: uspace/drv/vhc/hub/hub.h =================================================================== --- uspace/drv/vhc/hub/hub.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) +++ uspace/drv/vhc/hub/hub.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup usb + * @{ + */ +/** @file + * @brief Representation of an USB hub. + */ +#ifndef VHC_HUB_HUB_H_ +#define VHC_HUB_HUB_H_ + +#include + +#define HUB_PORT_COUNT 2 +#define BITS2BYTES(bits) (bits ? ((((bits)-1)>>3)+1) : 0) + +/** Hub port internal state. + * Some states (e.g. port over current) are not covered as they are not + * simulated at all. + */ +typedef enum { + HUB_PORT_STATE_UNKNOWN, + HUB_PORT_STATE_NOT_CONFIGURED, + HUB_PORT_STATE_POWERED_OFF, + HUB_PORT_STATE_DISCONNECTED, + HUB_PORT_STATE_DISABLED, + HUB_PORT_STATE_RESETTING, + HUB_PORT_STATE_ENABLED, + HUB_PORT_STATE_SUSPENDED, + HUB_PORT_STATE_RESUMING, + /* HUB_PORT_STATE_, */ +} hub_port_state_t; + +char hub_port_state_to_char(hub_port_state_t); + +/** Hub status change mask bits. */ +typedef enum { + HUB_STATUS_C_PORT_CONNECTION = (1 << 0), + HUB_STATUS_C_PORT_ENABLE = (1 << 1), + HUB_STATUS_C_PORT_SUSPEND = (1 << 2), + HUB_STATUS_C_PORT_OVER_CURRENT = (1 << 3), + HUB_STATUS_C_PORT_RESET = (1 << 4), + /* HUB_STATUS_C_ = (1 << ), */ +} hub_status_change_t; + +/** Hub port information. */ +typedef struct { + /** Custom pointer to connected device. */ + void *connected_device; + /** Port index (one based). */ + size_t index; + /** Port state. */ + hub_port_state_t state; + /** Status change bitmap. */ + uint16_t status_change; +} hub_port_t; + +/** Hub device type. */ +typedef struct { + /** Hub ports. */ + hub_port_t ports[HUB_PORT_COUNT]; + /** Custom hub data. */ + void *custom_data; + /** Access guard to the whole hub. */ + fibril_mutex_t guard; +} hub_t; + +void hub_init(hub_t *); +size_t hub_connect_device(hub_t *, void *); +size_t hub_find_device(hub_t *, void *); +void hub_acquire(hub_t *); +void hub_release(hub_t *); +void hub_set_port_state(hub_t *, size_t, hub_port_state_t); +void hub_set_port_state_all(hub_t *, hub_port_state_t); +hub_port_state_t hub_get_port_state(hub_t *, size_t); +void hub_clear_port_status_change(hub_t *, size_t, hub_status_change_t); +uint16_t hub_get_port_status_change(hub_t *, size_t); +uint32_t hub_get_port_status(hub_t *, size_t); +uint8_t hub_get_status_change_bitmap(hub_t *); + + +#endif +/** + * @} + */ Index: uspace/drv/vhc/hub/virthub.c =================================================================== --- uspace/drv/vhc/hub/virthub.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) +++ uspace/drv/vhc/hub/virthub.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -0,0 +1,265 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup usb + * @{ + */ +/** @file + * @brief + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "virthub.h" +#include "hub.h" + + +/** Standard device descriptor. */ +usb_standard_device_descriptor_t std_device_descriptor = { + .length = sizeof(usb_standard_device_descriptor_t), + .descriptor_type = USB_DESCTYPE_DEVICE, + .usb_spec_version = 0x110, + .device_class = USB_CLASS_HUB, + .device_subclass = 0, + .device_protocol = 0, + .max_packet_size = 64, + .configuration_count = 1 +}; + +/** Standard interface descriptor. */ +usb_standard_interface_descriptor_t std_interface_descriptor = { + .length = sizeof(usb_standard_interface_descriptor_t), + .descriptor_type = USB_DESCTYPE_INTERFACE, + .interface_number = 0, + .alternate_setting = 0, + .endpoint_count = 1, + .interface_class = USB_CLASS_HUB, + .interface_subclass = 0, + .interface_protocol = 0, + .str_interface = 0 +}; + +/** Hub descriptor. */ +hub_descriptor_t hub_descriptor = { + .length = sizeof(hub_descriptor_t), + .type = USB_DESCTYPE_HUB, + .port_count = HUB_PORT_COUNT, + .characteristics = 0, + .power_on_warm_up = 50, /* Huh? */ + .max_current = 100, /* Huh again. */ + .removable_device = { 0 }, + .port_power = { 0xFF } +}; + +/** Endpoint descriptor. */ +usb_standard_endpoint_descriptor_t endpoint_descriptor = { + .length = sizeof(usb_standard_endpoint_descriptor_t), + .descriptor_type = USB_DESCTYPE_ENDPOINT, + .endpoint_address = HUB_STATUS_CHANGE_PIPE | 128, + .attributes = USB_TRANSFER_INTERRUPT, + .max_packet_size = 8, + .poll_interval = 0xFF +}; + +/** Standard configuration descriptor. */ +usb_standard_configuration_descriptor_t std_configuration_descriptor = { + .length = sizeof(usb_standard_configuration_descriptor_t), + .descriptor_type = USB_DESCTYPE_CONFIGURATION, + .total_length = + sizeof(usb_standard_configuration_descriptor_t) + + sizeof(std_interface_descriptor) + + sizeof(hub_descriptor) + + sizeof(endpoint_descriptor) + , + .interface_count = 1, + .configuration_number = HUB_CONFIGURATION_ID, + .str_configuration = 0, + .attributes = 128, /* denotes bus-powered device */ + .max_power = 50 +}; + +/** All hub configuration descriptors. */ +static usbvirt_device_configuration_extras_t extra_descriptors[] = { + { + .data = (uint8_t *) &std_interface_descriptor, + .length = sizeof(std_interface_descriptor) + }, + { + .data = (uint8_t *) &hub_descriptor, + .length = sizeof(hub_descriptor) + }, + { + .data = (uint8_t *) &endpoint_descriptor, + .length = sizeof(endpoint_descriptor) + } +}; + +/** Hub configuration. */ +usbvirt_device_configuration_t configuration = { + .descriptor = &std_configuration_descriptor, + .extra = extra_descriptors, + .extra_count = sizeof(extra_descriptors)/sizeof(extra_descriptors[0]) +}; + +/** Hub standard descriptors. */ +usbvirt_descriptors_t descriptors = { + .device = &std_device_descriptor, + .configuration = &configuration, + .configuration_count = 1, +}; + +/** Initializes virtual hub device. + * + * @param dev Virtual USB device backend. + * @return Error code. + */ +int virthub_init(usbvirt_device_t *dev) +{ + if (dev == NULL) { + return EBADMEM; + } + dev->ops = &hub_ops; + dev->descriptors = &descriptors; + dev->lib_debug_level = 0; + dev->lib_debug_enabled_tags = USBVIRT_DEBUGTAG_ALL; + + hub_t *hub = malloc(sizeof(hub_t)); + if (hub == NULL) { + return ENOMEM; + } + + hub_init(hub); + dev->device_data = hub; + + usbvirt_connect_local(dev); + + return EOK; +} + +/** Connect a device to a virtual hub. + * + * @param dev Virtual device representing the hub. + * @param conn Device to be connected. + * @return Port device was connected to. + */ +int virthub_connect_device(usbvirt_device_t *dev, virtdev_connection_t *conn) +{ + assert(dev != NULL); + assert(conn != NULL); + + hub_t *hub = (hub_t *) dev->device_data; + + hub_acquire(hub); + size_t port = hub_connect_device(hub, conn); + hub_release(hub); + + return port; +} + +/** Disconnect a device from a virtual hub. + * + * @param dev Virtual device representing the hub. + * @param conn Device to be disconnected. + * @return Error code. + */ +int virthub_disconnect_device(usbvirt_device_t *dev, virtdev_connection_t *conn) +{ + assert(dev != NULL); + assert(conn != NULL); + + hub_t *hub = (hub_t *) dev->device_data; + + hub_acquire(hub); + /* TODO: implement. */ + hub_release(hub); + + return ENOTSUP; +} + +/** Whether trafic is propagated to given device. + * + * @param dev Virtual device representing the hub. + * @param conn Connected device. + * @return Whether port is signalling to the device. + */ +bool virthub_is_device_enabled(usbvirt_device_t *dev, virtdev_connection_t *conn) +{ + assert(dev != NULL); + assert(conn != NULL); + + hub_t *hub = (hub_t *) dev->device_data; + + hub_acquire(hub); + + hub_port_state_t state = HUB_PORT_STATE_UNKNOWN; + size_t port = hub_find_device(hub, conn); + if (port != (size_t) -1) { + state = hub_get_port_state(hub, port); + } + hub_release(hub); + + return state == HUB_PORT_STATE_ENABLED; +} + +/** Format status of a virtual hub. + * + * @param dev Virtual device representing the hub. + * @param[out] status Hub status information. + * @param[in] len Size of the @p status buffer. + */ +void virthub_get_status(usbvirt_device_t *dev, char *status, size_t len) +{ + assert(dev != NULL); + if (len == 0) { + return; + } + + hub_t *hub = (hub_t *) dev->device_data; + + char port_status[HUB_PORT_COUNT + 1]; + + size_t i; + for (i = 0; i < HUB_PORT_COUNT; i++) { + port_status[i] = hub_port_state_to_char( + hub_get_port_state(hub, i)); + } + port_status[HUB_PORT_COUNT] = 0; + + snprintf(status, len, "vhub:%s", port_status); +} + +/** + * @} + */ Index: uspace/drv/vhc/hub/virthub.h =================================================================== --- uspace/drv/vhc/hub/virthub.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) +++ uspace/drv/vhc/hub/virthub.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup usb + * @{ + */ +/** @file + * @brief USB hub as a virtual USB device. + */ +#ifndef VHC_HUB_VIRTHUB_H_ +#define VHC_HUB_VIRTHUB_H_ + +#include +#include "../devices.h" +#include "hub.h" + +/** Endpoint number for status change pipe. */ +#define HUB_STATUS_CHANGE_PIPE 1 +/** Configuration value for hub configuration. */ +#define HUB_CONFIGURATION_ID 1 + + +/** Hub descriptor. + */ +typedef struct { + /** Size of this descriptor in bytes. */ + uint8_t length; + /** Descriptor type (USB_DESCTYPE_HUB). */ + uint8_t type; + /** Number of downstream ports. */ + uint8_t port_count; + /** Hub characteristics. */ + uint16_t characteristics; + /** Time from power-on to stabilized current. + * Expressed in 2ms unit. + */ + uint8_t power_on_warm_up; + /** Maximum current (in mA). */ + uint8_t max_current; + /** Whether device at given port is removable. */ + uint8_t removable_device[BITS2BYTES(HUB_PORT_COUNT+1)]; + /** Port power control. + * This is USB1.0 compatibility field, all bits must be 1. + */ + uint8_t port_power[BITS2BYTES(HUB_PORT_COUNT+1)]; +} __attribute__ ((packed)) hub_descriptor_t; + +extern usbvirt_device_ops_t hub_ops; +extern hub_descriptor_t hub_descriptor; + +int virthub_init(usbvirt_device_t *); +int virthub_connect_device(usbvirt_device_t *, virtdev_connection_t *); +int virthub_disconnect_device(usbvirt_device_t *, virtdev_connection_t *); +bool virthub_is_device_enabled(usbvirt_device_t *, virtdev_connection_t *); +void virthub_get_status(usbvirt_device_t *, char *, size_t); + +#endif +/** + * @} + */ Index: uspace/drv/vhc/hub/virthubops.c =================================================================== --- uspace/drv/vhc/hub/virthubops.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) +++ uspace/drv/vhc/hub/virthubops.c (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -0,0 +1,433 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup usb + * @{ + */ +/** @file + * @brief Virtual USB hub operations. + */ +#include +#include +#include "virthub.h" +#include "hub.h" + +/** Callback when device changes states. */ +static void on_state_change(struct usbvirt_device *dev, + usbvirt_device_state_t old_state, usbvirt_device_state_t new_state) +{ + hub_t *hub = (hub_t *)dev->device_data; + + hub_acquire(hub); + + switch (new_state) { + case USBVIRT_STATE_CONFIGURED: + hub_set_port_state_all(hub, HUB_PORT_STATE_POWERED_OFF); + break; + case USBVIRT_STATE_ADDRESS: + hub_set_port_state_all(hub, HUB_PORT_STATE_NOT_CONFIGURED); + break; + default: + break; + } + + hub_release(hub); +} + +/** Callback for data request. */ +static int req_on_data(struct usbvirt_device *dev, + usb_endpoint_t endpoint, + void *buffer, size_t size, size_t *actual_size) +{ + if (endpoint != HUB_STATUS_CHANGE_PIPE) { + return EINVAL; + } + + hub_t *hub = (hub_t *)dev->device_data; + + hub_acquire(hub); + + uint8_t change_map = hub_get_status_change_bitmap(hub); + + uint8_t *b = (uint8_t *) buffer; + if (size > 0) { + *b = change_map; + *actual_size = 1; + } + + hub_release(hub); + + return EOK; +} + +/** Handle ClearHubFeature request. + * + * @param dev Virtual device representing the hub. + * @param request The SETUP packet of the control request. + * @param data Extra data (when DATA stage present). + * @return Error code. + */ +static int req_clear_hub_feature(usbvirt_device_t *dev, + usb_device_request_setup_packet_t *request, + uint8_t *data) +{ + return ENOTSUP; +} + +/** Handle ClearPortFeature request. + * + * @param dev Virtual device representing the hub. + * @param request The SETUP packet of the control request. + * @param data Extra data (when DATA stage present). + * @return Error code. + */ +static int req_clear_port_feature(usbvirt_device_t *dev, + usb_device_request_setup_packet_t *request, + uint8_t *data) +{ + int rc; + size_t port = request->index - 1; + usb_hub_class_feature_t feature = request->value; + hub_t *hub = (hub_t *) dev->device_data; + + hub_acquire(hub); + + hub_port_state_t port_state = hub_get_port_state(hub, port); + + switch (feature) { + case USB_HUB_FEATURE_PORT_ENABLE: + if ((port_state != HUB_PORT_STATE_NOT_CONFIGURED) + && (port_state != HUB_PORT_STATE_POWERED_OFF)) { + hub_set_port_state(hub, port, HUB_PORT_STATE_DISABLED); + } + rc = EOK; + break; + + case USB_HUB_FEATURE_PORT_SUSPEND: + if (port_state != HUB_PORT_STATE_SUSPENDED) { + rc = EOK; + break; + } + hub_set_port_state(hub, port, HUB_PORT_STATE_RESUMING); + rc = EOK; + break; + + case USB_HUB_FEATURE_PORT_POWER: + if (port_state != HUB_PORT_STATE_NOT_CONFIGURED) { + hub_set_port_state(hub, port, HUB_PORT_STATE_POWERED_OFF); + } + rc = EOK; + break; + + case USB_HUB_FEATURE_C_PORT_CONNECTION: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_CONNECTION); + rc = EOK; + break; + + case USB_HUB_FEATURE_C_PORT_ENABLE: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_ENABLE); + rc = EOK; + break; + + case USB_HUB_FEATURE_C_PORT_SUSPEND: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_SUSPEND); + rc = EOK; + break; + + case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_OVER_CURRENT); + rc = EOK; + break; + + case USB_HUB_FEATURE_C_PORT_RESET: + hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_RESET); + rc = EOK; + break; + + default: + rc = ENOTSUP; + break; + } + + hub_release(hub); + + return rc; +} + +/** Handle GetBusState request. + * + * @param dev Virtual device representing the hub. + * @param request The SETUP packet of the control request. + * @param data Extra data (when DATA stage present). + * @return Error code. + */ +static int req_get_bus_state(usbvirt_device_t *dev, + usb_device_request_setup_packet_t *request, + uint8_t *data) +{ + return ENOTSUP; +} + +/** Handle GetDescriptor request. + * + * @param dev Virtual device representing the hub. + * @param request The SETUP packet of the control request. + * @param data Extra data (when DATA stage present). + * @return Error code. + */ +static int req_get_descriptor(usbvirt_device_t *dev, + usb_device_request_setup_packet_t *request, + uint8_t *data) +{ + if (request->value_high == USB_DESCTYPE_HUB) { + int rc = dev->control_transfer_reply(dev, 0, + &hub_descriptor, hub_descriptor.length); + + return rc; + } + /* Let the framework handle all the rest. */ + return EFORWARD; +} + +/** Handle GetHubStatus request. + * + * @param dev Virtual device representing the hub. + * @param request The SETUP packet of the control request. + * @param data Extra data (when DATA stage present). + * @return Error code. + */ +static int req_get_hub_status(usbvirt_device_t *dev, + usb_device_request_setup_packet_t *request, + uint8_t *data) +{ + uint32_t hub_status = 0; + + return dev->control_transfer_reply(dev, 0, + &hub_status, sizeof(hub_status)); +} + +/** Handle GetPortStatus request. + * + * @param dev Virtual device representing the hub. + * @param request The SETUP packet of the control request. + * @param data Extra data (when DATA stage present). + * @return Error code. + */ +static int req_get_port_status(usbvirt_device_t *dev, + usb_device_request_setup_packet_t *request, + uint8_t *data) +{ + hub_t *hub = (hub_t *) dev->device_data; + + hub_acquire(hub); + + uint32_t status = hub_get_port_status(hub, request->index - 1); + + hub_release(hub); + + return dev->control_transfer_reply(dev, 0, &status, 4); +} + +/** Handle SetHubFeature request. + * + * @param dev Virtual device representing the hub. + * @param request The SETUP packet of the control request. + * @param data Extra data (when DATA stage present). + * @return Error code. + */ +static int req_set_hub_feature(usbvirt_device_t *dev, + usb_device_request_setup_packet_t *request, + uint8_t *data) +{ + return ENOTSUP; +} + +/** Handle SetPortFeature request. + * + * @param dev Virtual device representing the hub. + * @param request The SETUP packet of the control request. + * @param data Extra data (when DATA stage present). + * @return Error code. + */ +static int req_set_port_feature(usbvirt_device_t *dev, + usb_device_request_setup_packet_t *request, + uint8_t *data) +{ + int rc; + size_t port = request->index - 1; + usb_hub_class_feature_t feature = request->value; + hub_t *hub = (hub_t *) dev->device_data; + + hub_acquire(hub); + + hub_port_state_t port_state = hub_get_port_state(hub, port); + + switch (feature) { + case USB_HUB_FEATURE_PORT_RESET: + if (port_state != HUB_PORT_STATE_POWERED_OFF) { + hub_set_port_state(hub, port, HUB_PORT_STATE_RESETTING); + } + rc = EOK; + break; + + case USB_HUB_FEATURE_PORT_SUSPEND: + if (port_state == HUB_PORT_STATE_ENABLED) { + hub_set_port_state(hub, port, HUB_PORT_STATE_SUSPENDED); + } + rc = EOK; + break; + + case USB_HUB_FEATURE_PORT_POWER: + if (port_state == HUB_PORT_STATE_POWERED_OFF) { + hub_set_port_state(hub, port, HUB_PORT_STATE_DISCONNECTED); + } + rc = EOK; + break; + + default: + break; + } + + hub_release(hub); + + return rc; +} + + +/** IN class request. */ +#define CLASS_REQ_IN(recipient) \ + USBVIRT_MAKE_CONTROL_REQUEST_TYPE(USB_DIRECTION_IN, \ + USBVIRT_REQUEST_TYPE_CLASS, recipient) +/** OUT class request. */ +#define CLASS_REQ_OUT(recipient) \ + USBVIRT_MAKE_CONTROL_REQUEST_TYPE(USB_DIRECTION_OUT, \ + USBVIRT_REQUEST_TYPE_CLASS, recipient) + +/** Recipient: other. */ +#define REC_OTHER USBVIRT_REQUEST_RECIPIENT_OTHER +/** Recipient: device. */ +#define REC_DEVICE USBVIRT_REQUEST_RECIPIENT_DEVICE +/** Direction: in. */ +#define DIR_IN USB_DIRECTION_IN +/** Direction: out. */ +#define DIR_OUT USB_DIRECTION_OUT + +/** Create a class request. + * + * @param direction Request direction. + * @param recipient Request recipient. + * @param req Request code. + */ +#define CLASS_REQ(direction, recipient, req) \ + .request_type = USBVIRT_MAKE_CONTROL_REQUEST_TYPE(direction, \ + USBVIRT_REQUEST_TYPE_CLASS, recipient), \ + .request = req + +/** Create a standard request. + * + * @param direction Request direction. + * @param recipient Request recipient. + * @param req Request code. + */ +#define STD_REQ(direction, recipient, req) \ + .request_type = USBVIRT_MAKE_CONTROL_REQUEST_TYPE(direction, \ + USBVIRT_REQUEST_TYPE_STANDARD, recipient), \ + .request = req + +/** Hub operations on control endpoint zero. */ +static usbvirt_control_transfer_handler_t endpoint_zero_handlers[] = { + { + STD_REQ(DIR_IN, REC_DEVICE, USB_DEVREQ_GET_DESCRIPTOR), + .name = "GetDescriptor", + .callback = req_get_descriptor + }, + { + CLASS_REQ(DIR_IN, REC_DEVICE, USB_DEVREQ_GET_DESCRIPTOR), + .name = "GetDescriptor", + .callback = req_get_descriptor + }, + { + CLASS_REQ(DIR_IN, REC_OTHER, USB_HUB_REQUEST_GET_STATUS), + .name = "GetPortStatus", + .callback = req_get_port_status + }, + { + CLASS_REQ(DIR_OUT, REC_DEVICE, USB_HUB_REQUEST_CLEAR_FEATURE), + .name = "ClearHubFeature", + .callback = req_clear_hub_feature + }, + { + CLASS_REQ(DIR_OUT, REC_OTHER, USB_HUB_REQUEST_CLEAR_FEATURE), + .name = "ClearPortFeature", + .callback = req_clear_port_feature + }, + { + CLASS_REQ(DIR_IN, REC_OTHER, USB_HUB_REQUEST_GET_STATE), + .name = "GetBusState", + .callback = req_get_bus_state + }, + { + CLASS_REQ(DIR_IN, REC_DEVICE, USB_HUB_REQUEST_GET_DESCRIPTOR), + .name = "GetHubDescriptor", + .callback = req_get_descriptor + }, + { + CLASS_REQ(DIR_IN, REC_DEVICE, USB_HUB_REQUEST_GET_STATUS), + .name = "GetHubStatus", + .callback = req_get_hub_status + }, + { + CLASS_REQ(DIR_IN, REC_OTHER, USB_HUB_REQUEST_GET_STATUS), + .name = "GetPortStatus", + .callback = req_get_port_status + }, + { + CLASS_REQ(DIR_OUT, REC_DEVICE, USB_HUB_REQUEST_SET_FEATURE), + .name = "SetHubFeature", + .callback = req_set_hub_feature + }, + { + CLASS_REQ(DIR_OUT, REC_OTHER, USB_HUB_REQUEST_SET_FEATURE), + .name = "SetPortFeature", + .callback = req_set_port_feature + }, + USBVIRT_CONTROL_TRANSFER_HANDLER_LAST +}; + + +/** Hub operations. */ +usbvirt_device_ops_t hub_ops = { + .control_transfer_handlers = endpoint_zero_handlers, + .on_data = NULL, + .on_data_request = req_on_data, + .on_state_change = on_state_change, +}; + +/** + * @} + */ Index: uspace/drv/vhc/hubintern.h =================================================================== --- uspace/drv/vhc/hubintern.h (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ (revision ) @@ -1,145 +1,0 @@ -/* - * Copyright (c) 2010 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup usb - * @{ - */ -/** @file - * @brief - */ -#ifndef VHCD_HUBINTERN_H_ -#define VHCD_HUBINTERN_H_ - -#include "hub.h" - -/** Endpoint number for status change pipe. */ -#define HUB_STATUS_CHANGE_PIPE 1 -/** Configuration value for hub configuration. */ -#define HUB_CONFIGURATION_ID 1 - -/** Hub descriptor. - */ -typedef struct { - /** Size of this descriptor in bytes. */ - uint8_t length; - /** Descriptor type (USB_DESCTYPE_HUB). */ - uint8_t type; - /** Number of downstream ports. */ - uint8_t port_count; - /** Hub characteristics. */ - uint16_t characteristics; - /** Time from power-on to stabilized current. - * Expressed in 2ms unit. - */ - uint8_t power_on_warm_up; - /** Maximum current (in mA). */ - uint8_t max_current; - /** Whether device at given port is removable. */ - uint8_t removable_device[BITS2BYTES(HUB_PORT_COUNT+1)]; - /** Port power control. - * This is USB1.0 compatibility field, all bits must be 1. - */ - uint8_t port_power[BITS2BYTES(HUB_PORT_COUNT+1)]; -} __attribute__ ((packed)) hub_descriptor_t; - -/** Hub port internal state. - * Some states (e.g. port over current) are not covered as they are not - * simulated at all. - */ -typedef enum { - HUB_PORT_STATE_NOT_CONFIGURED, - HUB_PORT_STATE_POWERED_OFF, - HUB_PORT_STATE_DISCONNECTED, - HUB_PORT_STATE_DISABLED, - HUB_PORT_STATE_RESETTING, - HUB_PORT_STATE_ENABLED, - HUB_PORT_STATE_SUSPENDED, - HUB_PORT_STATE_RESUMING, - /* HUB_PORT_STATE_, */ -} hub_port_state_t; - -/** Convert hub port state to a char. */ -static inline char hub_port_state_as_char(hub_port_state_t state) { - switch (state) { - case HUB_PORT_STATE_NOT_CONFIGURED: - return '-'; - case HUB_PORT_STATE_POWERED_OFF: - return 'O'; - case HUB_PORT_STATE_DISCONNECTED: - return 'X'; - case HUB_PORT_STATE_DISABLED: - return 'D'; - case HUB_PORT_STATE_RESETTING: - return 'R'; - case HUB_PORT_STATE_ENABLED: - return 'E'; - case HUB_PORT_STATE_SUSPENDED: - return 'S'; - case HUB_PORT_STATE_RESUMING: - return 'F'; - default: - return '?'; - } -} - -/** Hub status change mask bits. */ -typedef enum { - HUB_STATUS_C_PORT_CONNECTION = (1 << 0), - HUB_STATUS_C_PORT_ENABLE = (1 << 1), - HUB_STATUS_C_PORT_SUSPEND = (1 << 2), - HUB_STATUS_C_PORT_OVER_CURRENT = (1 << 3), - HUB_STATUS_C_PORT_RESET = (1 << 4), - /* HUB_STATUS_C_ = (1 << ), */ -} hub_status_change_t; - -/** Hub port information. */ -typedef struct { - virtdev_connection_t *device; - hub_port_state_t state; - uint16_t status_change; -} hub_port_t; - -/** Hub device type. */ -typedef struct { - hub_port_t ports[HUB_PORT_COUNT]; -} hub_device_t; - -extern hub_device_t hub_dev; - -extern hub_descriptor_t hub_descriptor; - -extern usbvirt_device_ops_t hub_ops; - -void clear_port_status_change(hub_port_t *, uint16_t); -void set_port_status_change(hub_port_t *, uint16_t); - - -#endif -/** - * @} - */ Index: uspace/drv/vhc/hubops.c =================================================================== --- uspace/drv/vhc/hubops.c (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ (revision ) @@ -1,393 +1,0 @@ -/* - * Copyright (c) 2010 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup usb - * @{ - */ -/** @file - * @brief Virtual USB hub operations. - */ -#include -#include -#include -#include -#include - -#include "vhcd.h" -#include "hub.h" -#include "hubintern.h" - -/** Produce a byte from bit values. - */ -#define MAKE_BYTE(b0, b1, b2, b3, b4, b5, b6, b7) \ - (( \ - ((b0) << 0) \ - | ((b1) << 1) \ - | ((b2) << 2) \ - | ((b3) << 3) \ - | ((b4) << 4) \ - | ((b5) << 5) \ - | ((b6) << 6) \ - | ((b7) << 7) \ - )) - -static int on_get_descriptor(struct usbvirt_device *dev, - usb_device_request_setup_packet_t *request, uint8_t *data); -static int on_class_request(struct usbvirt_device *dev, - usb_device_request_setup_packet_t *request, uint8_t *data); -static int on_data_request(struct usbvirt_device *dev, - usb_endpoint_t endpoint, - void *buffer, size_t size, size_t *actual_size); - -/** Standard USB requests. */ -static usbvirt_standard_device_request_ops_t standard_request_ops = { - .on_get_status = NULL, - .on_clear_feature = NULL, - .on_set_feature = NULL, - .on_set_address = NULL, - .on_get_descriptor = on_get_descriptor, - .on_set_descriptor = NULL, - .on_get_configuration = NULL, - .on_set_configuration = NULL, - .on_get_interface = NULL, - .on_set_interface = NULL, - .on_synch_frame = NULL -}; - -/** Hub operations. */ -usbvirt_device_ops_t hub_ops = { - .standard_request_ops = &standard_request_ops, - .on_class_device_request = on_class_request, - .on_data = NULL, - .on_data_request = on_data_request -}; - -/** Callback for GET_DESCRIPTOR request. */ -static int on_get_descriptor(struct usbvirt_device *dev, - usb_device_request_setup_packet_t *request, uint8_t *data) -{ - if (request->value_high == USB_DESCTYPE_HUB) { - int rc = dev->control_transfer_reply(dev, 0, - &hub_descriptor, hub_descriptor.length); - - return rc; - } - /* Let the framework handle all the rest. */ - return EFORWARD; -} - -/** Change port status and updates status change status fields. - */ -static void set_port_state(hub_port_t *port, hub_port_state_t state) -{ - port->state = state; - if (state == HUB_PORT_STATE_POWERED_OFF) { - clear_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION); - clear_port_status_change(port, HUB_STATUS_C_PORT_ENABLE); - clear_port_status_change(port, HUB_STATUS_C_PORT_RESET); - } - if (state == HUB_PORT_STATE_RESUMING) { - async_usleep(10*1000); - if (port->state == state) { - set_port_state(port, HUB_PORT_STATE_ENABLED); - } - } - if (state == HUB_PORT_STATE_RESETTING) { - async_usleep(10*1000); - if (port->state == state) { - set_port_status_change(port, HUB_STATUS_C_PORT_RESET); - set_port_state(port, HUB_PORT_STATE_ENABLED); - } - } -} - -/** Get access to a port or return with EINVAL. */ -#define _GET_PORT(portvar, index) \ - do { \ - if (virthub_dev.state != USBVIRT_STATE_CONFIGURED) { \ - return EINVAL; \ - } \ - if (((index) == 0) || ((index) > HUB_PORT_COUNT)) { \ - return EINVAL; \ - } \ - } while (false); \ - hub_port_t *portvar = &hub_dev.ports[index] - - -static int clear_hub_feature(uint16_t feature) -{ - return ENOTSUP; -} - -static int clear_port_feature(uint16_t feature, uint16_t portindex) -{ - _GET_PORT(port, portindex); - - switch (feature) { - case USB_HUB_FEATURE_PORT_ENABLE: - if ((port->state != HUB_PORT_STATE_NOT_CONFIGURED) - && (port->state != HUB_PORT_STATE_POWERED_OFF)) { - set_port_state(port, HUB_PORT_STATE_DISABLED); - } - return EOK; - - case USB_HUB_FEATURE_PORT_SUSPEND: - if (port->state != HUB_PORT_STATE_SUSPENDED) { - return EOK; - } - set_port_state(port, HUB_PORT_STATE_RESUMING); - return EOK; - - case USB_HUB_FEATURE_PORT_POWER: - if (port->state != HUB_PORT_STATE_NOT_CONFIGURED) { - set_port_state(port, HUB_PORT_STATE_POWERED_OFF); - } - return EOK; - - case USB_HUB_FEATURE_C_PORT_CONNECTION: - clear_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION); - return EOK; - - case USB_HUB_FEATURE_C_PORT_ENABLE: - clear_port_status_change(port, HUB_STATUS_C_PORT_ENABLE); - return EOK; - - case USB_HUB_FEATURE_C_PORT_SUSPEND: - clear_port_status_change(port, HUB_STATUS_C_PORT_SUSPEND); - return EOK; - - case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: - clear_port_status_change(port, HUB_STATUS_C_PORT_OVER_CURRENT); - return EOK; - } - - return ENOTSUP; -} - -static int get_bus_state(uint16_t portindex) -{ - return ENOTSUP; -} - -static int get_hub_descriptor(struct usbvirt_device *dev, - uint8_t descriptor_index, - uint8_t descriptor_type, uint16_t length) -{ - if (descriptor_type == USB_DESCTYPE_HUB) { - int rc = dev->control_transfer_reply(dev, 0, - &hub_descriptor, hub_descriptor.length); - - return rc; - - } - - return ENOTSUP; -} - -static int get_hub_status(void) -{ - uint32_t hub_status = 0; - - return virthub_dev.control_transfer_reply(&virthub_dev, 0, - &hub_status, 4); -} - -static int get_port_status(uint16_t portindex) -{ - _GET_PORT(port, portindex); - - uint32_t status; - status = MAKE_BYTE( - /* Current connect status. */ - port->device == NULL ? 0 : 1, - /* Port enabled/disabled. */ - port->state == HUB_PORT_STATE_ENABLED ? 1 : 0, - /* Suspend. */ - (port->state == HUB_PORT_STATE_SUSPENDED) - || (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0, - /* Over-current. */ - 0, - /* Reset. */ - port->state == HUB_PORT_STATE_RESETTING ? 1 : 0, - /* Reserved. */ - 0, 0, 0) - - | (MAKE_BYTE( - /* Port power. */ - port->state == HUB_PORT_STATE_POWERED_OFF ? 0 : 1, - /* Full-speed device. */ - 0, - /* Reserved. */ - 0, 0, 0, 0, 0, 0 - )) << 8; - - status |= (port->status_change << 16); - - return virthub_dev.control_transfer_reply(&virthub_dev, 0, &status, 4); -} - - -static int set_hub_feature(uint16_t feature) -{ - return ENOTSUP; -} - -static int set_port_feature(uint16_t feature, uint16_t portindex) -{ - _GET_PORT(port, portindex); - - switch (feature) { - case USB_HUB_FEATURE_PORT_RESET: - if (port->state != HUB_PORT_STATE_POWERED_OFF) { - set_port_state(port, HUB_PORT_STATE_RESETTING); - } - return EOK; - - case USB_HUB_FEATURE_PORT_SUSPEND: - if (port->state == HUB_PORT_STATE_ENABLED) { - set_port_state(port, HUB_PORT_STATE_SUSPENDED); - } - return EOK; - - case USB_HUB_FEATURE_PORT_POWER: - if (port->state == HUB_PORT_STATE_POWERED_OFF) { - set_port_state(port, HUB_PORT_STATE_DISCONNECTED); - } - return EOK; - } - return ENOTSUP; -} - -#undef _GET_PORT - - -/** Callback for class request. */ -static int on_class_request(struct usbvirt_device *dev, - usb_device_request_setup_packet_t *request, uint8_t *data) -{ - dprintf(2, "hub class request (%d)\n", (int) request->request); - - uint8_t recipient = request->request_type & 31; - uint8_t direction = request->request_type >> 7; - -#define _VERIFY(cond) \ - do { \ - if (!(cond)) { \ - dprintf(0, "WARN: invalid class request (%s not met).\n", \ - NAME, #cond); \ - return EINVAL; \ - } \ - } while (0) - - switch (request->request) { - case USB_HUB_REQUEST_CLEAR_FEATURE: - _VERIFY(direction == 0); - _VERIFY(request->length == 0); - if (recipient == 0) { - _VERIFY(request->index == 0); - return clear_hub_feature(request->value); - } else { - _VERIFY(recipient == 3); - return clear_port_feature(request->value, - request->index); - } - - case USB_HUB_REQUEST_GET_STATE: - return get_bus_state(request->index); - - case USB_HUB_REQUEST_GET_DESCRIPTOR: - return get_hub_descriptor(dev, request->value_low, - request->value_high, request->length); - - case USB_HUB_REQUEST_GET_STATUS: - if (recipient == 0) { - return get_hub_status(); - } else { - return get_port_status(request->index); - } - - case USB_HUB_REQUEST_SET_FEATURE: - if (recipient == 0) { - return set_hub_feature(request->value); - } else { - return set_port_feature(request->value, request->index); - } - - default: - break; - } - -#undef _VERIFY - - - return EOK; -} - -void clear_port_status_change(hub_port_t *port, uint16_t change) -{ - port->status_change &= (~change); -} - -void set_port_status_change(hub_port_t *port, uint16_t change) -{ - port->status_change |= change; -} - -/** Callback for data request. */ -static int on_data_request(struct usbvirt_device *dev, - usb_endpoint_t endpoint, - void *buffer, size_t size, size_t *actual_size) -{ - if (endpoint != HUB_STATUS_CHANGE_PIPE) { - return EINVAL; - } - - uint8_t change_map = 0; - - size_t i; - for (i = 0; i < HUB_PORT_COUNT; i++) { - hub_port_t *port = &hub_dev.ports[i]; - - if (port->status_change != 0) { - change_map |= (1 << (i + 1)); - } - } - - uint8_t *b = (uint8_t *) buffer; - if (size > 0) { - *b = change_map; - *actual_size = 1; - } - - return EOK; -} - - -/** - * @} - */ Index: uspace/drv/vhc/vhcd.h =================================================================== --- uspace/drv/vhc/vhcd.h (revision 692f13e4f75dab05af609f6220c92abfd06ba037) +++ uspace/drv/vhc/vhcd.h (revision 82122f3318b0329d89c50e24444e185cd1fe9adb) @@ -47,5 +47,5 @@ #define dprintf(level, format, ...) \ usb_dprintf(NAME, (level), format "\n", ##__VA_ARGS__) -void dprintf_inval_call(int, ipc_call_t, ipcarg_t); +void dprintf_inval_call(int, ipc_call_t, sysarg_t); #endif