Index: uspace/drv/ohci/root_hub.c =================================================================== --- uspace/drv/ohci/root_hub.c (revision 6c399765066bb4c35f189205cab7bbd61db00d88) +++ uspace/drv/ohci/root_hub.c (revision 195890bda66ae3a7eba6423621ee7ce2d6cd1ebf) @@ -47,20 +47,19 @@ * standart device descriptor for ohci root hub */ -static const usb_standard_device_descriptor_t ohci_rh_device_descriptor = -{ - .configuration_count = 1, - .descriptor_type = USB_DESCTYPE_DEVICE, - .device_class = USB_CLASS_HUB, - .device_protocol = 0, - .device_subclass = 0, - .device_version = 0, - .length = sizeof(usb_standard_device_descriptor_t), - /// \TODO this value is guessed - .max_packet_size = 8, - .vendor_id = 0x16db, - .product_id = 0x0001, - /// \TODO these values migt be different - .str_serial_number = 0, - .usb_spec_version = 0x110, +static const usb_standard_device_descriptor_t ohci_rh_device_descriptor = { + .configuration_count = 1, + .descriptor_type = USB_DESCTYPE_DEVICE, + .device_class = USB_CLASS_HUB, + .device_protocol = 0, + .device_subclass = 0, + .device_version = 0, + .length = sizeof (usb_standard_device_descriptor_t), + /// \TODO this value is guessed + .max_packet_size = 8, + .vendor_id = 0x16db, + .product_id = 0x0001, + /// \TODO these values migt be different + .str_serial_number = 0, + .usb_spec_version = 0x110, }; @@ -69,12 +68,11 @@ * for ohci root hubs */ -static const usb_standard_configuration_descriptor_t ohci_rh_conf_descriptor = -{ +static const usb_standard_configuration_descriptor_t ohci_rh_conf_descriptor = { /// \TODO some values are default or guessed - .attributes = 1<<7, + .attributes = 1 << 7, .configuration_number = 1, .descriptor_type = USB_DESCTYPE_CONFIGURATION, .interface_count = 1, - .length = sizeof(usb_standard_configuration_descriptor_t), + .length = sizeof (usb_standard_configuration_descriptor_t), .max_power = 100, .str_configuration = 0, @@ -84,6 +82,5 @@ * standart ohci root hub interface descriptor */ -static const usb_standard_interface_descriptor_t ohci_rh_iface_descriptor = -{ +static const usb_standard_interface_descriptor_t ohci_rh_iface_descriptor = { .alternate_setting = 0, .descriptor_type = USB_DESCTYPE_INTERFACE, @@ -94,5 +91,5 @@ .interface_protocol = 0, .interface_subclass = 0, - .length = sizeof(usb_standard_interface_descriptor_t), + .length = sizeof (usb_standard_interface_descriptor_t), .str_interface = 0, }; @@ -101,10 +98,9 @@ * standart ohci root hub endpoint descriptor */ -static const usb_standard_endpoint_descriptor_t ohci_rh_ep_descriptor = -{ +static const usb_standard_endpoint_descriptor_t ohci_rh_ep_descriptor = { .attributes = USB_TRANSFER_INTERRUPT, .descriptor_type = USB_DESCTYPE_ENDPOINT, - .endpoint_address = 1 + (1<<7), - .length = sizeof(usb_standard_endpoint_descriptor_t), + .endpoint_address = 1 + (1 << 7), + .length = sizeof (usb_standard_endpoint_descriptor_t), .max_packet_size = 8, .poll_interval = 255, @@ -113,5 +109,5 @@ 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); +(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT); static const uint32_t hub_clear_feature_by_writing_one_mask = @@ -121,5 +117,5 @@ (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); @@ -127,22 +123,135 @@ 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); +(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 - - - +(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 + +static void usb_create_serialized_hub_descriptor(rh_t *instance, + uint8_t ** out_result, + size_t * out_size); + +static void rh_init_descriptors(rh_t *instance); + +static int process_get_port_status_request(rh_t *instance, uint16_t port, + usb_transfer_batch_t * request); + +static int process_get_hub_status_request(rh_t *instance, + usb_transfer_batch_t * request); + +static int process_get_status_request(rh_t *instance, + usb_transfer_batch_t * request); + +static void create_interrupt_mask(rh_t *instance, void ** buffer, + size_t * buffer_size); + +static int process_get_descriptor_request(rh_t *instance, + usb_transfer_batch_t *request); + +static int process_get_configuration_request(rh_t *instance, + usb_transfer_batch_t *request); + +static int process_hub_feature_set_request(rh_t *instance, uint16_t feature); + + +static int process_hub_feature_clear_request(rh_t *instance, + uint16_t feature); + +static int process_port_feature_set_request(rh_t *instance, + uint16_t feature, uint16_t port); + +static int process_port_feature_clear_request(rh_t *instance, + uint16_t feature, uint16_t port); + +static int process_address_set_request(rh_t *instance, + uint16_t address); + +static int process_request_with_output(rh_t *instance, + usb_transfer_batch_t *request); + +static int process_request_with_input(rh_t *instance, + usb_transfer_batch_t *request); + +static int process_request_without_data(rh_t *instance, + usb_transfer_batch_t *request); + +static int process_ctrl_request(rh_t *instance, usb_transfer_batch_t *request); + + + + + +/** Root hub initialization + * @return Error code. + */ +int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs) { + assert(instance); + //instance->address = -1; + instance->registers = regs; + instance->device = dev; + instance->port_count = instance->registers->rh_desc_a & 0xff; + rh_init_descriptors(instance); + /// \TODO set port power mode + + + usb_log_info("OHCI root hub with %d ports.\n", instance->port_count); + + //start generic usb hub driver + + /* TODO: implement */ + return EOK; +} +/*----------------------------------------------------------------------------*/ + +/** + * process root hub request + * + * @param instance root hub instance + * @param request structure containing both request and response information + * @return error code + */ +int rh_request(rh_t *instance, usb_transfer_batch_t *request) { + assert(instance); + assert(request); + int opResult; + if (request->transfer_type == USB_TRANSFER_CONTROL) { + usb_log_info("Root hub got CONTROL packet\n"); + opResult = process_ctrl_request(instance, request); + } else if (request->transfer_type == USB_TRANSFER_INTERRUPT) { + usb_log_info("Root hub got INTERRUPT packet\n"); + void * buffer; + create_interrupt_mask(instance, &buffer, + &(request->transfered_size)); + memcpy(request->transport_buffer, buffer, + request->transfered_size); + opResult = EOK; + } else { + opResult = EINVAL; + } + usb_transfer_batch_finish(request, opResult); + return EOK; +} + +/*----------------------------------------------------------------------------*/ + + +void rh_interrupt(rh_t *instance) { + usb_log_info("Whoa whoa wait, I`m not supposed to receive any " + "interrupts, am I?\n"); + /* TODO: implement? */ +} +/*----------------------------------------------------------------------------*/ /** @@ -157,14 +266,14 @@ */ static void usb_create_serialized_hub_descriptor(rh_t *instance, - uint8_t ** out_result, - size_t * out_size) { + uint8_t ** out_result, + size_t * out_size) { //base size size_t size = 7; //variable size according to port count size_t var_size = instance->port_count / 8 + - ((instance->port_count % 8 > 0) ? 1 : 0); + ((instance->port_count % 8 > 0) ? 1 : 0); size += 2 * var_size; uint8_t * result = (uint8_t*) malloc(size); - bzero(result,size); + bzero(result, size); //size result[0] = size; @@ -174,9 +283,9 @@ uint32_t hub_desc_reg = instance->registers->rh_desc_a; result[3] = - ((hub_desc_reg >> 8) %2) + - (((hub_desc_reg >> 9) %2) << 1) + - (((hub_desc_reg >> 10) %2) << 2) + - (((hub_desc_reg >> 11) %2) << 3) + - (((hub_desc_reg >> 12) %2) << 4); + ((hub_desc_reg >> 8) % 2) + + (((hub_desc_reg >> 9) % 2) << 1) + + (((hub_desc_reg >> 10) % 2) << 2) + + (((hub_desc_reg >> 11) % 2) << 3) + + (((hub_desc_reg >> 12) % 2) << 4); result[4] = 0; result[5] = /*descriptor->pwr_on_2_good_time*/ 50; @@ -185,6 +294,8 @@ int port; for (port = 1; port <= instance->port_count; ++port) { - result[7 + port/8] += - ((instance->registers->rh_desc_b >> port)%2) << (port%8); + uint8_t is_non_removable = + instance->registers->rh_desc_b >> port % 2; + result[7 + port / 8] += + is_non_removable << (port % 8); } size_t i; @@ -195,5 +306,5 @@ (*out_size) = size; } - +/*----------------------------------------------------------------------------*/ /** initialize hub descriptors @@ -203,60 +314,38 @@ * @instance root hub instance */ -static void rh_init_descriptors(rh_t *instance){ +static void rh_init_descriptors(rh_t *instance) { memcpy(&instance->descriptors.device, &ohci_rh_device_descriptor, - sizeof(ohci_rh_device_descriptor) - ); + sizeof (ohci_rh_device_descriptor) + ); usb_standard_configuration_descriptor_t descriptor; - memcpy(&descriptor,&ohci_rh_conf_descriptor, - sizeof(ohci_rh_conf_descriptor)); + memcpy(&descriptor, &ohci_rh_conf_descriptor, + sizeof (ohci_rh_conf_descriptor)); uint8_t * hub_descriptor; size_t hub_desc_size; usb_create_serialized_hub_descriptor(instance, &hub_descriptor, - &hub_desc_size); + &hub_desc_size); descriptor.total_length = - sizeof(usb_standard_configuration_descriptor_t)+ - sizeof(usb_standard_endpoint_descriptor_t)+ - sizeof(usb_standard_interface_descriptor_t)+ - hub_desc_size; - + sizeof (usb_standard_configuration_descriptor_t) + + sizeof (usb_standard_endpoint_descriptor_t) + + sizeof (usb_standard_interface_descriptor_t) + + hub_desc_size; + uint8_t * full_config_descriptor = - (uint8_t*) malloc(descriptor.total_length); - memcpy(full_config_descriptor, &descriptor, sizeof(descriptor)); - memcpy(full_config_descriptor + sizeof(descriptor), - &ohci_rh_iface_descriptor, sizeof(ohci_rh_iface_descriptor)); - memcpy(full_config_descriptor + sizeof(descriptor) + - sizeof(ohci_rh_iface_descriptor), - &ohci_rh_ep_descriptor, sizeof(ohci_rh_ep_descriptor)); - memcpy(full_config_descriptor + sizeof(descriptor) + - sizeof(ohci_rh_iface_descriptor) + - sizeof(ohci_rh_ep_descriptor), - hub_descriptor, hub_desc_size); - + (uint8_t*) malloc(descriptor.total_length); + memcpy(full_config_descriptor, &descriptor, sizeof (descriptor)); + memcpy(full_config_descriptor + sizeof (descriptor), + &ohci_rh_iface_descriptor, sizeof (ohci_rh_iface_descriptor)); + memcpy(full_config_descriptor + sizeof (descriptor) + + sizeof (ohci_rh_iface_descriptor), + &ohci_rh_ep_descriptor, sizeof (ohci_rh_ep_descriptor)); + memcpy(full_config_descriptor + sizeof (descriptor) + + sizeof (ohci_rh_iface_descriptor) + + sizeof (ohci_rh_ep_descriptor), + hub_descriptor, hub_desc_size); + instance->descriptors.configuration = full_config_descriptor; instance->descriptors.configuration_size = descriptor.total_length; } - -/** Root hub initialization - * @return Error code. - */ -int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs) -{ - assert(instance); - //instance->address = -1; - instance->registers = regs; - instance->device = dev; - instance->port_count = instance->registers->rh_desc_a & 0xff; - rh_init_descriptors(instance); - /// \TODO set port power mode - - - usb_log_info("OHCI root hub with %d ports.\n", instance->port_count); - - //start generic usb hub driver - - /* TODO: implement */ - return EOK; -} /*----------------------------------------------------------------------------*/ @@ -272,20 +361,21 @@ */ static int process_get_port_status_request(rh_t *instance, uint16_t port, - usb_transfer_batch_t * request){ - if(port<1 || port>instance->port_count) - return EINVAL; - uint32_t * uint32_buffer = (uint32_t*)request->transport_buffer; + usb_transfer_batch_t * request) { + if (port < 1 || port > instance->port_count) + return EINVAL; + uint32_t * uint32_buffer = (uint32_t*) request->transport_buffer; request->transfered_size = 4; - uint32_buffer[0] = instance->registers->rh_port_status[port -1]; + uint32_buffer[0] = instance->registers->rh_port_status[port - 1]; #if 0 int i; - for(i=0;iport_count;++i){ + for (i = 0; i < instance->port_count; ++i) { usb_log_debug("port status %d,x%x\n", - instance->registers->rh_port_status[i], - instance->registers->rh_port_status[i]); + instance->registers->rh_port_status[i], + instance->registers->rh_port_status[i]); } #endif return EOK; } +/*----------------------------------------------------------------------------*/ /** @@ -299,14 +389,13 @@ */ static int process_get_hub_status_request(rh_t *instance, - usb_transfer_batch_t * request){ - uint32_t * uint32_buffer = (uint32_t*)request->transport_buffer; + usb_transfer_batch_t * request) { + uint32_t * uint32_buffer = (uint32_t*) request->transport_buffer; //bits, 0,1,16,17 request->transfered_size = 4; - uint32_t mask = 1 & (1<<1) & (1<<16) & (1<<17); + uint32_t mask = 1 & (1 << 1) & (1 << 16) & (1 << 17); uint32_buffer[0] = mask & instance->registers->rh_status; return EOK; } - - +/*----------------------------------------------------------------------------*/ /** @@ -320,24 +409,25 @@ */ static int process_get_status_request(rh_t *instance, - usb_transfer_batch_t * request) -{ + usb_transfer_batch_t * request) { size_t buffer_size = request->buffer_size; usb_device_request_setup_packet_t * request_packet = - (usb_device_request_setup_packet_t*) - request->setup_buffer; + (usb_device_request_setup_packet_t*) + request->setup_buffer; usb_hub_bm_request_type_t request_type = request_packet->request_type; - if(buffer_size<4/*request_packet->length*/){///\TODO + if (buffer_size < 4/*request_packet->length*/) {///\TODO usb_log_warning("requested more data than buffer size\n"); return EINVAL; } - if(request_type == USB_HUB_REQ_TYPE_GET_HUB_STATUS) + if (request_type == USB_HUB_REQ_TYPE_GET_HUB_STATUS) return process_get_hub_status_request(instance, request); - if(request_type == USB_HUB_REQ_TYPE_GET_PORT_STATUS) - return process_get_port_status_request(instance, request_packet->index, - request); + if (request_type == USB_HUB_REQ_TYPE_GET_PORT_STATUS) + return process_get_port_status_request(instance, + request_packet->index, + request); return ENOTSUP; } +/*----------------------------------------------------------------------------*/ /** @@ -353,14 +443,14 @@ */ static void create_interrupt_mask(rh_t *instance, void ** buffer, - size_t * buffer_size){ + size_t * buffer_size) { int bit_count = instance->port_count + 1; - (*buffer_size) = (bit_count / 8) + ((bit_count%8==0)?0:1); - + (*buffer_size) = (bit_count / 8) + ((bit_count % 8 == 0) ? 0 : 1); + (*buffer) = malloc(*buffer_size); - uint8_t * bitmap = (uint8_t*)(*buffer); - uint32_t mask = (1<<(USB_HUB_FEATURE_C_HUB_LOCAL_POWER+16)) - | (1<<(USB_HUB_FEATURE_C_HUB_OVER_CURRENT+16)); - bzero(bitmap,(*buffer_size)); - if(instance->registers->rh_status & mask){ + uint8_t * bitmap = (uint8_t*) (*buffer); + uint32_t mask = (1 << (USB_HUB_FEATURE_C_HUB_LOCAL_POWER + 16)) + | (1 << (USB_HUB_FEATURE_C_HUB_OVER_CURRENT + 16)); + bzero(bitmap, (*buffer_size)); + if (instance->registers->rh_status & mask) { bitmap[0] = 1; } @@ -368,14 +458,15 @@ mask = 0; int i; - for(i=16;i<=20;++i){ - mask += 1<port_count;++port){ - if(mask & instance->registers->rh_port_status[port-1]){ - bitmap[(port)/8] += 1<<(port%8); - } - } -} - + for (i = 16; i <= 20; ++i) { + mask += 1 << i; + } + for (port = 1; port <= instance->port_count; ++port) { + if (mask & instance->registers->rh_port_status[port - 1]) { + bitmap[(port) / 8] += 1 << (port % 8); + } + } +} +/*----------------------------------------------------------------------------*/ + /** * create answer to a descriptor request @@ -388,29 +479,31 @@ */ static int process_get_descriptor_request(rh_t *instance, - usb_transfer_batch_t *request){ + usb_transfer_batch_t *request) { usb_device_request_setup_packet_t * setup_request = - (usb_device_request_setup_packet_t*)request->setup_buffer; + (usb_device_request_setup_packet_t*) request->setup_buffer; size_t size; const void * result_descriptor = NULL; const uint16_t setup_request_value = setup_request->value_high; - //(setup_request->value_low << 8); + //(setup_request->value_low << 8); bool del = false; - switch (setup_request_value) - { - case USB_DESCTYPE_HUB: { + switch (setup_request_value) { + case USB_DESCTYPE_HUB: + { uint8_t * descriptor; usb_create_serialized_hub_descriptor( instance, &descriptor, &size); result_descriptor = descriptor; - if(result_descriptor) del = true; + if (result_descriptor) del = true; break; } - case USB_DESCTYPE_DEVICE: { + case USB_DESCTYPE_DEVICE: + { usb_log_debug("USB_DESCTYPE_DEVICE\n"); result_descriptor = &ohci_rh_device_descriptor; - size = sizeof(ohci_rh_device_descriptor); + size = sizeof (ohci_rh_device_descriptor); break; } - case USB_DESCTYPE_CONFIGURATION: { + case USB_DESCTYPE_CONFIGURATION: + { usb_log_debug("USB_DESCTYPE_CONFIGURATION\n"); result_descriptor = instance->descriptors.configuration; @@ -418,37 +511,43 @@ break; } - case USB_DESCTYPE_INTERFACE: { + case USB_DESCTYPE_INTERFACE: + { usb_log_debug("USB_DESCTYPE_INTERFACE\n"); result_descriptor = &ohci_rh_iface_descriptor; - size = sizeof(ohci_rh_iface_descriptor); + size = sizeof (ohci_rh_iface_descriptor); break; } - case USB_DESCTYPE_ENDPOINT: { + case USB_DESCTYPE_ENDPOINT: + { usb_log_debug("USB_DESCTYPE_ENDPOINT\n"); result_descriptor = &ohci_rh_ep_descriptor; - size = sizeof(ohci_rh_ep_descriptor); + size = sizeof (ohci_rh_ep_descriptor); break; } - default: { - usb_log_debug("USB_DESCTYPE_EINVAL %d \n",setup_request->value); - usb_log_debug("\ttype %d\n\trequest %d\n\tvalue %d\n\tindex %d\n\tlen %d\n ", - setup_request->request_type, - setup_request->request, - setup_request_value, - setup_request->index, - setup_request->length - ); + default: + { + usb_log_debug("USB_DESCTYPE_EINVAL %d \n", + setup_request->value); + usb_log_debug("\ttype %d\n\trequest %d\n\tvalue " + "%d\n\tindex %d\n\tlen %d\n ", + setup_request->request_type, + setup_request->request, + setup_request_value, + setup_request->index, + setup_request->length + ); return EINVAL; } } - if(request->buffer_size < size){ + if (request->buffer_size < size) { size = request->buffer_size; } request->transfered_size = size; - memcpy(request->transport_buffer,result_descriptor,size); + memcpy(request->transport_buffer, result_descriptor, size); if (del) free(result_descriptor); return EOK; } +/*----------------------------------------------------------------------------*/ /** @@ -460,9 +559,9 @@ * @return error code */ -static int process_get_configuration_request(rh_t *instance, - usb_transfer_batch_t *request){ +static int process_get_configuration_request(rh_t *instance, + usb_transfer_batch_t *request) { //set and get configuration requests do not have any meaning, only dummy //values are returned - if(request->buffer_size != 1) + if (request->buffer_size != 1) return EINVAL; request->transport_buffer[0] = 1; @@ -470,8 +569,9 @@ return EOK; } +/*----------------------------------------------------------------------------*/ /** * process feature-enabling request on hub - * + * * @param instance root hub instance * @param feature feature selector @@ -479,12 +579,13 @@ */ static int process_hub_feature_set_request(rh_t *instance, - uint16_t feature){ - if(! ((1<registers->rh_status = - (instance->registers->rh_status | (1<registers->rh_status | (1 << feature)) + & (~hub_clear_feature_by_writing_one_mask); + return EOK; +} +/*----------------------------------------------------------------------------*/ /** @@ -496,26 +597,25 @@ */ static int process_hub_feature_clear_request(rh_t *instance, - uint16_t feature){ - if(! ((1<registers->rh_status = - (instance->registers->rh_status & (~(1<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<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 @@ -525,15 +625,16 @@ */ static int process_port_feature_set_request(rh_t *instance, - uint16_t feature, uint16_t port){ - if(!((1<instance->port_count) + uint16_t feature, uint16_t port) { + if (!((1 << feature) & port_set_feature_valid_mask)) + return EINVAL; + if (port < 1 || port > instance->port_count) return EINVAL; instance->registers->rh_port_status[port - 1] = - (instance->registers->rh_port_status[port - 1] | (1<registers->rh_port_status[port - 1] | (1 << feature)) + & (~port_clear_feature_valid_mask); /// \TODO any error? return EOK; } +/*----------------------------------------------------------------------------*/ /** @@ -547,25 +648,25 @@ */ static int process_port_feature_clear_request(rh_t *instance, - uint16_t feature, uint16_t port){ - if(!((1<instance->port_count) - return EINVAL; - if(feature == USB_HUB_FEATURE_PORT_POWER) + uint16_t feature, uint16_t port) { + if (!((1 << feature) & port_clear_feature_valid_mask)) + return EINVAL; + if (port < 1 || port > 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) + 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<registers->rh_port_status[port - 1] + & (~port_clear_feature_valid_mask)) + | (1 << feature); /// \TODO any error? return EOK; } - +/*----------------------------------------------------------------------------*/ /** * register address to this device - * + * * @param instance root hub instance * @param address new address @@ -573,8 +674,9 @@ */ static int process_address_set_request(rh_t *instance, - uint16_t address){ + uint16_t address) { instance->address = address; return EOK; } +/*----------------------------------------------------------------------------*/ /** @@ -588,16 +690,16 @@ */ static int process_request_with_output(rh_t *instance, - usb_transfer_batch_t *request){ + usb_transfer_batch_t *request) { usb_device_request_setup_packet_t * setup_request = - (usb_device_request_setup_packet_t*)request->setup_buffer; - if(setup_request->request == USB_DEVREQ_GET_STATUS){ + (usb_device_request_setup_packet_t*) request->setup_buffer; + if (setup_request->request == USB_DEVREQ_GET_STATUS) { usb_log_debug("USB_DEVREQ_GET_STATUS\n"); return process_get_status_request(instance, request); } - if(setup_request->request == USB_DEVREQ_GET_DESCRIPTOR){ + if (setup_request->request == USB_DEVREQ_GET_DESCRIPTOR) { usb_log_debug("USB_DEVREQ_GET_DESCRIPTOR\n"); return process_get_descriptor_request(instance, request); } - if(setup_request->request == USB_DEVREQ_GET_CONFIGURATION){ + if (setup_request->request == USB_DEVREQ_GET_CONFIGURATION) { usb_log_debug("USB_DEVREQ_GET_CONFIGURATION\n"); return process_get_configuration_request(instance, request); @@ -605,4 +707,5 @@ return ENOTSUP; } +/*----------------------------------------------------------------------------*/ /** @@ -616,12 +719,12 @@ */ static int process_request_with_input(rh_t *instance, - usb_transfer_batch_t *request){ + usb_transfer_batch_t *request) { usb_device_request_setup_packet_t * setup_request = - (usb_device_request_setup_packet_t*)request->setup_buffer; + (usb_device_request_setup_packet_t*) request->setup_buffer; request->transfered_size = 0; - if(setup_request->request == USB_DEVREQ_SET_DESCRIPTOR){ + if (setup_request->request == USB_DEVREQ_SET_DESCRIPTOR) { return ENOTSUP; } - if(setup_request->request == USB_DEVREQ_SET_CONFIGURATION){ + if (setup_request->request == USB_DEVREQ_SET_CONFIGURATION) { //set and get configuration requests do not have any meaning, //only dummy values are returned @@ -630,4 +733,5 @@ return ENOTSUP; } +/*----------------------------------------------------------------------------*/ /** @@ -641,46 +745,50 @@ */ static int process_request_without_data(rh_t *instance, - usb_transfer_batch_t *request){ + usb_transfer_batch_t *request) { usb_device_request_setup_packet_t * setup_request = - (usb_device_request_setup_packet_t*)request->setup_buffer; + (usb_device_request_setup_packet_t*) request->setup_buffer; request->transfered_size = 0; - if(setup_request->request == USB_DEVREQ_CLEAR_FEATURE){ - if(setup_request->request_type == USB_HUB_REQ_TYPE_SET_HUB_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_clear_request(instance, - setup_request->value); - } - if(setup_request->request_type == USB_HUB_REQ_TYPE_SET_PORT_FEATURE){ + 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_clear_request(instance, - setup_request->value, - setup_request->index); + 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){ + 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){ + 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); - return EINVAL; - } - if(setup_request->request == USB_DEVREQ_SET_ADDRESS){ + 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_ADDRESS) { usb_log_debug("USB_DEVREQ_SET_ADDRESS\n"); - return process_address_set_request(instance, setup_request->value); - } - usb_log_debug("USB_DEVREQ_SET_ENOTSUP %d\n",setup_request->request_type); + return process_address_set_request(instance, + setup_request->value); + } + usb_log_debug("USB_DEVREQ_SET_ENOTSUP %d\n", + setup_request->request_type); return ENOTSUP; } +/*----------------------------------------------------------------------------*/ /** @@ -702,83 +810,56 @@ * @return error code */ -static int process_ctrl_request(rh_t *instance, usb_transfer_batch_t *request){ +static int process_ctrl_request(rh_t *instance, usb_transfer_batch_t *request) { + if (!request->setup_buffer) { + usb_log_error("root hub received empty transaction?"); + return EINVAL; + } int opResult; - if (request->setup_buffer) { - if(sizeof(usb_device_request_setup_packet_t)>request->setup_size){ - usb_log_error("setup packet too small\n"); - return EINVAL; - } - usb_log_info("CTRL packet: %s.\n", - usb_debug_str_buffer((const uint8_t *)request->setup_buffer, 8, 8)); - usb_device_request_setup_packet_t * setup_request = - (usb_device_request_setup_packet_t*)request->setup_buffer; - if( - setup_request->request == USB_DEVREQ_GET_STATUS - || setup_request->request == USB_DEVREQ_GET_DESCRIPTOR - || setup_request->request == USB_DEVREQ_GET_CONFIGURATION - ){ + if (sizeof (usb_device_request_setup_packet_t) > request->setup_size) { + usb_log_error("setup packet too small\n"); + return EINVAL; + } + usb_log_info("CTRL packet: %s.\n", + usb_debug_str_buffer( + (const uint8_t *) request->setup_buffer, 8, 8)); + usb_device_request_setup_packet_t * setup_request = + (usb_device_request_setup_packet_t*) + request->setup_buffer; + switch (setup_request->request) { + case USB_DEVREQ_GET_STATUS: + case USB_DEVREQ_GET_DESCRIPTOR: + case USB_DEVREQ_GET_CONFIGURATION: usb_log_debug("processing request with output\n"); - opResult = process_request_with_output(instance,request); - }else if( - setup_request->request == USB_DEVREQ_CLEAR_FEATURE - || setup_request->request == USB_DEVREQ_SET_FEATURE - || setup_request->request == USB_DEVREQ_SET_ADDRESS - ){ - usb_log_debug("processing request without additional data\n"); - opResult = process_request_without_data(instance,request); - }else if(setup_request->request == USB_DEVREQ_SET_DESCRIPTOR - || setup_request->request == USB_DEVREQ_SET_CONFIGURATION - ){ - usb_log_debug("processing request with input\n"); - opResult = process_request_with_input(instance,request); - }else{ - usb_log_warning("received unsuported request: %d\n", - setup_request->request - ); + opResult = process_request_with_output( + instance, request); + break; + case USB_DEVREQ_CLEAR_FEATURE: + case USB_DEVREQ_SET_FEATURE: + case USB_DEVREQ_SET_ADDRESS: + usb_log_debug("processing request without " + "additional data\n"); + opResult = process_request_without_data( + instance, request); + break; + case USB_DEVREQ_SET_DESCRIPTOR: + case USB_DEVREQ_SET_CONFIGURATION: + usb_log_debug("processing request with " + "input\n"); + opResult = process_request_with_input( + instance, request); + break; + default: + usb_log_warning("received unsuported request: " + "%d\n", + setup_request->request + ); opResult = ENOTSUP; - } - }else{ - usb_log_error("root hub received empty transaction?"); - opResult = EINVAL; } return opResult; } -/** - * process root hub request - * - * @param instance root hub instance - * @param request structure containing both request and response information - * @return error code - */ -int rh_request(rh_t *instance, usb_transfer_batch_t *request) -{ - assert(instance); - assert(request); - int opResult; - if(request->transfer_type == USB_TRANSFER_CONTROL){ - usb_log_info("Root hub got CONTROL packet\n"); - opResult = process_ctrl_request(instance,request); - }else if(request->transfer_type == USB_TRANSFER_INTERRUPT){ - usb_log_info("Root hub got INTERRUPT packet\n"); - void * buffer; - create_interrupt_mask(instance, &buffer, - &(request->transfered_size)); - memcpy(request->transport_buffer,buffer, request->transfered_size); - opResult = EOK; - }else{ - opResult = EINVAL; - } - usb_transfer_batch_finish(request, opResult); - return EOK; -} -/*----------------------------------------------------------------------------*/ - - -void rh_interrupt(rh_t *instance) -{ - usb_log_info("Whoa whoa wait, I`m not supposed to receive any interrupts, am I?\n"); - /* TODO: implement? */ -} + + + /** * @} Index: uspace/drv/usbhub/usbhub.c =================================================================== --- uspace/drv/usbhub/usbhub.c (revision 6c399765066bb4c35f189205cab7bbd61db00d88) +++ uspace/drv/usbhub/usbhub.c (revision 195890bda66ae3a7eba6423621ee7ce2d6cd1ebf) @@ -55,8 +55,8 @@ static int usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port, - usb_speed_t speed); + usb_speed_t speed); static int usb_hub_trigger_connecting_non_removable_devices( - usb_hub_info_t * hub, usb_hub_descriptor_t * descriptor); + usb_hub_info_t * hub, usb_hub_descriptor_t * descriptor); /** @@ -69,14 +69,15 @@ * @return zero */ -int usb_hub_control_loop(void * hub_info_param){ - usb_hub_info_t * hub_info = (usb_hub_info_t*)hub_info_param; +int usb_hub_control_loop(void * hub_info_param) { + usb_hub_info_t * hub_info = (usb_hub_info_t*) hub_info_param; int errorCode = EOK; - while(errorCode == EOK){ - async_usleep(1000 * 1000 * 10 );/// \TODO proper number once + while (errorCode == EOK) { + async_usleep(1000 * 1000 * 10); /// \TODO proper number once errorCode = usb_hub_check_hub_changes(hub_info); - - } - usb_log_error("something in ctrl loop went wrong, errno %d\n",errorCode); + + } + usb_log_error("something in ctrl loop went wrong, errno %d\n", + errorCode); return 0; @@ -99,5 +100,5 @@ static usb_hub_info_t * usb_hub_info_create(usb_device_t * usb_dev) { usb_hub_info_t * result = usb_new(usb_hub_info_t); - if(!result) return NULL; + if (!result) return NULL; result->usb_device = usb_dev; result->status_change_pipe = usb_dev->pipes[0].pipe; @@ -117,5 +118,5 @@ * @return error code */ -static int usb_hub_process_hub_specific_info(usb_hub_info_t * hub_info){ +static int usb_hub_process_hub_specific_info(usb_hub_info_t * hub_info) { // get hub descriptor usb_log_debug("creating serialized descriptor\n"); @@ -128,21 +129,23 @@ */ int opResult = usb_request_set_configuration(hub_info->control_pipe, - 1); - if(opResult!=EOK){ - usb_log_error("could not set default configuration, errno %d",opResult); - return opResult; - } - - + 1); + if (opResult != EOK) { + usb_log_error("could not set default configuration, errno %d", + opResult); + return opResult; + } + + size_t received_size; opResult = usb_request_get_descriptor(&hub_info->usb_device->ctrl_pipe, - USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE, - USB_DESCTYPE_HUB, - 0, 0, serialized_descriptor, - USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size); - - if (opResult != EOK) { - usb_log_error("failed when receiving hub descriptor, badcode = %d\n", - opResult); + USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE, + USB_DESCTYPE_HUB, + 0, 0, serialized_descriptor, + USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size); + + if (opResult != EOK) { + usb_log_error("failed when receiving hub descriptor, " + "badcode = %d\n", + opResult); free(serialized_descriptor); return opResult; @@ -150,16 +153,18 @@ usb_log_debug2("deserializing descriptor\n"); descriptor = usb_deserialize_hub_desriptor(serialized_descriptor); - if(descriptor==NULL){ + if (descriptor == NULL) { usb_log_warning("could not deserialize descriptor \n"); return opResult; } - usb_log_debug("setting port count to %d\n",descriptor->ports_count); + usb_log_debug("setting port count to %d\n", descriptor->ports_count); hub_info->port_count = descriptor->ports_count; hub_info->attached_devs = (usb_hc_attached_device_t*) - malloc((hub_info->port_count+1) * sizeof(usb_hc_attached_device_t)); + malloc((hub_info->port_count + 1) * + sizeof (usb_hc_attached_device_t) + ); int i; - for(i=0;iport_count+1;++i){ - hub_info->attached_devs[i].handle=0; - hub_info->attached_devs[i].address=0; + for (i = 0; i < hub_info->port_count + 1; ++i) { + hub_info->attached_devs[i].handle = 0; + hub_info->attached_devs[i].address = 0; } //handle non-removable devices @@ -169,8 +174,8 @@ hub_info->descriptor = descriptor; hub_info->not_initialized_non_removables = - (uint8_t*)malloc((hub_info->port_count+8)/8); + (uint8_t*) malloc((hub_info->port_count + 8) / 8); memcpy(hub_info->not_initialized_non_removables, descriptor->devices_removable, - (hub_info->port_count+8)/8 + (hub_info->port_count + 8) / 8 ); @@ -179,4 +184,5 @@ return EOK; } + /** * Set configuration of hub @@ -187,11 +193,11 @@ * @return error code */ -static int usb_hub_set_configuration(usb_hub_info_t * hub_info){ +static int usb_hub_set_configuration(usb_hub_info_t * hub_info) { //device descriptor usb_standard_device_descriptor_t *std_descriptor - = &hub_info->usb_device->descriptors.device; + = &hub_info->usb_device->descriptors.device; usb_log_debug("hub has %d configurations\n", - std_descriptor->configuration_count); - if(std_descriptor->configuration_count<1){ + std_descriptor->configuration_count); + if (std_descriptor->configuration_count < 1) { usb_log_error("there are no configurations available\n"); return EINVAL; @@ -199,19 +205,19 @@ usb_standard_configuration_descriptor_t *config_descriptor - = (usb_standard_configuration_descriptor_t *) - hub_info->usb_device->descriptors.configuration; + = (usb_standard_configuration_descriptor_t *) + hub_info->usb_device->descriptors.configuration; /* Set configuration. */ int opResult = usb_request_set_configuration( - &hub_info->usb_device->ctrl_pipe, - config_descriptor->configuration_number); + &hub_info->usb_device->ctrl_pipe, + config_descriptor->configuration_number); if (opResult != EOK) { usb_log_error("Failed to set hub configuration: %s.\n", - str_error(opResult)); + str_error(opResult)); return opResult; } usb_log_debug("\tused configuration %d\n", - config_descriptor->configuration_number); + config_descriptor->configuration_number); return EOK; @@ -226,24 +232,26 @@ * @return error code */ -int usb_hub_add_device(usb_device_t * usb_dev){ - if(!usb_dev) return EINVAL; +int usb_hub_add_device(usb_device_t * usb_dev) { + if (!usb_dev) return EINVAL; usb_hub_info_t * hub_info = usb_hub_info_create(usb_dev); //create hc connection usb_log_debug("Initializing USB wire abstraction.\n"); int opResult = usb_hc_connection_initialize_from_device( - &hub_info->connection, - hub_info->usb_device->ddf_dev); - if(opResult != EOK){ - usb_log_error("could not initialize connection to device, errno %d\n", - opResult); + &hub_info->connection, + hub_info->usb_device->ddf_dev); + if (opResult != EOK) { + usb_log_error("could not initialize connection to device, " + "errno %d\n", + opResult); free(hub_info); return opResult; } - + usb_pipe_start_session(hub_info->control_pipe); //set hub configuration opResult = usb_hub_set_configuration(hub_info); - if(opResult!=EOK){ - usb_log_error("could not set hub configuration, errno %d\n",opResult); + if (opResult != EOK) { + usb_log_error("could not set hub configuration, errno %d\n", + opResult); free(hub_info); return opResult; @@ -251,6 +259,7 @@ //get port count and create attached_devs opResult = usb_hub_process_hub_specific_info(hub_info); - if(opResult!=EOK){ - usb_log_error("could not set hub configuration, errno %d\n",opResult); + if (opResult != EOK) { + usb_log_error("could not set hub configuration, errno %d\n", + opResult); free(hub_info); return opResult; @@ -262,5 +271,5 @@ usb_log_debug("Creating `hub' function.\n"); ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev, - fun_exposed, "hub"); + fun_exposed, "hub"); assert(hub_fun != NULL); hub_fun->ops = NULL; @@ -274,5 +283,6 @@ fid_t fid = fibril_create(usb_hub_control_loop, hub_info); if (fid == 0) { - usb_log_error("failed to start monitoring fibril for new hub.\n"); + usb_log_error("failed to start monitoring fibril for new" + " hub.\n"); return ENOMEM; } @@ -281,5 +291,5 @@ usb_log_info("Controlling hub `%s' (%d ports).\n", - hub_info->usb_device->ddf_dev->name, hub_info->port_count); + hub_info->usb_device->ddf_dev->name, hub_info->port_count); return EOK; } @@ -302,7 +312,6 @@ */ static int usb_hub_trigger_connecting_non_removable_devices( - usb_hub_info_t * hub, - usb_hub_descriptor_t * descriptor) -{ + usb_hub_info_t * hub, + usb_hub_descriptor_t * descriptor) { usb_log_info("attaching non-removable devices(if any)\n"); //usb_device_request_setup_packet_t request; @@ -314,73 +323,89 @@ opResult = usb_request_set_configuration(hub->control_pipe, - 1); - if(opResult!=EOK){ - usb_log_error("could not set default configuration, errno %d",opResult); + 1); + if (opResult != EOK) { + usb_log_error("could not set default configuration, errno %d", + opResult); return opResult; } #if 0 - for(port=1;port<=descriptor->ports_count;++port){ + for (port = 1; port <= descriptor->ports_count; ++port) { bool is_non_removable = - ((non_removable_dev_bitmap[port/8]) >> (port%8)) %2; - if(is_non_removable){ - usb_log_debug("non-removable device on port %d\n",port); + ((non_removable_dev_bitmap[port / 8]) >> (port % 8)) % 2; + if (is_non_removable) { + usb_log_debug("non-removable device on port %d\n", port); usb_hub_set_port_status_request(&request, port); opResult = usb_pipe_control_read( - hub->control_pipe, - &request, sizeof(usb_device_request_setup_packet_t), - &status, 4, &rcvd_size - ); + hub->control_pipe, + &request, + sizeof (usb_device_request_setup_packet_t), + &status, 4, &rcvd_size + ); if (opResult != EOK) { - usb_log_error("could not get port status of port %d errno:%d\n", - port, opResult); + usb_log_error("could not get port status of " + "port %d errno:%d\n", + port, opResult); return opResult; } //try to reset port - if(usb_port_dev_connected(&status) || true){ - usb_hub_set_enable_port_feature_request(&request, port, - USB_HUB_FEATURE_PORT_RESET); + if (usb_port_dev_connected(&status) || true) { + usb_hub_set_enable_port_feature_request( + &request, port, + USB_HUB_FEATURE_PORT_RESET); opResult = usb_pipe_control_read( - hub->control_pipe, - &request, sizeof(usb_device_request_setup_packet_t), - &status, 4, &rcvd_size - ); + hub->control_pipe, + &request, + sizeof (usb_device_request_setup_packet_t), + &status, 4, &rcvd_size + ); if (opResult != EOK) { usb_log_warning( - "could not reset port %d errno:%d\n", - port, opResult); + "could not reset port %d " + "errno:%d\n", + port, opResult); } - usb_log_debug("port reset, should look like %d,x%x\n", - (1<control_pipe, - &request, sizeof(usb_device_request_setup_packet_t), - &status, 4, &rcvd_size - ); + hub->control_pipe, + &request, + sizeof (usb_device_request_setup_packet_t), + &status, 4, &rcvd_size + ); if (opResult != EOK) { usb_log_warning( - "could not clear port connection on port %d errno:%d\n", - port, opResult); + "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); + 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 - ); + 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); + "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"); + usb_log_debug("port set to enabled - " + "should lead to connection change\n"); } } @@ -389,9 +414,10 @@ /// \TODO this is just a debug code - for(port=1;port<=descriptor->ports_count;++port){ + for (port = 1; port <= descriptor->ports_count; ++port) { bool is_non_removable = - ((non_removable_dev_bitmap[port/8]) >> (port%8)) %2; - if(is_non_removable){ - usb_log_debug("CHECKING port %d is non-removable\n",port); + ((non_removable_dev_bitmap[port / 8]) >> (port % 8)) % 2; + if (is_non_removable) { + usb_log_debug("CHECKING port %d is non-removable\n", + port); usb_port_status_t status; size_t rcvd_size; @@ -401,13 +427,16 @@ //endpoint 0 opResult = usb_pipe_control_read( - hub->control_pipe, - &request, sizeof(usb_device_request_setup_packet_t), - &status, 4, &rcvd_size - ); + hub->control_pipe, + &request, + sizeof (usb_device_request_setup_packet_t), + &status, 4, &rcvd_size + ); if (opResult != EOK) { - usb_log_error("could not get port status %d\n",opResult); + usb_log_error("could not get port status %d\n", + opResult); } if (rcvd_size != sizeof (usb_port_status_t)) { - usb_log_error("received status has incorrect size\n"); + usb_log_error("received status has incorrect" + " size\n"); } //something connected/disconnected @@ -415,6 +444,6 @@ usb_log_debug("some connection changed\n"); } - usb_log_debug("status: %s\n",usb_debug_str_buffer( - (uint8_t *)&status,4,4)); + usb_log_debug("status: %s\n", usb_debug_str_buffer( + (uint8_t *) & status, 4, 4)); } } @@ -422,5 +451,4 @@ return EOK; } - /** @@ -432,8 +460,9 @@ * @return error code */ -static int usb_hub_release_default_address(usb_hub_info_t * hub){ +static int usb_hub_release_default_address(usb_hub_info_t * hub) { int opResult = usb_hc_release_default_address(&hub->connection); - if(opResult!=EOK){ - usb_log_error("could not release default address, errno %d\n",opResult); + if (opResult != EOK) { + usb_log_error("could not release default address, errno %d\n", + opResult); return opResult; } @@ -450,22 +479,23 @@ */ static int usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port, - usb_speed_t speed) { + usb_speed_t speed) { //if this hub already uses default address, it cannot request it once more - if(hub->is_default_address_used) return EREFUSED; + if (hub->is_default_address_used) return EREFUSED; usb_log_debug("some connection changed\n"); assert(hub->control_pipe->hc_phone); int opResult = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_C_PORT_CONNECTION); - if(opResult != EOK){ + port, USB_HUB_FEATURE_C_PORT_CONNECTION); + if (opResult != EOK) { usb_log_warning("could not clear port-change-connection flag\n"); } usb_device_request_setup_packet_t request; - + //get default address opResult = usb_hc_reserve_default_address(&hub->connection, speed); - - if (opResult != EOK) { - usb_log_warning("cannot assign default address, it is probably used %d\n", - opResult); + + if (opResult != EOK) { + usb_log_warning("cannot assign default address, it is probably " + "used %d\n", + opResult); return opResult; } @@ -474,10 +504,11 @@ usb_hub_set_reset_port_request(&request, port); opResult = usb_pipe_control_write( - hub->control_pipe, - &request,sizeof(usb_device_request_setup_packet_t), - NULL, 0 - ); - if (opResult != EOK) { - usb_log_error("something went wrong when reseting a port %d\n",opResult); + hub->control_pipe, + &request, sizeof (usb_device_request_setup_packet_t), + NULL, 0 + ); + if (opResult != EOK) { + usb_log_error("something went wrong when reseting a port %d\n", + opResult); usb_hub_release_default_address(hub); } @@ -493,11 +524,11 @@ * @param speed transfer speed of attached device, one of low, full or high */ -static void usb_hub_finalize_add_device( usb_hub_info_t * hub, - uint16_t port, usb_speed_t speed) { +static void usb_hub_finalize_add_device(usb_hub_info_t * hub, + uint16_t port, usb_speed_t speed) { int opResult; usb_log_debug("finalizing add device\n"); opResult = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_C_PORT_RESET); + port, USB_HUB_FEATURE_C_PORT_RESET); if (opResult != EOK) { @@ -510,17 +541,17 @@ usb_device_connection_t new_device_connection; usb_device_connection_initialize_on_default_address( - &new_device_connection, - &hub->connection - ); + &new_device_connection, + &hub->connection + ); usb_pipe_initialize_default_control( - &new_device_pipe, - &new_device_connection); + &new_device_pipe, + &new_device_connection); usb_pipe_probe_default_control(&new_device_pipe); /* Request address from host controller. */ usb_address_t new_device_address = usb_hc_request_address( - &hub->connection, - speed - ); + &hub->connection, + speed + ); if (new_device_address < 0) { usb_log_error("failed to get free USB address\n"); @@ -529,12 +560,14 @@ return; } - usb_log_debug("setting new address %d\n",new_device_address); + usb_log_debug("setting new address %d\n", new_device_address); //opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT, // new_device_address); usb_pipe_start_session(&new_device_pipe); - opResult = usb_request_set_address(&new_device_pipe,new_device_address); + opResult = usb_request_set_address(&new_device_pipe, + new_device_address); usb_pipe_end_session(&new_device_pipe); if (opResult != EOK) { - usb_log_error("could not set address for new device %d\n",opResult); + usb_log_error("could not set address for new device %d\n", + opResult); usb_hub_release_default_address(hub); return; @@ -543,5 +576,5 @@ //opResult = usb_hub_release_default_address(hc); opResult = usb_hub_release_default_address(hub); - if(opResult!=EOK){ + if (opResult != EOK) { return; } @@ -549,10 +582,12 @@ devman_handle_t child_handle; //?? - opResult = usb_device_register_child_in_devman(new_device_address, - hub->connection.hc_handle, hub->usb_device->ddf_dev, &child_handle, - NULL, NULL, NULL); - - if (opResult != EOK) { - usb_log_error("could not start driver for new device %d\n",opResult); + opResult = usb_device_register_child_in_devman(new_device_address, + hub->connection.hc_handle, hub->usb_device->ddf_dev, + &child_handle, + NULL, NULL, NULL); + + if (opResult != EOK) { + usb_log_error("could not start driver for new device %d\n", + opResult); return; } @@ -562,14 +597,15 @@ //opResult = usb_drv_bind_address(hc, new_device_address, child_handle); opResult = usb_hc_register_device( - &hub->connection, - &hub->attached_devs[port]); - if (opResult != EOK) { - usb_log_error("could not assign address of device in hcd %d\n",opResult); + &hub->connection, + &hub->attached_devs[port]); + if (opResult != EOK) { + usb_log_error("could not assign address of device in hcd %d\n", + opResult); return; } usb_log_info("Detected new device on `%s' (port %d), " \ "address %d (handle %llu).\n", - hub->usb_device->ddf_dev->name, (int) port, - new_device_address, child_handle); + hub->usb_device->ddf_dev->name, (int) port, + new_device_address, child_handle); } @@ -584,9 +620,9 @@ */ static void usb_hub_removed_device( - usb_hub_info_t * hub,uint16_t port) { + usb_hub_info_t * hub, uint16_t port) { int opResult = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_C_PORT_CONNECTION); - if(opResult != EOK){ + port, USB_HUB_FEATURE_C_PORT_CONNECTION); + if (opResult != EOK) { usb_log_warning("could not clear port-change-connection flag\n"); } @@ -594,12 +630,14 @@ * devide manager */ - + //close address - if(hub->attached_devs[port].address!=0){ + if (hub->attached_devs[port].address != 0) { /*uncomment this code to use it when DDF allows device removal opResult = usb_hc_unregister_device( - &hub->connection, hub->attached_devs[port].address); + &hub->connection, + hub->attached_devs[port].address); if(opResult != EOK) { - dprintf(USB_LOG_LEVEL_WARNING, "could not release address of " \ + dprintf(USB_LOG_LEVEL_WARNING, "could not release " + "address of " "removed device: %d", opResult); } @@ -607,15 +645,16 @@ hub->attached_devs[port].handle = 0; */ - }else{ - usb_log_warning("this is strange, disconnected device had no address\n"); - //device was disconnected before it`s port was reset - return default address + } else { + usb_log_warning("this is strange, disconnected device had " + "no address\n"); + //device was disconnected before it`s port was reset - + //return default address usb_hub_release_default_address(hub); } } - /** * Process over current condition on port. - * + * * Turn off the power on the port. * @@ -623,12 +662,12 @@ * @param port port number, starting from 1 */ -static void usb_hub_over_current( usb_hub_info_t * hub, - uint16_t port){ +static void usb_hub_over_current(usb_hub_info_t * hub, + uint16_t port) { int opResult; opResult = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_PORT_POWER); - if(opResult!=EOK){ + port, USB_HUB_FEATURE_PORT_POWER); + if (opResult != EOK) { usb_log_error("cannot power off port %d; %d\n", - port, opResult); + port, opResult); } } @@ -641,10 +680,10 @@ * @param port port number, starting from 1 */ -static void usb_hub_process_interrupt(usb_hub_info_t * hub, - uint16_t port) { +static void usb_hub_process_interrupt(usb_hub_info_t * hub, + uint16_t port) { usb_log_debug("interrupt at port %d\n", port); //determine type of change usb_pipe_t *pipe = hub->control_pipe; - + int opResult; @@ -657,8 +696,8 @@ opResult = usb_pipe_control_read( - pipe, - &request, sizeof(usb_device_request_setup_packet_t), - &status, 4, &rcvd_size - ); + pipe, + &request, sizeof (usb_device_request_setup_packet_t), + &status, 4, &rcvd_size + ); if (opResult != EOK) { usb_log_error("could not get port status\n"); @@ -674,5 +713,6 @@ if (usb_port_dev_connected(&status)) { usb_log_debug("some connection changed\n"); - usb_hub_init_add_device(hub, port, usb_port_speed(&status)); + usb_hub_init_add_device(hub, port, + usb_port_speed(&status)); } else { usb_hub_removed_device(hub, port); @@ -683,9 +723,10 @@ //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); - }else{ - usb_log_debug("over current condition was auto-resolved on port %d\n", - port); + if (usb_port_over_current(&status)) { + usb_hub_over_current(hub, port); + } else { + usb_log_debug("over current condition was " + "auto-resolved on port %d\n", + port); } } @@ -694,10 +735,12 @@ usb_log_debug("port reset complete\n"); if (usb_port_enabled(&status)) { - usb_hub_finalize_add_device(hub, port, usb_port_speed(&status)); + usb_hub_finalize_add_device(hub, port, + usb_port_speed(&status)); } else { - usb_log_warning("port reset, but port still not enabled\n"); + usb_log_warning("port reset, but port still not " + "enabled\n"); } } - usb_log_debug("status x%x : %d\n ",status,status); + usb_log_debug("status x%x : %d\n ", status, status); usb_port_set_connect_change(&status, false); @@ -705,17 +748,16 @@ usb_port_set_reset_completed(&status, false); usb_port_set_dev_connected(&status, false); - if (status>>16) { + if (status >> 16) { usb_log_info("there was some unsupported change on port %d: %X\n", - port,status); - - } -} - + port, status); + + } +} static int initialize_non_removable(usb_hub_info_t * hub_info, - unsigned int port){ + unsigned int port) { int opResult; usb_log_debug("there is not pluged in non-removable device on " - "port %d\n",port + "port %d\n", port ); //usb_hub_init_add_device(hub_info, port, usb_port_speed(&status)); @@ -728,10 +770,10 @@ opResult = usb_pipe_control_read( - hub_info->control_pipe, - &request, sizeof(usb_device_request_setup_packet_t), - &status, 4, &rcvd_size - ); - if (opResult != EOK) { - usb_log_error("could not get port status %d\n",opResult); + hub_info->control_pipe, + &request, sizeof (usb_device_request_setup_packet_t), + &status, 4, &rcvd_size + ); + if (opResult != EOK) { + usb_log_error("could not get port status %d\n", opResult); return opResult; } @@ -740,10 +782,11 @@ return opResult; } - usb_log_debug("port status %d, x%x\n",status,status); - if(usb_port_dev_connected(&status)){ + usb_log_debug("port status %d, x%x\n", status, status); + if (usb_port_dev_connected(&status)) { usb_log_debug("there is connected device on this port\n"); } - if(!hub_info->is_default_address_used) - usb_hub_init_add_device(hub_info, port, usb_port_speed(&status)); + if (!hub_info->is_default_address_used) + usb_hub_init_add_device(hub_info, port, + usb_port_speed(&status)); return opResult; } @@ -756,13 +799,14 @@ * @return error code */ -int usb_hub_check_hub_changes(usb_hub_info_t * hub_info){ +int usb_hub_check_hub_changes(usb_hub_info_t * hub_info) { int opResult; opResult = usb_pipe_start_session( - hub_info->status_change_pipe); - //this might not be necessary - if all non-removables are ok, it is not needed here + hub_info->status_change_pipe); + //this might not be necessary - if all non-removables are ok, it is + //not needed here opResult = usb_pipe_start_session(hub_info->control_pipe); - if(opResult != EOK){ + if (opResult != EOK) { usb_log_error("could not initialize communication for hub; %d\n", - opResult); + opResult); return opResult; } @@ -771,19 +815,20 @@ //first check non-removable devices { - unsigned int port; - for(port = 1; port<=port_count; ++port){ - bool is_non_removable = - hub_info->not_initialized_non_removables[port/8] - & (1 << (port%8)); - if(is_non_removable){ - opResult = initialize_non_removable(hub_info,port); + unsigned int port; + for (port = 1; port <= port_count; ++port) { + bool is_non_removable = + hub_info->not_initialized_non_removables[port/8] + & (1 << (port % 8)); + if (is_non_removable) { + opResult = initialize_non_removable(hub_info, + port); + } } } - } /// FIXME: count properly - size_t byte_length = ((port_count+1) / 8) + 1; - void *change_bitmap = malloc(byte_length); + size_t byte_length = ((port_count + 1) / 8) + 1; + void *change_bitmap = malloc(byte_length); size_t actual_size; @@ -792,25 +837,27 @@ */ opResult = usb_pipe_read( - hub_info->status_change_pipe, - change_bitmap, byte_length, &actual_size - ); + hub_info->status_change_pipe, + change_bitmap, byte_length, &actual_size + ); if (opResult != EOK) { free(change_bitmap); - usb_log_warning("something went wrong while getting status of hub\n"); + usb_log_warning("something went wrong while getting the" + "status of hub\n"); usb_pipe_end_session(hub_info->status_change_pipe); return opResult; } unsigned int port; - - if(opResult!=EOK){ - usb_log_error("could not start control pipe session %d\n", opResult); + + if (opResult != EOK) { + usb_log_error("could not start control pipe session %d\n", + opResult); usb_pipe_end_session(hub_info->status_change_pipe); return opResult; } opResult = usb_hc_connection_open(&hub_info->connection); - if(opResult!=EOK){ + if (opResult != EOK) { usb_log_error("could not start host controller session %d\n", - opResult); + opResult); usb_pipe_end_session(hub_info->control_pipe); usb_pipe_end_session(hub_info->status_change_pipe); @@ -819,10 +866,10 @@ ///todo, opresult check, pre obe konekce - for (port = 1; port < port_count+1; ++port) { + for (port = 1; port < port_count + 1; ++port) { bool interrupt = - (((uint8_t*) change_bitmap)[port / 8] >> (port % 8)) % 2; + (((uint8_t*) change_bitmap)[port / 8] >> (port % 8)) % 2; if (interrupt) { usb_hub_process_interrupt( - hub_info, port); + hub_info, port); } } Index: uspace/drv/usbhub/usbhub.h =================================================================== --- uspace/drv/usbhub/usbhub.h (revision 6c399765066bb4c35f189205cab7bbd61db00d88) +++ uspace/drv/usbhub/usbhub.h (revision 195890bda66ae3a7eba6423621ee7ce2d6cd1ebf) @@ -48,5 +48,4 @@ #include - /** Information about attached hub. */ typedef struct { @@ -56,5 +55,5 @@ /** attached device handles, for each port one */ usb_hc_attached_device_t * attached_devs; - + /** connection to hcd */ usb_hc_connection_t connection;