Changes in uspace/drv/ohci/root_hub.c [f3da9b2:0368669c] in mainline

File:

• uspace/drv/ohci/root_hub.c (modified) (7 diffs)

uspace/drv/ohci/root_hub.c

@@ -43 +43 @@
 #include <usb/classes/hub.h>
 
+/**
+ *      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 = 0,
+};
+
+/**
+ * standart configuration descriptor with filled common values
+ * for ohci root hubs
+ */
+static const usb_standard_configuration_descriptor_t ohci_rh_conf_descriptor =
+{
+        /// \TODO some values are default or guessed
+        .attributes = 1<<7,
+        .configuration_number = 1,
+        .descriptor_type = USB_DESCTYPE_CONFIGURATION,
+        .interface_count = 1,
+        .length = sizeof(usb_standard_configuration_descriptor_t),
+        .max_power = 100,
+        .str_configuration = 0,
+};
+
+/**
+ * standart ohci root hub interface descriptor
+ */
+static const usb_standard_interface_descriptor_t ohci_rh_iface_descriptor =
+{
+        .alternate_setting = 0,
+        .descriptor_type = USB_DESCTYPE_INTERFACE,
+        .endpoint_count = 1,
+        .interface_class = USB_CLASS_HUB,
+        /// \TODO is this correct?
+        .interface_number = 1,
+        .interface_protocol = 0,
+        .interface_subclass = 0,
+        .length = sizeof(usb_standard_interface_descriptor_t),
+        .str_interface = 0,
+};
+
+/**
+ * standart ohci root hub endpoint 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),
+        .max_packet_size = 8,
+        .poll_interval = 255,
+};
 
 /** Root hub initialization
@@ -220 +286 @@
 
 /**
- * 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
@@ -254 +293 @@
 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;
+        memcpy(descriptor, &ohci_rh_conf_descriptor,
+                sizeof(usb_standard_configuration_descriptor_t));
         /// \TODO should this include device descriptor?
-        size_t hub_descriptor_size = 7 +
+        const size_t hub_descriptor_size = 7 +
                         2* (instance->port_count / 8 +
                         ((instance->port_count % 8 > 0) ? 1 : 0));
@@ -277 +309 @@
 
 /**
- * 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
  *
@@ -330 +322 @@
                         (usb_device_request_setup_packet_t*)request->setup_buffer;
         size_t size;
-        void * result_descriptor;
-        uint16_t setup_request_value = setup_request->value_high;
+        const void * result_descriptor = NULL;
+        const uint16_t setup_request_value = setup_request->value_high;
                         //(setup_request->value_low << 8);
-        if(setup_request_value == USB_DESCTYPE_HUB){
-                usb_log_debug("USB_DESCTYPE_HUB\n");
-                //create hub descriptor
-                uint8_t * descriptor;
-                usb_create_serialized_hub_descriptor(instance, 
-                                &descriptor, &size);
-                result_descriptor = descriptor;
-        }else if(setup_request_value == USB_DESCTYPE_DEVICE){
-                //create std device descriptor
-                usb_log_debug("USB_DESCTYPE_DEVICE\n");
-                result_descriptor =
-                                usb_ohci_rh_create_standard_device_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);
-                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();
-                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();
-                size = sizeof(usb_standard_endpoint_descriptor_t);
-        }else{
-                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;
+        bool del = false;
+        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;
+                        break;
+                }
+                case USB_DESCTYPE_DEVICE: {
+                        usb_log_debug("USB_DESCTYPE_DEVICE\n");
+                        result_descriptor = &ohci_rh_device_descriptor;
+                        size = sizeof(ohci_rh_device_descriptor);
+                        break;
+                }
+                case USB_DESCTYPE_CONFIGURATION: {
+                        usb_log_debug("USB_DESCTYPE_CONFIGURATION\n");
+                        usb_standard_configuration_descriptor_t * descriptor =
+                                        usb_ohci_rh_create_standart_configuration_descriptor(
+                                                instance);
+                        result_descriptor = descriptor;
+                        size = sizeof(usb_standard_configuration_descriptor_t);
+                        del = true;
+                        break;
+                }
+                case USB_DESCTYPE_INTERFACE: {
+                        usb_log_debug("USB_DESCTYPE_INTERFACE\n");
+                        result_descriptor = &ohci_rh_iface_descriptor;
+                        size = sizeof(ohci_rh_iface_descriptor);
+                        break;
+                }
+                case USB_DESCTYPE_ENDPOINT: {
+                        usb_log_debug("USB_DESCTYPE_ENDPOINT\n");
+                        result_descriptor = &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
+                                        );
+                        return EINVAL;
+                }
         }
         if(request->buffer_size < size){
@@ -378 +381 @@
         request->transfered_size = size;
         memcpy(request->buffer,result_descriptor,size);
-        free(result_descriptor);
+        if (del)
+                free(result_descriptor);
         return EOK;
 }
@@ -644 +648 @@
 void rh_interrupt(rh_t *instance)
 {
-        usb_log_info("Whoa whoa wait, I`m not supposed to receive interrupts, am I?\n");
+        usb_log_info("Whoa whoa wait, I`m not supposed to receive any interrupts, am I?\n");
         /* TODO: implement? */
 }