Changes in / [aee6c73:c9f5e238] in mainline

Location:

uspace/drv

Files:

• ohci/root_hub.c (modified) (19 diffs)
• usbhub/usbhub.c (modified) (7 diffs)

uspace/drv/ohci/root_hub.c

@@ -117 +117 @@
 /*----------------------------------------------------------------------------*/
 
-/**
- * create answer to port status_request
- *
- * Copy content of corresponding port status register to answer buffer.
- *
- * @param instance root hub instance
- * @param port port number, counted from 1
- * @param request structure containing both request and response information
- * @return error code
- */
+
 static int process_get_port_status_request(rh_t *instance, uint16_t port,
                 usb_transfer_batch_t * request){
@@ -137 +128 @@
 }
 
-/**
- * create answer to port status_request
- *
- * Copy content of hub status register to answer buffer.
- *
- * @param instance root hub instance
- * @param request structure containing both request and response information
- * @return error code
- */
 static int process_get_hub_status_request(rh_t *instance,
                 usb_transfer_batch_t * request){
@@ -157 +139 @@
 }
 
-/**
- * Create hub descriptor used in hub-driver <-> hub communication
- * 
- * This means creating byt array from data in root hub registers. For more
- * info see usb hub specification.
- *
- * @param instance root hub instance
- * @param@out out_result pointer to resultant serialized descriptor
- * @param@out out_size size of serialized descriptor
- */
-static void usb_create_serialized_hub_descriptor(rh_t *instance,
-                uint8_t ** out_result,
+static void usb_create_serialized_hub_descriptor(rh_t *instance, uint8_t ** out_result,
                 size_t * out_size) {
         //base size
@@ -208 +179 @@
 
 
-/**
- * create answer to status request
- *
- * This might be either hub status or port status request. If neither,
- * ENOTSUP is returned.
- * @param instance root hub instance
- * @param request structure containing both request and response information
- * @return error code
- */
 static int process_get_status_request(rh_t *instance,
                 usb_transfer_batch_t * request)
@@ -239 +201 @@
 }
 
-/**
- * create answer to status interrupt consisting of change bitmap
- *
- * Result contains bitmap where bit 0 indicates change on hub and
- * bit i indicates change on i`th port (i>0). For more info see
- * Hub and Port status bitmap specification in USB specification.
- * @param instance root hub instance
- * @param@out buffer pointer to created interrupt mas
- * @param@out buffer_size size of created interrupt mask
- */
 static void create_interrupt_mask(rh_t *instance, void ** buffer,
                 size_t * buffer_size){
@@ -272 +224 @@
 }
 
-/**
- * create standard device descriptor for a hub
- * @return newly allocated descriptor
- */
-static usb_standard_device_descriptor_t *
-        usb_ohci_rh_create_standard_device_descriptor(){
-        usb_standard_device_descriptor_t * descriptor =
-                                (usb_standard_device_descriptor_t*)
-                                malloc(sizeof(usb_standard_device_descriptor_t));
-        descriptor->configuration_count = 1;
-        descriptor->descriptor_type = USB_DESCTYPE_DEVICE;
-        descriptor->device_class = USB_CLASS_HUB;
-        descriptor->device_protocol = 0;
-        descriptor->device_subclass = 0;
-        descriptor->device_version = 0;
-        descriptor->length = sizeof(usb_standard_device_descriptor_t);
-        /// \TODO this value is guessed
-        descriptor->max_packet_size = 8;
-        descriptor->product_id = 0x0001;
-        /// \TODO these values migt be different
-        descriptor->str_serial_number = 0;
-        descriptor->str_serial_number = 0;
-        descriptor->usb_spec_version = 0;
-        descriptor->vendor_id = 0x16db;
-        return descriptor;
-}
-
-/**
- * create standart configuration descriptor for the root hub instance
- * @param instance root hub instance
- * @return newly allocated descriptor
- */
-static usb_standard_configuration_descriptor_t *
-usb_ohci_rh_create_standart_configuration_descriptor(rh_t *instance){
-        usb_standard_configuration_descriptor_t * descriptor =
-                        (usb_standard_configuration_descriptor_t*)
-                        malloc(sizeof(usb_standard_configuration_descriptor_t));
-        /// \TODO some values are default or guessed
-        descriptor->attributes = 1<<7;
-        descriptor->configuration_number = 1;
-        descriptor->descriptor_type = USB_DESCTYPE_CONFIGURATION;
-        descriptor->interface_count = 1;
-        descriptor->length = sizeof(usb_standard_configuration_descriptor_t);
-        descriptor->max_power = 100;
-        descriptor->str_configuration = 0;
-        /// \TODO should this include device descriptor?
-        size_t hub_descriptor_size = 7 +
-                        2* (instance->port_count / 8 +
-                        ((instance->port_count % 8 > 0) ? 1 : 0));
-        descriptor->total_length =
-                        sizeof(usb_standard_configuration_descriptor_t)+
-                        sizeof(usb_standard_endpoint_descriptor_t)+
-                        sizeof(usb_standard_interface_descriptor_t)+
-                        hub_descriptor_size;
-        return descriptor;
-}
-
-/**
- * create standard interface descriptor for a root hub
- * @return newly allocated descriptor
- */
-static usb_standard_interface_descriptor_t *
-usb_ohci_rh_create_standard_interface_descriptor(){
-        usb_standard_interface_descriptor_t * descriptor =
-                                (usb_standard_interface_descriptor_t*)
-                                malloc(sizeof(usb_standard_interface_descriptor_t));
-        descriptor->alternate_setting = 0;
-        descriptor->descriptor_type = USB_DESCTYPE_INTERFACE;
-        descriptor->endpoint_count = 1;
-        descriptor->interface_class = USB_CLASS_HUB;
-        /// \TODO is this correct?
-        descriptor->interface_number = 1;
-        descriptor->interface_protocol = 0;
-        descriptor->interface_subclass = 0;
-        descriptor->length = sizeof(usb_standard_interface_descriptor_t);
-        descriptor->str_interface = 0;
-        return descriptor;
-}
-
-/**
- * create standard endpoint descriptor for a root hub
- * @return newly allocated descriptor
- */
-static usb_standard_endpoint_descriptor_t *
-usb_ohci_rh_create_standard_endpoint_descriptor(){
-        usb_standard_endpoint_descriptor_t * descriptor =
-                        (usb_standard_endpoint_descriptor_t*)
-                        malloc(sizeof(usb_standard_endpoint_descriptor_t));
-        descriptor->attributes = USB_TRANSFER_INTERRUPT;
-        descriptor->descriptor_type = USB_DESCTYPE_ENDPOINT;
-        descriptor->endpoint_address = 1 + (1<<7);
-        descriptor->length = sizeof(usb_standard_endpoint_descriptor_t);
-        descriptor->max_packet_size = 8;
-        descriptor->poll_interval = 255;
-        return descriptor;
-}
-
-/**
- * create answer to a descriptor request
- *
- * This might be a request for standard (configuration, device, endpoint or
- * interface) or device specific (hub) descriptor.
- * @param instance root hub instance
- * @param request structure containing both request and response information
- * @return error code
- */
+
 static int process_get_descriptor_request(rh_t *instance,
                 usb_transfer_batch_t *request){
+        /// \TODO
         usb_device_request_setup_packet_t * setup_request =
                         (usb_device_request_setup_packet_t*)request->setup_buffer;
         size_t size;
-        const void * result_descriptor = NULL;
+        const void * result_descriptor;
         const uint16_t setup_request_value = setup_request->value_high;
                         //(setup_request->value_low << 8);
-#if 0
         bool del = false;
-        //this code was merged from development and has to be reviewed
+
         switch (setup_request_value)
         {
@@ -448 +295 @@
         }
         }
-#endif
+#if 0
         if(setup_request_value == USB_DESCTYPE_HUB){
                 usb_log_debug("USB_DESCTYPE_HUB\n");
@@ -459 +306 @@
                 //create std device descriptor
                 usb_log_debug("USB_DESCTYPE_DEVICE\n");
-                result_descriptor =
-                                usb_ohci_rh_create_standard_device_descriptor();
+                usb_standard_device_descriptor_t * descriptor =
+                                (usb_standard_device_descriptor_t*)
+                                malloc(sizeof(usb_standard_device_descriptor_t));
+                descriptor->configuration_count = 1;
+                descriptor->descriptor_type = USB_DESCTYPE_DEVICE;
+                descriptor->device_class = USB_CLASS_HUB;
+                descriptor->device_protocol = 0;
+                descriptor->device_subclass = 0;
+                descriptor->device_version = 0;
+                descriptor->length = sizeof(usb_standard_device_descriptor_t);
+                /// \TODO this value is guessed
+                descriptor->max_packet_size = 8;
+                descriptor->product_id = 0x0001;
+                /// \TODO these values migt be different
+                descriptor->str_serial_number = 0;
+                descriptor->str_serial_number = 0;
+                descriptor->usb_spec_version = 0;
+                descriptor->vendor_id = 0x16db;
+                result_descriptor = descriptor;
                 size = sizeof(usb_standard_device_descriptor_t);
         }else if(setup_request_value == USB_DESCTYPE_CONFIGURATION){
                 usb_log_debug("USB_DESCTYPE_CONFIGURATION\n");
-                result_descriptor =
-                                usb_ohci_rh_create_standart_configuration_descriptor(instance);
+                usb_standard_configuration_descriptor_t * descriptor =
+                                (usb_standard_configuration_descriptor_t*)
+                                malloc(sizeof(usb_standard_configuration_descriptor_t));
+                /// \TODO some values are default or guessed
+                descriptor->attributes = 1<<7;
+                descriptor->configuration_number = 1;
+                descriptor->descriptor_type = USB_DESCTYPE_CONFIGURATION;
+                descriptor->interface_count = 1;
+                descriptor->length = sizeof(usb_standard_configuration_descriptor_t);
+                descriptor->max_power = 100;
+                descriptor->str_configuration = 0;
+                /// \TODO should this include device descriptor?
+                size_t hub_descriptor_size = 7 +
+                                2* (instance->port_count / 8 +
+                                ((instance->port_count % 8 > 0) ? 1 : 0));
+                descriptor->total_length =
+                                sizeof(usb_standard_configuration_descriptor_t)+
+                                sizeof(usb_standard_endpoint_descriptor_t)+
+                                sizeof(usb_standard_interface_descriptor_t)+
+                                hub_descriptor_size;
+                result_descriptor = descriptor;
                 size = sizeof(usb_standard_configuration_descriptor_t);
 
         }else if(setup_request_value == USB_DESCTYPE_INTERFACE){
                 usb_log_debug("USB_DESCTYPE_INTERFACE\n");
-                result_descriptor =
-                                usb_ohci_rh_create_standard_interface_descriptor();
+                usb_standard_interface_descriptor_t * descriptor =
+                                (usb_standard_interface_descriptor_t*)
+                                malloc(sizeof(usb_standard_interface_descriptor_t));
+                descriptor->alternate_setting = 0;
+                descriptor->descriptor_type = USB_DESCTYPE_INTERFACE;
+                descriptor->endpoint_count = 1;
+                descriptor->interface_class = USB_CLASS_HUB;
+                /// \TODO is this correct?
+                descriptor->interface_number = 1;
+                descriptor->interface_protocol = 0;
+                descriptor->interface_subclass = 0;
+                descriptor->length = sizeof(usb_standard_interface_descriptor_t);
+                descriptor->str_interface = 0;
+                result_descriptor = descriptor;
                 size = sizeof(usb_standard_interface_descriptor_t);
         }else if(setup_request_value == USB_DESCTYPE_ENDPOINT){
                 usb_log_debug("USB_DESCTYPE_ENDPOINT\n");
-                result_descriptor =
-                                usb_ohci_rh_create_standard_endpoint_descriptor();
+                usb_standard_endpoint_descriptor_t * descriptor =
+                                (usb_standard_endpoint_descriptor_t*)
+                                malloc(sizeof(usb_standard_endpoint_descriptor_t));
+                descriptor->attributes = USB_TRANSFER_INTERRUPT;
+                descriptor->descriptor_type = USB_DESCTYPE_ENDPOINT;
+                descriptor->endpoint_address = 1 + (1<<7);
+                descriptor->length = sizeof(usb_standard_endpoint_descriptor_t);
+                descriptor->max_packet_size = 8;
+                descriptor->poll_interval = 255;
+                result_descriptor = descriptor;
                 size = sizeof(usb_standard_endpoint_descriptor_t);
         }else{
@@ -489 +392 @@
                 return EINVAL;
         }
+#endif
         if(request->buffer_size < size){
                 size = request->buffer_size;
@@ -494 +398 @@
         request->transfered_size = size;
         memcpy(request->buffer,result_descriptor,size);
-        if (result_descriptor)
+        if (del)
                 free(result_descriptor);
         return EOK;
 }
 
-/**
- * answer to get configuration request
- *
- * Root hub works independently on the configuration.
- * @param instance root hub instance
- * @param request structure containing both request and response information
- * @return error code
- */
 static int process_get_configuration_request(rh_t *instance, 
                 usb_transfer_batch_t *request){
@@ -518 +414 @@
 }
 
-/**
- * process feature-enabling/disabling request on hub
- * 
- * @param instance root hub instance
- * @param feature feature selector
- * @param enable enable or disable specified feature
- * @return error code
- */
 static int process_hub_feature_set_request(rh_t *instance,
                 uint16_t feature, bool enable){
@@ -539 +427 @@
 }
 
-/**
- * process feature-enabling/disabling 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
- * @return error code
- */
 static int process_port_feature_set_request(rh_t *instance,
                 uint16_t feature, uint16_t port, bool enable){
@@ -563 +442 @@
 }
 
-/**
- * register address to this device
- * 
- * @param instance root hub instance
- * @param address new address
- * @return error code
- */
 static int process_address_set_request(rh_t *instance,
                 uint16_t address){
@@ -576 +448 @@
 }
 
-/**
- * process one of requests that requere output data
- *
- * Request can be one of USB_DEVREQ_GET_STATUS, USB_DEVREQ_GET_DESCRIPTOR or
- * USB_DEVREQ_GET_CONFIGURATION.
- * @param instance root hub instance
- * @param request structure containing both request and response information
- * @return error code
- */
 static int process_request_with_output(rh_t *instance,
                 usb_transfer_batch_t *request){
@@ -604 +467 @@
 }
 
-/**
- * process one of requests that carry input data
- *
- * Request can be one of USB_DEVREQ_SET_DESCRIPTOR or
- * USB_DEVREQ_SET_CONFIGURATION.
- * @param instance root hub instance
- * @param request structure containing both request and response information
- * @return error code
- */
 static int process_request_with_input(rh_t *instance,
                 usb_transfer_batch_t *request){
@@ -629 +483 @@
 }
 
-/**
- * process one of requests that do not request nor carry additional data
- *
- * Request can be one of USB_DEVREQ_CLEAR_FEATURE, USB_DEVREQ_SET_FEATURE or
- * USB_DEVREQ_SET_ADDRESS.
- * @param instance root hub instance
- * @param request structure containing both request and response information
- * @return error code
- */
+
 static int process_request_without_data(rh_t *instance,
                 usb_transfer_batch_t *request){
@@ -667 +513 @@
 }
 
+
 /**
- * process hub control request
  *
- * If needed, writes answer into the request structure.
- * Request can be one of
- * USB_DEVREQ_GET_STATUS,
- * USB_DEVREQ_GET_DESCRIPTOR,
- * USB_DEVREQ_GET_CONFIGURATION,
- * USB_DEVREQ_CLEAR_FEATURE,
- * USB_DEVREQ_SET_FEATURE,
- * USB_DEVREQ_SET_ADDRESS,
- * USB_DEVREQ_SET_DESCRIPTOR or
- * USB_DEVREQ_SET_CONFIGURATION.
- *
- * @param instance root hub instance
- * @param request structure containing both request and response information
- * @return error code
- */
-static int process_ctrl_request(rh_t *instance, usb_transfer_batch_t *request){
-        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
-                ){
-                        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 = 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
+ * @param instance
+ * @param request
+ * @return
  */
 int rh_request(rh_t *instance, usb_transfer_batch_t *request)
@@ -741 +526 @@
         int opResult;
         if(request->transfer_type == USB_TRANSFER_CONTROL){
-                usb_log_info("Root hub got CONTROL packet\n");
-                opResult = process_ctrl_request(instance,request);
+                if (request->setup_buffer) {
+                        usb_log_info("Root hub got CTRL packet: %s.\n",
+                                usb_debug_str_buffer((const uint8_t *)request->setup_buffer, 8, 8));
+                        if(sizeof(usb_device_request_setup_packet_t)>request->setup_size){
+                                usb_log_error("setup packet too small\n");
+                                return EINVAL;
+                        }
+                        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
+                        ){
+                                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 = ENOTSUP;
+                        }
+                }else{
+                        usb_log_error("root hub received empty transaction?");
+                        opResult = EINVAL;
+                }
         }else if(request->transfer_type == USB_TRANSFER_INTERRUPT){
                 usb_log_info("Root hub got INTERRUPT packet\n");
@@ -761 +582 @@
 void rh_interrupt(rh_t *instance)
 {
-        usb_log_info("Whoa whoa wait, I`m not supposed to receive interrupts, am I?\n");
-        /* TODO: implement? */
+        usb_log_error("Root hub interrupt not implemented.\n");
+        /* TODO: implement */
 }
 /**

uspace/drv/usbhub/usbhub.c

@@ -53 +53 @@
 #include "usb/classes/classes.h"
 
-static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port,
-                usb_speed_t speed);
-
-static int usb_hub_attach_non_removable_devices(usb_hub_info_t * hub,
-usb_hub_descriptor_t * descriptor);
-
 int usb_hub_control_loop(void * hub_info_param){
         usb_hub_info_t * hub_info = (usb_hub_info_t*)hub_info_param;
@@ -97 +91 @@
 
 /**
- * Load hub-specific information into hub_info structure and process if needed
+ * Load hub-specific information into hub_info structure.
  *
  * Particularly read port count and initialize structure holding port
- * information. If there are non-removable devices, start initializing them.
+ * information.
  * This function is hub-specific and should be run only after the hub is
  * configured using usb_hub_set_configuration function.
@@ -106 +100 @@
  * @return error code
  */
-static int usb_hub_process_hub_specific_info(usb_hub_info_t * hub_info){
+static int usb_hub_get_hub_specific_info(usb_hub_info_t * hub_info){
         // get hub descriptor
         usb_log_debug("creating serialized descriptor\n");
@@ -113 +107 @@
 
         /* this was one fix of some bug, should not be needed anymore
-         * these lines allow to reset hub once more, it can be used as
-         * brute-force initialization for non-removable devices
         int opResult = usb_request_set_configuration(&result->endpoints.control, 1);
         if(opResult!=EOK){
@@ -149 +141 @@
                 hub_info->attached_devs[i].address=0;
         }
-        usb_hub_attach_non_removable_devices(hub_info, descriptor);
         usb_log_debug2("freeing data\n");
         free(serialized_descriptor);
@@ -227 +218 @@
         }
         //get port count and create attached_devs
-        opResult = usb_hub_process_hub_specific_info(hub_info);
+        opResult = usb_hub_get_hub_specific_info(hub_info);
         if(opResult!=EOK){
                 usb_log_error("could not set hub configuration, errno %d\n",opResult);
@@ -265 +256 @@
 //*********************************************
 //
-//  hub driver code, main loop and port handling
+//  hub driver code, main loop
 //
 //*********************************************
-
-/**
- * Perform \a usb_hub_init_add_device on all ports with non-removable device
- *
- * This will trigger operations leading to activated non-removable device.
- * Control pipe of the hub must be open fo communication.
- * @param hub hub instance
- * @param descriptor usb hub descriptor
- * @return error code
- */
-static int usb_hub_attach_non_removable_devices(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;
-        int opResult;
-        size_t rcvd_size;
-        usb_port_status_t status;
-        uint8_t * non_removable_dev_bitmap = descriptor->devices_removable;
-        //initialize all connected, non-removable devices
-        int 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);
-                        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
-                                        );
-                        if (opResult != EOK) {
-                                usb_log_error("could not get port status of port %d errno:%d\n",
-                                                port, opResult);
-                                return opResult;
-                        }
-                        //this should be true..
-                        if(usb_port_dev_connected(&status)){
-                                usb_hub_init_add_device(hub,port,usb_port_speed(&status));
-                        }
-                }
-        }
-        return EOK;
-}
-
 
 /**