Index: uspace/drv/ohci/root_hub.c =================================================================== --- uspace/drv/ohci/root_hub.c (revision c6ba274aa68a445083bad01216d871fc194dcdd6) +++ uspace/drv/ohci/root_hub.c (revision 8123695a05edc85df5433b25264e0e8c0cbf18a2) @@ -110,4 +110,39 @@ .poll_interval = 255, }; + +static const uint32_t hub_clear_feature_valid_mask = + (1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER) + + (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT); + +static const uint32_t hub_clear_feature_by_writing_one_mask = + 1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER; + +static const uint32_t hub_set_feature_valid_mask = + (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT); + + +static const uint32_t hub_set_feature_direct_mask = + (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT); + +static const uint32_t port_set_feature_valid_mask = + (1 << USB_HUB_FEATURE_PORT_ENABLE) + + (1 << USB_HUB_FEATURE_PORT_SUSPEND) + + (1 << USB_HUB_FEATURE_PORT_RESET) + + (1 << USB_HUB_FEATURE_PORT_POWER); + +static const uint32_t port_clear_feature_valid_mask = + (1 << USB_HUB_FEATURE_PORT_CONNECTION) + + (1 << USB_HUB_FEATURE_PORT_SUSPEND) + + (1 << USB_HUB_FEATURE_PORT_OVER_CURRENT) + + (1 << USB_HUB_FEATURE_PORT_POWER) + + (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) + + (1 << USB_HUB_FEATURE_C_PORT_ENABLE) + + (1 << USB_HUB_FEATURE_C_PORT_SUSPEND) + + (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) + + (1 << USB_HUB_FEATURE_C_PORT_RESET); +//note that USB_HUB_FEATURE_PORT_POWER bit is translated into USB_HUB_FEATURE_PORT_LOW_SPEED + + + /** @@ -212,5 +247,7 @@ instance->registers = regs; instance->device = dev; + instance->port_count = instance->registers->rh_desc_a & 0xff; rh_init_descriptors(instance); + /// \TODO set port power mode @@ -426,26 +463,49 @@ /** - * process feature-enabling/disabling request on hub + * process feature-enabling request on hub * * @param instance root hub instance * @param feature feature selector - * @param enable enable or disable specified feature * @return error code */ static int process_hub_feature_set_request(rh_t *instance, - uint16_t feature, bool enable){ - if(feature > USB_HUB_FEATURE_C_HUB_OVER_CURRENT) + uint16_t feature){ + if(! ((1<registers->rh_status = - enable ? (instance->registers->rh_status | (1<registers->rh_status & (~(1<registers->rh_status = + (instance->registers->rh_status & (~(1<registers->rh_status = + (instance->registers->rh_status + & (~ hub_clear_feature_by_writing_one_mask)) + | (1< USB_HUB_FEATURE_C_PORT_RESET) + uint16_t feature, uint16_t port){ + if(!((1<instance->port_count) return EINVAL; instance->registers->rh_port_status[port - 1] = - enable ? (instance->registers->rh_port_status[port - 1] | (1<registers->rh_port_status[port - 1] & (~(1<instance->port_count) + return EINVAL; + if(feature == USB_HUB_FEATURE_PORT_POWER) + feature = USB_HUB_FEATURE_PORT_LOW_SPEED; + if(feature == USB_HUB_FEATURE_PORT_SUSPEND) + feature = USB_HUB_FEATURE_PORT_OVER_CURRENT; + instance->registers->rh_port_status[port - 1] = + (instance->registers->rh_port_status[port - 1] + & (~port_clear_feature_valid_mask)) + | (1<setup_buffer; request->transfered_size = 0; - if(setup_request->request == USB_DEVREQ_CLEAR_FEATURE - || setup_request->request == USB_DEVREQ_SET_FEATURE){ + if(setup_request->request == USB_DEVREQ_CLEAR_FEATURE){ if(setup_request->request_type == USB_HUB_REQ_TYPE_SET_HUB_FEATURE){ usb_log_debug("USB_HUB_REQ_TYPE_SET_HUB_FEATURE\n"); - return process_hub_feature_set_request(instance, setup_request->value, - setup_request->request == USB_DEVREQ_SET_FEATURE); + return process_hub_feature_clear_request(instance, + setup_request->value); } if(setup_request->request_type == USB_HUB_REQ_TYPE_SET_PORT_FEATURE){ usb_log_debug("USB_HUB_REQ_TYPE_SET_PORT_FEATURE\n"); - return process_port_feature_set_request(instance, setup_request->value, - setup_request->index, - setup_request->request == USB_DEVREQ_SET_FEATURE); + return process_port_feature_clear_request(instance, + setup_request->value, + setup_request->index); + } + usb_log_debug("USB_HUB_REQ_TYPE_INVALID %d\n", + setup_request->request_type); + return EINVAL; + } + if(setup_request->request == USB_DEVREQ_SET_FEATURE){ + if(setup_request->request_type == USB_HUB_REQ_TYPE_SET_HUB_FEATURE){ + usb_log_debug("USB_HUB_REQ_TYPE_SET_HUB_FEATURE\n"); + return process_hub_feature_set_request(instance, + setup_request->value); + } + if(setup_request->request_type == USB_HUB_REQ_TYPE_SET_PORT_FEATURE){ + usb_log_debug("USB_HUB_REQ_TYPE_SET_PORT_FEATURE\n"); + return process_port_feature_set_request(instance, + setup_request->value, + setup_request->index); } usb_log_debug("USB_HUB_REQ_TYPE_INVALID %d\n",setup_request->request_type); Index: uspace/drv/usbhub/port_status.h =================================================================== --- uspace/drv/usbhub/port_status.h (revision c6ba274aa68a445083bad01216d871fc194dcdd6) +++ uspace/drv/usbhub/port_status.h (revision 8123695a05edc85df5433b25264e0e8c0cbf18a2) @@ -95,4 +95,20 @@ } +/** + * set the device request to be a port feature clear request + * @param request + * @param port + * @param feature_selector + */ +static inline void usb_hub_set_disable_port_feature_request( +usb_device_request_setup_packet_t * request, uint16_t port, + uint16_t feature_selector +){ + request->index = port; + request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; + request->request = USB_HUB_REQUEST_CLEAR_FEATURE; + request->value = feature_selector; + request->length = 0; +} /** Index: uspace/drv/usbhub/usbhub.c =================================================================== --- uspace/drv/usbhub/usbhub.c (revision c6ba274aa68a445083bad01216d871fc194dcdd6) +++ uspace/drv/usbhub/usbhub.c (revision 8123695a05edc85df5433b25264e0e8c0cbf18a2) @@ -317,6 +317,6 @@ //set the status change bit, so it will be noticed in driver loop if(usb_port_dev_connected(&status)){ - usb_hub_set_enable_port_feature_request(&request, port, - USB_HUB_FEATURE_C_PORT_CONNECTION); + usb_hub_set_disable_port_feature_request(&request, port, + USB_HUB_FEATURE_PORT_CONNECTION); opResult = usb_pipe_control_read( hub->control_pipe, @@ -326,7 +326,21 @@ if (opResult != EOK) { usb_log_warning( - "could not set port change on port %d errno:%d\n", + "could not clear port connection on port %d errno:%d\n", port, opResult); } + usb_log_debug("cleared port connection\n"); + usb_hub_set_enable_port_feature_request(&request, port, + USB_HUB_FEATURE_PORT_ENABLE); + opResult = usb_pipe_control_read( + hub->control_pipe, + &request, sizeof(usb_device_request_setup_packet_t), + &status, 4, &rcvd_size + ); + if (opResult != EOK) { + usb_log_warning( + "could not set port enabled on port %d errno:%d\n", + port, opResult); + } + usb_log_debug("port set to enabled - should lead to connection change\n"); } } @@ -613,4 +627,5 @@ //something connected/disconnected if (usb_port_connect_change(&status)) { + usb_log_debug("connection change on port\n"); if (usb_port_dev_connected(&status)) { usb_log_debug("some connection changed\n"); @@ -623,4 +638,5 @@ if (usb_port_overcurrent_change(&status)) { //check if it was not auto-resolved + usb_log_debug("overcurrent change on port\n"); if(usb_port_over_current(&status)){ usb_hub_over_current(hub,port); @@ -639,4 +655,5 @@ } } + usb_log_debug("status %x\n ",status); usb_port_set_connect_change(&status, false);