Changeset cbdb6457 in mainline for uspace/drv/usbhub

Timestamp:

2011-04-15T13:51:46Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

11d2e96a, ab6fdad3

Parents:

8fd4ba0 (diff), be11749 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

interrupts for ohci root hub
hub powering corrected a bit

Location:

uspace/drv/usbhub

Files:

• usbhub.c (modified) (7 diffs)
• usbhub_private.h (modified) (2 diffs)
• utils.c (modified) (3 diffs)

uspace/drv/usbhub/usbhub.c

@@ -105 +105 @@
         }
 
-        usb_pipe_start_session(hub_info->control_pipe);
+        //usb_pipe_start_session(hub_info->control_pipe);
         //set hub configuration
         opResult = usb_hub_set_configuration(hub_info);
@@ -122 +122 @@
                 return opResult;
         }
-        usb_pipe_end_session(hub_info->control_pipe);
-
-        /// \TODO what is this?
-        usb_log_debug("Creating `hub' function.\n");
+        //usb_pipe_end_session(hub_info->control_pipe);
+
+
+        usb_log_debug("Creating 'hub' function in DDF.\n");
         ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
             fun_exposed, "hub");
@@ -153 +153 @@
 bool hub_port_changes_callback(usb_device_t *dev,
     uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) {
+        usb_log_debug("hub_port_changes_callback\n");
         usb_hub_info_t *hub = (usb_hub_info_t *) arg;
 
@@ -217 +218 @@
         // get hub descriptor
         usb_log_debug("creating serialized descriptor\n");
-        void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
+        //void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
+        uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE];
         usb_hub_descriptor_t * descriptor;
         int opResult;
@@ -235 +237 @@
         }
         usb_log_debug2("deserializing descriptor\n");
-        descriptor = usb_deserialize_hub_desriptor(serialized_descriptor);
+        descriptor = usb_create_deserialized_hub_desriptor(
+            serialized_descriptor);
         if (descriptor == NULL) {
                 usb_log_warning("could not deserialize descriptor \n");
-                return opResult;
+                return ENOMEM;
         }
         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
+        bool is_power_switched =
+            ((descriptor->hub_characteristics & 1) ==0);
+        bool has_individual_port_powering =
+            ((descriptor->hub_characteristics & 1) !=0);
         hub_info->ports = malloc(
             sizeof (usb_hub_port_t) * (hub_info->port_count + 1));
@@ -249 +256 @@
                 usb_hub_port_init(&hub_info->ports[port]);
         }
-        for (port = 0; port < hub_info->port_count; port++) {
-                opResult = usb_hub_set_port_feature(hub_info->control_pipe,
-                    port+1, USB_HUB_FEATURE_PORT_POWER);
-                if (opResult != EOK) {
-                        usb_log_error("cannot power on port %d;  %d\n",
-                            port+1, opResult);
-                }
+        if(is_power_switched){
+                usb_log_debug("is_power_switched\n");
+                if(has_individual_port_powering){
+                        usb_log_debug("has_individual_port_powering\n");
+                        for (port = 0; port < hub_info->port_count; port++) {
+                                opResult = usb_hub_set_port_feature(hub_info->control_pipe,
+                                    port+1, USB_HUB_FEATURE_PORT_POWER);
+                                if (opResult != EOK) {
+                                        usb_log_error("cannot power on port %d;  %d\n",
+                                            port+1, opResult);
+                                }
+                        }
+                }else{
+                        usb_log_debug("!has_individual_port_powering\n");
+                        opResult = usb_hub_set_feature(hub_info->control_pipe,
+                            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+                        if (opResult != EOK) {
+                                usb_log_error("cannot power hub;  %d\n",
+                                  opResult);
+                        }
+                }
+        }else{
+                usb_log_debug("!is_power_switched\n");
         }
         usb_log_debug2("freeing data\n");
-        free(serialized_descriptor);
-        free(descriptor->devices_removable);
+        //free(serialized_descriptor);
+        //free(descriptor->devices_removable);
         free(descriptor);
         return EOK;
@@ -321 +344 @@
          * auto destruction, this could work better.
          */
-        int rc = usb_pipe_start_session(hub_info->control_pipe);
+        int rc = usb_hc_connection_open(&hub_info->connection);
         if (rc != EOK) {
-                usb_log_error("Failed to start session on control pipe: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-        rc = usb_hc_connection_open(&hub_info->connection);
-        if (rc != EOK) {
-                usb_pipe_end_session(hub_info->control_pipe);
+                //usb_pipe_end_session(hub_info->control_pipe);
                 usb_log_error("Failed to open connection to HC: %s.\n",
                     str_error(rc));

uspace/drv/usbhub/usbhub_private.h

@@ -113 +113 @@
 
         usb_device_request_setup_packet_t clear_request = {
-                .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE,
+                .request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE,
                 .request = USB_DEVREQ_SET_FEATURE,
                 .length = 0,
@@ -166 +166 @@
 }
 
-/**
- * create uint8_t array with serialized descriptor
- *
- * @param descriptor
- * @return newly created serializd descriptor pointer
- */
-void * usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor);
 
-/**
- * create deserialized desriptor structure out of serialized descriptor
- *
- * The serialized descriptor must be proper usb hub descriptor,
- * otherwise an eerror might occur.
- *
- * @param sdescriptor serialized descriptor
- * @return newly created deserialized descriptor pointer
- */
-usb_hub_descriptor_t * usb_deserialize_hub_desriptor(void * sdescriptor);
+void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t * descriptor);
+
+void usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor,
+    void * serialized_descriptor);
+
+usb_hub_descriptor_t * usb_create_deserialized_hub_desriptor(
+    void * serialized_descriptor);
+
+void usb_deserialize_hub_desriptor(void * serialized_descriptor,
+    usb_hub_descriptor_t * descriptor);
 
 

uspace/drv/usbhub/utils.c

@@ -56 +56 @@
 //hub descriptor utils
 
-void * usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor) {
+/**
+ * create uint8_t array with serialized descriptor
+ *
+ * @param descriptor
+ * @return newly created serializd descriptor pointer
+ */
+void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t * descriptor) {
         //base size
         size_t size = 7;
@@ -64 +70 @@
         uint8_t * result = malloc(size);
         //size
-        result[0] = size;
+        if(result)
+                usb_serialize_hub_descriptor(descriptor,result);
+        return result;
+}
+
+/**
+ * serialize descriptor into given buffer
+ *
+ * The buffer size is not checked.
+ * @param descriptor
+ * @param serialized_descriptor
+ */
+void usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor,
+    void * serialized_descriptor) {
+        //base size
+        uint8_t * sdescriptor = serialized_descriptor;
+        size_t size = 7;
+        //variable size according to port count
+        size_t var_size = (descriptor->ports_count+7)/8;
+        size += 2 * var_size;
+        //size
+        sdescriptor[0] = size;
         //descriptor type
-        result[1] = USB_DESCTYPE_HUB;
-        result[2] = descriptor->ports_count;
+        sdescriptor[1] = USB_DESCTYPE_HUB;
+        sdescriptor[2] = descriptor->ports_count;
         /// @fixme handling of endianness??
-        result[3] = descriptor->hub_characteristics / 256;
-        result[4] = descriptor->hub_characteristics % 256;
-        result[5] = descriptor->pwr_on_2_good_time;
-        result[6] = descriptor->current_requirement;
+        sdescriptor[3] = descriptor->hub_characteristics / 256;
+        sdescriptor[4] = descriptor->hub_characteristics % 256;
+        sdescriptor[5] = descriptor->pwr_on_2_good_time;
+        sdescriptor[6] = descriptor->current_requirement;
 
         size_t i;
         for (i = 0; i < var_size; ++i) {
-                result[7 + i] = descriptor->devices_removable[i];
+                sdescriptor[7 + i] = descriptor->devices_removable[i];
         }
         for (i = 0; i < var_size; ++i) {
-                result[7 + var_size + i] = 255;
+                sdescriptor[7 + var_size + i] = 255;
         }
-        return result;
 }
 
-usb_hub_descriptor_t * usb_deserialize_hub_desriptor(
+
+/**
+ * create deserialized desriptor structure out of serialized descriptor
+ *
+ * The serialized descriptor must be proper usb hub descriptor,
+ * otherwise an eerror might occur.
+ *
+ * @param sdescriptor serialized descriptor
+ * @return newly created deserialized descriptor pointer
+ */
+usb_hub_descriptor_t * usb_create_deserialized_hub_desriptor(
 void * serialized_descriptor) {
         uint8_t * sdescriptor = serialized_descriptor;
@@ -95 +131 @@
 
         usb_hub_descriptor_t * result = malloc(sizeof(usb_hub_descriptor_t));
-        
+        if(result)
+                usb_deserialize_hub_desriptor(serialized_descriptor,result);
+        return result;
+}
 
-        result->ports_count = sdescriptor[2];
+/**
+ * deserialize descriptor into given pointer
+ * 
+ * @param serialized_descriptor
+ * @param descriptor
+ * @return
+ */
+void usb_deserialize_hub_desriptor(
+void * serialized_descriptor, usb_hub_descriptor_t * descriptor) {
+        uint8_t * sdescriptor = serialized_descriptor;
+        descriptor->ports_count = sdescriptor[2];
         /// @fixme handling of endianness??
-        result->hub_characteristics = sdescriptor[4] + 256 * sdescriptor[3];
-        result->pwr_on_2_good_time = sdescriptor[5];
-        result->current_requirement = sdescriptor[6];
-        size_t var_size = (result->ports_count+7) / 8;
-        result->devices_removable = (uint8_t*) malloc(var_size);
+        descriptor->hub_characteristics = sdescriptor[4] + 256 * sdescriptor[3];
+        descriptor->pwr_on_2_good_time = sdescriptor[5];
+        descriptor->current_requirement = sdescriptor[6];
+        size_t var_size = (descriptor->ports_count+7) / 8;
+        //descriptor->devices_removable = (uint8_t*) malloc(var_size);
 
         size_t i;
         for (i = 0; i < var_size; ++i) {
-                result->devices_removable[i] = sdescriptor[7 + i];
+                descriptor->devices_removable[i] = sdescriptor[7 + i];
         }
-        return result;
 }
-
-
 
 /**