Changes in uspace/drv/usbhub/usbhub.c [4d0c40b:df3ad97] in mainline

File:

• uspace/drv/usbhub/usbhub.c (modified) (23 diffs)

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_trigger_connecting_non_removable_devices(
+                usb_hub_info_t * hub, usb_hub_descriptor_t * descriptor);
+
+/**
+ * control loop running in hub`s fibril
+ *
+ * Hub`s fibril periodically asks for changes on hub and if needded calls
+ * change handling routine.
+ * @warning currently hub driver asks for changes once a second
+ * @param hub_info_param hub representation pointer
+ * @return zero
+ */
 int usb_hub_control_loop(void * hub_info_param){
         usb_hub_info_t * hub_info = (usb_hub_info_t*)hub_info_param;
@@ -91 +107 @@
 
 /**
- * Load hub-specific information into hub_info structure.
+ * Load hub-specific information into hub_info structure and process if needed
  *
  * Particularly read port count and initialize structure holding port
- * information.
+ * 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 pointer to structure with usb hub data
+ * @param hub_info hub representation
  * @return error code
  */
-static int usb_hub_get_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");
@@ -107 +123 @@
 
         /* 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){
@@ -132 +150 @@
                 return opResult;
         }
-        usb_log_info("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*)
@@ -141 +159 @@
                 hub_info->attached_devs[i].address=0;
         }
+        //handle non-removable devices
+        usb_hub_trigger_connecting_non_removable_devices(hub_info, descriptor);
         usb_log_debug2("freeing data\n");
         free(serialized_descriptor);
@@ -152 +172 @@
  * 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
- * @return
+ * @param hub_info hub representation
+ * @return error code
  */
 static int usb_hub_set_configuration(usb_hub_info_t * hub_info){
@@ -159 +179 @@
         usb_standard_device_descriptor_t *std_descriptor
             = &hub_info->usb_device->descriptors.device;
-        usb_log_info("hub has %d configurations\n",
+        usb_log_debug("hub has %d configurations\n",
             std_descriptor->configuration_count);
         if(std_descriptor->configuration_count<1){
@@ -218 +238 @@
         }
         //get port count and create attached_devs
-        opResult = usb_hub_get_hub_specific_info(hub_info);
+        opResult = usb_hub_process_hub_specific_info(hub_info);
         if(opResult!=EOK){
                 usb_log_error("could not set hub configuration, errno %d\n",opResult);
@@ -256 +276 @@
 //*********************************************
 //
-//  hub driver code, main loop
+//  hub driver code, main loop and port handling
 //
 //*********************************************
+
+/**
+ * triggers actions to connect non0removable devices
+ *
+ * This will trigger operations leading to activated non-removable device.
+ * Control pipe of the hub must be open fo communication.
+ * @param hub hub representation
+ * @param descriptor usb hub descriptor
+ * @return error code
+ */
+static int usb_hub_trigger_connecting_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;
+        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;
+                        }
+                        //set the status change bit, so it will be noticed in driver loop
+                        if(usb_port_dev_connected(&status)){
+                                usb_hub_set_enable_port_feature_request(&request, port,
+                                                USB_HUB_FEATURE_C_PORT_CONNECTION);
+                                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_warning(
+                                                        "could not set port change on port %d errno:%d\n",
+                                                        port, opResult);
+                                }
+                        }
+                }
+        }
+        return EOK;
+}
+
 
 /**
@@ -280 +356 @@
 /**
  * Reset the port with new device and reserve the default address.
- * @param hc
- * @param port
- * @param target
+ * @param hub hub representation
+ * @param port port number, starting from 1
+ * @param speed transfer speed of attached device, one of low, full or high
  */
 static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port,
@@ -288 +364 @@
         //if this hub already uses default address, it cannot request it once more
         if(hub->is_default_address_used) return;
-        usb_log_info("some connection changed\n");
+        usb_log_debug("some connection changed\n");
         assert(hub->control_pipe->hc_phone);
         int opResult = usb_hub_clear_port_feature(hub->control_pipe,
@@ -315 +391 @@
         if (opResult != EOK) {
                 usb_log_error("something went wrong when reseting a port %d\n",opResult);
-                //usb_hub_release_default_address(hc);
                 usb_hub_release_default_address(hub);
         }
@@ -323 +398 @@
 /**
  * Finalize adding new device after port reset
- * @param hc
- * @param port
- * @param target
+ *
+ * Set device`s address and start it`s driver.
+ * @param hub hub representation
+ * @param port port number, starting from 1
+ * @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,
@@ -331 +408 @@
 
         int opResult;
-        usb_log_info("finalizing add device\n");
+        usb_log_debug("finalizing add device\n");
         opResult = usb_hub_clear_port_feature(hub->control_pipe,
             port, USB_HUB_FEATURE_C_PORT_RESET);
@@ -363 +440 @@
                 return;
         }
-        usb_log_info("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);
@@ -375 +452 @@
         }
 
-
         //opResult = usb_hub_release_default_address(hc);
         opResult = usb_hub_release_default_address(hub);
@@ -403 +479 @@
                 return;
         }
-        usb_log_info("new device address %d, handle %zu\n",
+        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);
-
-}
-
-/**
- * Unregister device address in hc
- * @param hc
- * @param port
- * @param target
+}
+
+/**
+ * routine called when a device on port has been removed
+ *
+ * If the device on port had default address, it releases default address.
+ * Otherwise does not do anything, because DDF does not allow to remove device
+ * from it`s device tree.
+ * @param hub hub representation
+ * @param port port number, starting from 1
  */
 static void usb_hub_removed_device(
@@ -451 +531 @@
  * Turn off the power on the port.
  *
- * @param hub
- * @param port
+ * @param hub hub representation
+ * @param port port number, starting from 1
  */
 static void usb_hub_over_current( usb_hub_info_t * hub,
@@ -467 +547 @@
 /**
  * Process interrupts on given hub port
- * @param hc
- * @param port
- * @param target
+ *
+ * Accepts connection, over current and port reset change.
+ * @param hub hub representation
+ * @param port port number, starting from 1
  */
 static void usb_hub_process_interrupt(usb_hub_info_t * hub, 
@@ -502 +583 @@
         if (usb_port_connect_change(&status)) {
                 if (usb_port_dev_connected(&status)) {
-                        usb_log_info("some connection changed\n");
+                        usb_log_debug("some connection changed\n");
                         usb_hub_init_add_device(hub, port, usb_port_speed(&status));
                 } else {
@@ -514 +595 @@
                         usb_hub_over_current(hub,port);
                 }else{
-                        usb_log_info("over current condition was auto-resolved on port %d\n",
+                        usb_log_debug("over current condition was auto-resolved on port %d\n",
                                         port);
                 }
@@ -520 +601 @@
         //port reset
         if (usb_port_reset_completed(&status)) {
-                usb_log_info("port reset complete\n");
+                usb_log_debug("port reset complete\n");
                 if (usb_port_enabled(&status)) {
                         usb_hub_finalize_add_device(hub, port, usb_port_speed(&status));
@@ -540 +621 @@
 
 /**
- * Check changes on particular hub
- * @param hub_info_param pointer to usb_hub_info_t structure
- * @return error code if there is problem when initializing communication with
- * hub, EOK otherwise
+ * check changes on hub
+ *
+ * Handles changes on each port with a status change.
+ * @param hub_info hub representation
+ * @return error code
  */
 int usb_hub_check_hub_changes(usb_hub_info_t * hub_info){