Index: uspace/drv/ohci/root_hub.c =================================================================== --- uspace/drv/ohci/root_hub.c (revision 1e1b1a9e2d4b2755204f6689ae9065b2c5512054) +++ uspace/drv/ohci/root_hub.c (revision f35b2942f93a409eb40a17d0d303cf1aec814999) @@ -115,5 +115,6 @@ static const uint32_t hub_set_feature_valid_mask = - (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT); + (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) | +(1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER); @@ -586,4 +587,6 @@ 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)) Index: uspace/drv/usbhub/port_status.h =================================================================== --- uspace/drv/usbhub/port_status.h (revision 1e1b1a9e2d4b2755204f6689ae9065b2c5512054) +++ uspace/drv/usbhub/port_status.h (revision f35b2942f93a409eb40a17d0d303cf1aec814999) @@ -96,5 +96,5 @@ usb_hub_create_port_status_request(uint16_t port) { usb_device_request_setup_packet_t * result = - usb_new(usb_device_request_setup_packet_t); + malloc(sizeof(usb_device_request_setup_packet_t)); usb_hub_set_port_status_request(result, port); return result; @@ -158,5 +158,5 @@ usb_hub_create_enable_port_request(uint16_t port) { usb_device_request_setup_packet_t * result = - usb_new(usb_device_request_setup_packet_t); + malloc(sizeof(usb_device_request_setup_packet_t)); usb_hub_set_enable_port_request(result, port); return result; @@ -186,5 +186,5 @@ usb_hub_create_disable_port_request(uint16_t port) { usb_device_request_setup_packet_t * result = - usb_new(usb_device_request_setup_packet_t); + malloc(sizeof(usb_device_request_setup_packet_t)); usb_hub_set_disable_port_request(result, port); return result; @@ -214,5 +214,5 @@ usb_hub_create_reset_port_request(uint16_t port) { usb_device_request_setup_packet_t * result = - usb_new(usb_device_request_setup_packet_t); + malloc(sizeof(usb_device_request_setup_packet_t)); usb_hub_set_reset_port_request(result, port); return result; @@ -256,6 +256,6 @@ * @return */ -static inline bool usb_port_get_bit(usb_port_status_t * status, int idx) { - return ((*status)&(1 << idx))!=0; +static inline bool usb_port_is_status(usb_port_status_t status, int idx) { + return (status&(1 << idx))!=0; } @@ -267,5 +267,5 @@ * @param value */ -static inline void usb_port_set_bit( +static inline void usb_port_status_set_bit( usb_port_status_t * status, int idx, bool value) { (*status) = value ? @@ -281,6 +281,6 @@ * @return */ -static inline bool usb_hub_get_bit(usb_hub_status_t * status, int idx) { - return ((*status)&(1 << idx))!=0; +static inline bool usb_hub_is_status(usb_hub_status_t status, int idx) { + return (status&(1 << idx))!=0; } @@ -292,5 +292,5 @@ * @param value */ -static inline void usb_hub_set_bit( +static inline void usb_hub_status_set_bit( usb_hub_status_t * status, int idx, bool value) { (*status) = value ? @@ -299,4 +299,6 @@ } + +#if 0 /** * connection status geter for port status @@ -425,4 +427,6 @@ } +#endif + //low speed device attached /** @@ -432,10 +436,10 @@ * @return true if low speed device is attached */ -static inline bool usb_port_low_speed(usb_port_status_t * status) { - return usb_port_get_bit(status, 9); -} - -/** - * set device connected bit in port status +static inline bool usb_port_low_speed(usb_port_status_t status) { + return usb_port_is_status(status, 9); +} + +/** + * set low speed device connected bit in port status * * @param status @@ -443,5 +447,5 @@ */ static inline void usb_port_set_low_speed(usb_port_status_t * status, bool low_speed) { - usb_port_set_bit(status, 9, low_speed); + usb_port_status_set_bit(status, 9, low_speed); } @@ -453,6 +457,6 @@ * @return true if high speed device is on port */ -static inline bool usb_port_high_speed(usb_port_status_t * status) { - return usb_port_get_bit(status, 10); +static inline bool usb_port_high_speed(usb_port_status_t status) { + return usb_port_is_status(status, 10); } @@ -464,5 +468,5 @@ */ static inline void usb_port_set_high_speed(usb_port_status_t * status, bool high_speed) { - usb_port_set_bit(status, 10, high_speed); + usb_port_status_set_bit(status, 10, high_speed); } @@ -473,5 +477,5 @@ * @return speed of usb device (for more see usb specification) */ -static inline usb_speed_t usb_port_speed(usb_port_status_t * status) { +static inline usb_speed_t usb_port_speed(usb_port_status_t status) { if (usb_port_low_speed(status)) return USB_SPEED_LOW; @@ -481,5 +485,5 @@ } - +#if 0 //connect change /** @@ -673,4 +677,5 @@ usb_hub_set_bit(status, 17, change); } +#endif Index: uspace/drv/usbhub/usbhub.c =================================================================== --- uspace/drv/usbhub/usbhub.c (revision 1e1b1a9e2d4b2755204f6689ae9065b2c5512054) +++ uspace/drv/usbhub/usbhub.c (revision f35b2942f93a409eb40a17d0d303cf1aec814999) @@ -61,11 +61,11 @@ static int usb_hub_set_configuration(usb_hub_info_t * hub_info); -//static int usb_hub_check_hub_changes(usb_hub_info_t * hub_info_param); +static int usb_hub_start_hub_fibril(usb_hub_info_t * hub_info); static int usb_process_hub_over_current(usb_hub_info_t * hub_info, - usb_hub_status_t status); + usb_hub_status_t status); static int usb_process_hub_power_change(usb_hub_info_t * hub_info, - usb_hub_status_t status); + usb_hub_status_t status); static void usb_hub_process_global_interrupt(usb_hub_info_t * hub_info); @@ -79,6 +79,4 @@ // //********************************************* - - /** @@ -96,10 +94,10 @@ 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); + &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); + "errno %d\n", + opResult); free(hub_info); return opResult; @@ -111,5 +109,5 @@ if (opResult != EOK) { usb_log_error("could not set hub configuration, errno %d\n", - opResult); + opResult); free(hub_info); return opResult; @@ -118,24 +116,211 @@ opResult = usb_hub_process_hub_specific_info(hub_info); if (opResult != EOK) { - usb_log_error("could not set hub configuration, errno %d\n", - opResult); + usb_log_error("could process hub specific info, errno %d\n", + opResult); free(hub_info); return opResult; } usb_pipe_end_session(hub_info->control_pipe); - /// \TODO what is this? 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; - int rc = ddf_fun_bind(hub_fun); - assert(rc == EOK); - rc = ddf_fun_add_to_class(hub_fun, "hub"); - assert(rc == EOK); - + opResult = ddf_fun_bind(hub_fun); + assert(opResult == EOK); + opResult = ddf_fun_add_to_class(hub_fun, "hub"); + assert(opResult == EOK); + + opResult = usb_hub_start_hub_fibril(hub_info); + if(opResult!=EOK) + free(hub_info); + return opResult; +} + + +/** Callback for polling hub for changes. + * + * @param dev Device where the change occured. + * @param change_bitmap Bitmap of changed ports. + * @param change_bitmap_size Size of the bitmap in bytes. + * @param arg Custom argument, points to @c usb_hub_info_t. + * @return Whether to continue polling. + */ +bool hub_port_changes_callback(usb_device_t *dev, + uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) { + usb_hub_info_t *hub = (usb_hub_info_t *) arg; + + /* FIXME: check that we received enough bytes. */ + if (change_bitmap_size == 0) { + goto leave; + } + + bool change; + change = ((uint8_t*) change_bitmap)[0] & 1; + if (change) { + usb_hub_process_global_interrupt(hub); + } + + size_t port; + for (port = 1; port < hub->port_count + 1; port++) { + bool change = (change_bitmap[port / 8] >> (port % 8)) % 2; + if (change) { + usb_hub_process_interrupt(hub, port); + } + } +leave: + /* FIXME: proper interval. */ + async_usleep(1000 * 1000 * 10); + + return true; +} + +/** + * release default address used by given hub + * + * Also unsets hub->is_default_address_used. Convenience wrapper function. + * @note hub->connection MUST be open for communication + * @param hub hub representation + * @return error code + */ +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); + return opResult; + } + hub->is_default_address_used = false; + return EOK; +} + + +//********************************************* +// +// support functions +// +//********************************************* + +/** + * create usb_hub_info_t structure + * + * Does only basic copying of known information into new structure. + * @param usb_dev usb device structure + * @return basic usb_hub_info_t structure + */ +static usb_hub_info_t * usb_hub_info_create(usb_device_t * usb_dev) { + usb_hub_info_t * result = malloc(sizeof(usb_hub_info_t)); + if (!result) return NULL; + result->usb_device = usb_dev; + result->status_change_pipe = usb_dev->pipes[0].pipe; + result->control_pipe = &usb_dev->ctrl_pipe; + result->is_default_address_used = false; + return result; +} + +/** + * Load hub-specific information into hub_info structure and process if needed + * + * Particularly read port count and initialize structure holding port + * information. If there are non-removable devices, start initializing them. + * This function is hub-specific and should be run only after the hub is + * configured using usb_hub_set_configuration function. + * @param hub_info hub representation + * @return error code + */ +static int usb_hub_process_hub_specific_info(usb_hub_info_t * hub_info) { + // get hub descriptor + usb_log_debug("creating serialized descriptor\n"); + void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE); + usb_hub_descriptor_t * descriptor; + int opResult; + + size_t received_size; + opResult = usb_request_get_descriptor(hub_info->control_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); + free(serialized_descriptor); + return opResult; + } + usb_log_debug2("deserializing descriptor\n"); + descriptor = usb_deserialize_hub_desriptor(serialized_descriptor); + 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); + hub_info->port_count = descriptor->ports_count; + /// \TODO this is not semantically correct + hub_info->ports = malloc( + sizeof (usb_hub_port_t) * (hub_info->port_count + 1)); + size_t port; + for (port = 0; port < hub_info->port_count + 1; port++) { + usb_hub_port_init(&hub_info->ports[port]); + } + usb_log_debug2("freeing data\n"); + free(serialized_descriptor); + free(descriptor->devices_removable); + free(descriptor); + return EOK; +} + +/** + * Set configuration of hub + * + * Check whether there is at least one configuration and sets the first one. + * This function should be run prior to running any hub-specific action. + * @param hub_info hub representation + * @return error code + */ +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; + usb_log_debug("hub has %d configurations\n", + std_descriptor->configuration_count); + if (std_descriptor->configuration_count < 1) { + usb_log_error("there are no configurations available\n"); + return EINVAL; + } + + usb_standard_configuration_descriptor_t *config_descriptor + = (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); + + if (opResult != EOK) { + usb_log_error("Failed to set hub configuration: %s.\n", + str_error(opResult)); + return opResult; + } + usb_log_debug("\tused configuration %d\n", + config_descriptor->configuration_number); + + return EOK; +} + +/** + * create and start fibril with hub control loop + * + * Before the fibril is started, the control pipe and host controller + * connection of the hub is open. + * + * @param hub_info hub representing structure + * @return error code + */ +static int usb_hub_start_hub_fibril(usb_hub_info_t * hub_info){ /* * The processing will require opened control pipe and connection @@ -146,20 +331,20 @@ * auto destruction, this could work better. */ - rc = usb_pipe_start_session(&usb_dev->ctrl_pipe); + int rc = usb_pipe_start_session(hub_info->control_pipe); if (rc != EOK) { usb_log_error("Failed to start session on control pipe: %s.\n", str_error(rc)); - goto leave; + return rc; } rc = usb_hc_connection_open(&hub_info->connection); if (rc != EOK) { - usb_pipe_end_session(&usb_dev->ctrl_pipe); + usb_pipe_end_session(hub_info->control_pipe); usb_log_error("Failed to open connection to HC: %s.\n", str_error(rc)); - goto leave; + return rc; } rc = usb_device_auto_poll(hub_info->usb_device, 0, - hub_port_changes_callback, ((hub_info->port_count+1) / 8) + 1, + hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1, NULL, hub_info); if (rc != EOK) { @@ -171,280 +356,14 @@ 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; -leave: - free(hub_info); - - return rc; -} - - -//********************************************* -// -// hub driver code, main loop and port handling -// -//********************************************* - - -/** Callback for polling hub for changes. - * - * @param dev Device where the change occured. - * @param change_bitmap Bitmap of changed ports. - * @param change_bitmap_size Size of the bitmap in bytes. - * @param arg Custom argument, points to @c usb_hub_info_t. - * @return Whether to continue polling. - */ -bool hub_port_changes_callback(usb_device_t *dev, - uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) -{ - usb_hub_info_t *hub = (usb_hub_info_t *) arg; - - /* FIXME: check that we received enough bytes. */ - if (change_bitmap_size == 0) { - goto leave; - } - - bool change; - change = ((uint8_t*)change_bitmap)[0] & 1; - if(change){ - usb_hub_process_global_interrupt(hub); - } - - size_t port; - for (port = 1; port < hub->port_count + 1; port++) { - bool change = (change_bitmap[port / 8] >> (port % 8)) % 2; - if (change) { - usb_hub_process_interrupt(hub, port); - } - } - - - - - -leave: - /* FIXME: proper interval. */ - async_usleep(1000 * 1000 * 10 ); - - return true; -} - - -/** - * release default address used by given hub - * - * Also unsets hub->is_default_address_used. Convenience wrapper function. - * @note hub->connection MUST be open for communication - * @param hub hub representation - * @return error code - */ -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); - return opResult; - } - hub->is_default_address_used = false; - return EOK; -} - - -//********************************************* -// -// support functions -// -//********************************************* - -/** - * create usb_hub_info_t structure - * - * Does only basic copying of known information into new structure. - * @param usb_dev usb device structure - * @return basic usb_hub_info_t structure - */ -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; - result->usb_device = usb_dev; - result->status_change_pipe = usb_dev->pipes[0].pipe; - result->control_pipe = &usb_dev->ctrl_pipe; - result->is_default_address_used = false; - return result; -} - - -/** - * Load hub-specific information into hub_info structure and process if needed - * - * Particularly read port count and initialize structure holding port - * information. If there are non-removable devices, start initializing them. - * This function is hub-specific and should be run only after the hub is - * configured using usb_hub_set_configuration function. - * @param hub_info hub representation - * @return error code - */ -static int usb_hub_process_hub_specific_info(usb_hub_info_t * hub_info) { - // get hub descriptor - usb_log_debug("creating serialized descriptor\n"); - void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE); - usb_hub_descriptor_t * descriptor; - int opResult; - - size_t received_size; - opResult = usb_request_get_descriptor(hub_info->control_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); - free(serialized_descriptor); - return opResult; - } - usb_log_debug2("deserializing descriptor\n"); - descriptor = usb_deserialize_hub_desriptor(serialized_descriptor); - 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); - hub_info->port_count = descriptor->ports_count; - /// \TODO this is not semantically correct - hub_info->ports = malloc(sizeof(usb_hub_port_t) * (hub_info->port_count+1)); - size_t port; - for (port = 0; port < hub_info->port_count + 1; port++) { - usb_hub_port_init(&hub_info->ports[port]); - } - usb_log_debug2("freeing data\n"); - free(serialized_descriptor); - free(descriptor->devices_removable); - free(descriptor); - return EOK; -} - -/** - * Set configuration of hub - * - * Check whether there is at least one configuration and sets the first one. - * This function should be run prior to running any hub-specific action. - * @param hub_info hub representation - * @return error code - */ -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; - usb_log_debug("hub has %d configurations\n", - std_descriptor->configuration_count); - if (std_descriptor->configuration_count < 1) { - usb_log_error("there are no configurations available\n"); - return EINVAL; - } - - usb_standard_configuration_descriptor_t *config_descriptor - = (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); - - if (opResult != EOK) { - usb_log_error("Failed to set hub configuration: %s.\n", - str_error(opResult)); - return opResult; - } - usb_log_debug("\tused configuration %d\n", - config_descriptor->configuration_number); - - return EOK; -} - -#if 0 -/** - * check changes on hub - * - * Handles changes on each port with a status change. - * @param hub_info hub representation - * @return error code - */ -static 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 - opResult = usb_pipe_start_session(hub_info->control_pipe); - if (opResult != EOK) { - usb_log_error("could not initialize communication for hub; %d\n", - opResult); - return opResult; - } - - size_t port_count = hub_info->port_count; - size_t byte_length = ((port_count + 1) / 8) + 1; - void *change_bitmap = malloc(byte_length); - size_t actual_size; - - /* - * Send the request. - */ - opResult = usb_pipe_read( - 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 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); - usb_pipe_end_session(hub_info->status_change_pipe); - return opResult; - } - opResult = usb_hc_connection_open(&hub_info->connection); - if (opResult != EOK) { - usb_log_error("could not start host controller session %d\n", - opResult); - usb_pipe_end_session(hub_info->control_pipe); - usb_pipe_end_session(hub_info->status_change_pipe); - return opResult; - } - - ///todo, opresult check, pre obe konekce - bool interrupt; - interrupt = ((uint8_t*)change_bitmap)[0] & 1; - if(interrupt){ - usb_hub_process_global_interrupt(hub_info); - } - for (port = 1; port < port_count + 1; ++port) { - interrupt = - ((uint8_t*) change_bitmap)[port / 8] & (1<<(port % 8)); - if (interrupt) { - usb_hub_process_interrupt( - hub_info, port); - } - } - /// \todo check hub status - usb_hc_connection_close(&hub_info->connection); - usb_pipe_end_session(hub_info->control_pipe); - usb_pipe_end_session(hub_info->status_change_pipe); - free(change_bitmap); - return EOK; -} - -#endif +} + +//********************************************* +// +// change handling functions +// +//********************************************* + /** @@ -457,20 +376,19 @@ */ static int usb_process_hub_over_current(usb_hub_info_t * hub_info, - usb_hub_status_t status) -{ + usb_hub_status_t status) { int opResult; - if(usb_hub_over_current(&status)){ + if (usb_hub_is_status(status,USB_HUB_FEATURE_HUB_OVER_CURRENT)){ opResult = usb_hub_clear_feature(hub_info->control_pipe, - USB_HUB_FEATURE_PORT_POWER); + USB_HUB_FEATURE_HUB_LOCAL_POWER); if (opResult != EOK) { usb_log_error("cannot power off hub: %d\n", - opResult); + opResult); } - }else{ + } else { opResult = usb_hub_set_feature(hub_info->control_pipe, - USB_HUB_FEATURE_PORT_POWER); + USB_HUB_FEATURE_HUB_LOCAL_POWER); if (opResult != EOK) { usb_log_error("cannot power on hub: %d\n", - opResult); + opResult); } } @@ -488,24 +406,23 @@ */ static int usb_process_hub_power_change(usb_hub_info_t * hub_info, - usb_hub_status_t status) -{ + usb_hub_status_t status) { int opResult; - if(usb_hub_local_power_lost(&status)){ + if (usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) { //restart power on hub opResult = usb_hub_set_feature(hub_info->control_pipe, - USB_HUB_FEATURE_PORT_POWER); + USB_HUB_FEATURE_HUB_LOCAL_POWER); if (opResult != EOK) { usb_log_error("cannot power on hub: %d\n", - opResult); + opResult); } - }else{//power reestablished on hub- restart ports + } else {//power reestablished on hub- restart ports size_t port; - for(port=0;portport_count;++port){ + for (port = 0; port < hub_info->port_count; ++port) { opResult = usb_hub_set_port_feature( - hub_info->control_pipe, - port, USB_HUB_FEATURE_PORT_POWER); + hub_info->control_pipe, + port, USB_HUB_FEATURE_PORT_POWER); if (opResult != EOK) { usb_log_error("cannot power on port %d; %d\n", - port, opResult); + port, opResult); } } @@ -521,5 +438,5 @@ * @param hub_info hub instance */ -static void usb_hub_process_global_interrupt(usb_hub_info_t * hub_info){ +static void usb_hub_process_global_interrupt(usb_hub_info_t * hub_info) { usb_log_debug("global interrupt on a hub\n"); usb_pipe_t *pipe = hub_info->control_pipe; @@ -534,8 +451,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 hub status\n"); @@ -547,13 +464,13 @@ } //port reset - if (usb_hub_over_current_change(&status)) { - usb_process_hub_over_current(hub_info,status); - } - if (usb_hub_local_power_change(&status)) { - usb_process_hub_power_change(hub_info,status); - } -} - - + if ( + usb_hub_is_status(status,16+USB_HUB_FEATURE_C_HUB_OVER_CURRENT)) { + usb_process_hub_over_current(hub_info, status); + } + if ( + usb_hub_is_status(status,16+USB_HUB_FEATURE_C_HUB_LOCAL_POWER)) { + usb_process_hub_power_change(hub_info, status); + } +} /** Index: uspace/drv/usbhub/usbhub_private.h =================================================================== --- uspace/drv/usbhub/usbhub_private.h (revision 1e1b1a9e2d4b2755204f6689ae9065b2c5512054) +++ uspace/drv/usbhub/usbhub_private.h (revision f35b2942f93a409eb40a17d0d303cf1aec814999) @@ -54,16 +54,6 @@ // //************ -#define usb_new(type) (type*)malloc(sizeof(type)) -/** - * Create hub structure instance - * - * Set the address and port count information most importantly. - * - * @param device - * @param hc host controller phone - * @return - */ usb_hub_info_t * usb_create_hub_info(ddf_dev_t * device); Index: uspace/drv/usbhub/utils.c =================================================================== --- uspace/drv/usbhub/utils.c (revision 1e1b1a9e2d4b2755204f6689ae9065b2c5512054) +++ uspace/drv/usbhub/utils.c (revision f35b2942f93a409eb40a17d0d303cf1aec814999) @@ -60,7 +60,7 @@ size_t size = 7; //variable size according to port count - size_t var_size = descriptor->ports_count / 8 + ((descriptor->ports_count % 8 > 0) ? 1 : 0); + size_t var_size = (descriptor->ports_count+7)/8; size += 2 * var_size; - uint8_t * result = (uint8_t*) malloc(size); + uint8_t * result = malloc(size); //size result[0] = size; @@ -84,13 +84,15 @@ } -usb_hub_descriptor_t * usb_deserialize_hub_desriptor(void * serialized_descriptor) { - uint8_t * sdescriptor = (uint8_t*) serialized_descriptor; +usb_hub_descriptor_t * usb_deserialize_hub_desriptor( +void * serialized_descriptor) { + uint8_t * sdescriptor = serialized_descriptor; if (sdescriptor[1] != USB_DESCTYPE_HUB) { - usb_log_warning("trying to deserialize wrong descriptor %x\n",sdescriptor[1]); + usb_log_warning("trying to deserialize wrong descriptor %x\n", + sdescriptor[1]); return NULL; } - usb_hub_descriptor_t * result = usb_new(usb_hub_descriptor_t); + usb_hub_descriptor_t * result = malloc(sizeof(usb_hub_descriptor_t)); @@ -100,6 +102,5 @@ result->pwr_on_2_good_time = sdescriptor[5]; result->current_requirement = sdescriptor[6]; - size_t var_size = result->ports_count / 8 + ((result->ports_count % 8 > 0) - ? 1 : 0); + size_t var_size = (result->ports_count+7) / 8; result->devices_removable = (uint8_t*) malloc(var_size); Index: uspace/lib/usb/include/usb/classes/hub.h =================================================================== --- uspace/lib/usb/include/usb/classes/hub.h (revision 1e1b1a9e2d4b2755204f6689ae9065b2c5512054) +++ uspace/lib/usb/include/usb/classes/hub.h (revision f35b2942f93a409eb40a17d0d303cf1aec814999) @@ -43,4 +43,6 @@ */ typedef enum { + USB_HUB_FEATURE_HUB_LOCAL_POWER = 0, + USB_HUB_FEATURE_HUB_OVER_CURRENT = 1, USB_HUB_FEATURE_C_HUB_LOCAL_POWER = 0, USB_HUB_FEATURE_C_HUB_OVER_CURRENT = 1, @@ -59,4 +61,5 @@ /* USB_HUB_FEATURE_ = , */ } usb_hub_class_feature_t; + /** Header of standard hub descriptor without the "variadic" part. */