Index: uspace/drv/bus/usb/ohci/ohci_regs.h =================================================================== --- uspace/drv/bus/usb/ohci/ohci_regs.h (revision 03e3029ccf557d94708f941be998c5d4fddc2a0f) +++ uspace/drv/bus/usb/ohci/ohci_regs.h (revision 40c6cdf17da2c1d4c4ffcec57fc111aeaab63d75) @@ -182,5 +182,5 @@ * specified in PPCM(RHDB), or all ports, * if power is set globally */ -#define RHS_CLEAR_PORT_POWER RHS_LPS_FLAG /* synonym for the above */ +#define RHS_CLEAR_GLOBAL_POWER RHS_LPS_FLAG /* synonym for the above */ #define RHS_OCI_FLAG (1 << 1)/* Over-current indicator, if per-port: 0 */ #define RHS_DRWE_FLAG (1 << 15)/* read: 0-connect status change does not wake HC Index: uspace/drv/bus/usb/ohci/root_hub.c =================================================================== --- uspace/drv/bus/usb/ohci/root_hub.c (revision 03e3029ccf557d94708f941be998c5d4fddc2a0f) +++ uspace/drv/bus/usb/ohci/root_hub.c (revision 40c6cdf17da2c1d4c4ffcec57fc111aeaab63d75) @@ -40,4 +40,5 @@ #include "root_hub.h" #include +#include #include #include "ohci_regs.h" @@ -106,17 +107,4 @@ /** - * bitmask of hub features that are valid to be cleared - */ -static const uint32_t hub_clear_feature_valid_mask = - RHS_OCIC_FLAG | - RHS_CLEAR_PORT_POWER; - -/** - * bitmask of hub features that are cleared by writing 1 (and not 0) - */ -static const uint32_t hub_clear_feature_by_writing_one_mask = - RHS_CLEAR_PORT_POWER; - -/** * bitmask of hub features that are valid to be set */ @@ -183,9 +171,4 @@ static int get_configuration_request( rh_t *instance, usb_transfer_batch_t *request); - -static int hub_feature_set_request(rh_t *instance, uint16_t feature); - -static int hub_feature_clear_request( - rh_t *instance, uint16_t feature); static int port_feature_set_request( @@ -609,53 +592,4 @@ * @param instance root hub instance * @param feature feature selector - * @return error code - */ -static int hub_feature_set_request(rh_t *instance, - uint16_t feature) { - if (!((1 << feature) & hub_set_feature_valid_mask)) - return EINVAL; - if (feature == USB_HUB_FEATURE_C_HUB_LOCAL_POWER) - feature = USB_HUB_FEATURE_C_HUB_LOCAL_POWER << 16; - instance->registers->rh_status = - (instance->registers->rh_status | (1 << feature)) - & (~hub_clear_feature_by_writing_one_mask); - - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** - * process feature-disabling request on hub - * - * @param instance root hub instance - * @param feature feature selector - * @return error code - */ -int hub_feature_clear_request(rh_t *instance, uint16_t feature) -{ - assert(instance); - - if (!((1 << feature) & hub_clear_feature_valid_mask)) - return EINVAL; - - //is the feature cleared directly? - if ((1 << feature) & hub_set_feature_direct_mask) { - instance->registers->rh_status = - (instance->registers->rh_status & (~(1 << feature))) - & (~hub_clear_feature_by_writing_one_mask); - } else {//the feature is cleared by writing '1' - - instance->registers->rh_status = - (instance->registers->rh_status - & (~hub_clear_feature_by_writing_one_mask)) - | (1 << feature); - } - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** - * process feature-enabling request on hub - * - * @param instance root hub instance - * @param feature feature selector * @param port port number, counted from 1 * @param enable enable or disable the specified feature @@ -789,37 +723,49 @@ { case USB_DEVREQ_CLEAR_FEATURE: - if (request_type == USB_HUB_REQ_TYPE_SET_HUB_FEATURE) { - usb_log_debug("USB_HUB_REQ_TYPE_SET_HUB_FEATURE\n"); - return hub_feature_clear_request(instance, - setup_request->value); - } - if (request_type == USB_HUB_REQ_TYPE_SET_PORT_FEATURE) { - usb_log_debug("USB_HUB_REQ_TYPE_SET_PORT_FEATURE\n"); + if (request_type == USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE) { + usb_log_debug("USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE\n"); return port_feature_clear_request(instance, setup_request->value, setup_request->index); } - usb_log_error("Invalid HUB clear feature request type: %d\n", - request_type); - return EINVAL; + if (request_type == USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE) { + usb_log_debug("USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE\n"); +/* + * Chapter 11.16.2 specifies that only C_HUB_LOCAL_POWER and + * C_HUB_OVER_CURRENT are supported. C_HUB_OVER_CURRENT is represented + * by OHCI RHS_OCIC_FLAG. C_HUB_LOCAL_POWER is not supported + * as root hubs do not support local power status feature. (OHCI pg. 127) + */ + if (setup_request->value == USB_HUB_FEATURE_C_HUB_OVER_CURRENT) { + instance->registers->rh_status = RHS_OCIC_FLAG; + return EOK; + } + } + usb_log_error("Invalid clear feature request type: %d\n", + request_type); + return EINVAL; case USB_DEVREQ_SET_FEATURE: - if (request_type == USB_HUB_REQ_TYPE_SET_HUB_FEATURE) { - usb_log_debug("USB_HUB_REQ_TYPE_SET_HUB_FEATURE\n"); - return hub_feature_set_request(instance, - setup_request->value); - } - if (request_type == USB_HUB_REQ_TYPE_SET_PORT_FEATURE) { + switch (request_type) + { + case USB_HUB_REQ_TYPE_SET_PORT_FEATURE: usb_log_debug("USB_HUB_REQ_TYPE_SET_PORT_FEATURE\n"); return port_feature_set_request(instance, setup_request->value, setup_request->index); + + case USB_HUB_REQ_TYPE_SET_HUB_FEATURE: + /* Chapter 11.16.2 specifies that hub can be recipient + * only for C_HUB_LOCAL_POWER and C_HUB_OVER_CURRENT + * features. It makes no sense to SET either. */ + usb_log_error("Invalid HUB set feature request.\n"); + return ENOTSUP; + default: + usb_log_error("Invalid set feature request type: %d\n", + request_type); + return EINVAL; } - usb_log_error("Invalid HUB set feature request type: %d\n", - request_type); - return EINVAL; case USB_DEVREQ_SET_ADDRESS: usb_log_debug("USB_DEVREQ_SET_ADDRESS\n"); - return address_set_request(instance, - setup_request->value); + return address_set_request(instance, setup_request->value); default: