Changeset 040ab02 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-04-05T19:45:52Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

90d0522

Parents:

3bb6b35

Message:

usb hub global over-current and power changes

File:

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

uspace/drv/usbhub/usbhub.c

@@ -84 +84 @@
 }
 
+/// \TODO set_port_feature use
 
 //*********************************************
@@ -123 +124 @@
         void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
         usb_hub_descriptor_t * descriptor;
+        int opResult;
 
         /* 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(hub_info->control_pipe,
+         *
+        opResult = usb_request_set_configuration(hub_info->control_pipe,
                 1);
         if (opResult != EOK) {
@@ -134 +136 @@
                         opResult);
                 return opResult;
-        }
+        }*/
 
 
@@ -662 +664 @@
  * @param port port number, starting from 1
  */
-static void usb_hub_over_current(usb_hub_info_t * hub,
-        uint16_t port) {
+static void usb_hub_port_over_current(usb_hub_info_t * hub,
+        uint16_t port, uint32_t status) {
+        /// \todo no, this is not proper sollution
+        /// get affected ports
+        /// power them off
+        /// wait until there over-current is cleared
+        /// power them on
+
         int opResult;
-        opResult = usb_hub_clear_port_feature(hub->control_pipe,
-                port, USB_HUB_FEATURE_PORT_POWER);
-        if (opResult != EOK) {
-                usb_log_error("cannot power off port %d;  %d\n",
-                        port, opResult);
+        if(usb_port_over_current(&status)){
+                opResult = usb_hub_clear_port_feature(hub->control_pipe,
+                        port, USB_HUB_FEATURE_PORT_POWER);
+                if (opResult != EOK) {
+                        usb_log_error("cannot power off port %d;  %d\n",
+                                port, opResult);
+                }
+        }else{
+                opResult = usb_hub_set_port_feature(hub->control_pipe,
+                        port, USB_HUB_FEATURE_PORT_POWER);
+                if (opResult != EOK) {
+                        usb_log_error("cannot power on port %d;  %d\n",
+                                port, opResult);
+                }
         }
 }
@@ -723 +740 @@
                 //check if it was not auto-resolved
                 usb_log_debug("overcurrent change on port\n");
-                if (usb_port_over_current(&status)) {
-                        usb_hub_over_current(hub, port);
-                } else {
-                        usb_log_debug("over current condition was "
-                                "auto-resolved on port %d\n",
-                                port);
-                }
+                usb_hub_port_over_current(hub, port, status);
         }
         //port reset
@@ -752 +763 @@
                         port, status);
 
+        }
+}
+
+static int usb_process_hub_over_current(usb_hub_info_t * hub_info,
+        usb_hub_status_t status)
+{
+        int opResult;
+        if(usb_hub_over_current(&status)){
+                opResult = usb_hub_clear_feature(hub_info->control_pipe,
+                        USB_HUB_FEATURE_PORT_POWER);
+                if (opResult != EOK) {
+                        usb_log_error("cannot power off hub: %d\n",
+                                opResult);
+                }
+        }else{
+                opResult = usb_hub_set_feature(hub_info->control_pipe,
+                        USB_HUB_FEATURE_PORT_POWER);
+                if (opResult != EOK) {
+                        usb_log_error("cannot power on hub: %d\n",
+                                opResult);
+                }
+        }
+        return opResult;
+}
+
+static int usb_process_hub_power_change(usb_hub_info_t * hub_info,
+        usb_hub_status_t status)
+{
+        int opResult;
+        if(usb_hub_local_power_lost(&status)){
+                //restart power on hub
+                opResult = usb_hub_set_feature(hub_info->control_pipe,
+                        USB_HUB_FEATURE_PORT_POWER);
+                if (opResult != EOK) {
+                        usb_log_error("cannot power on hub: %d\n",
+                                opResult);
+                }
+        }else{//power reestablished on hub- restart ports
+                int 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);
+                        if (opResult != EOK) {
+                                usb_log_error("cannot power on port %d;  %d\n",
+                                        port, opResult);
+                        }
+                }
+        }
+        return opResult;
+}
+
+
+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;
+        int opResult;
+
+        usb_port_status_t status;
+        size_t rcvd_size;
+        usb_device_request_setup_packet_t request;
+        //int opResult;
+        usb_hub_set_hub_status_request(&request);
+        //endpoint 0
+
+        opResult = usb_pipe_control_read(
+                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");
+                return;
+        }
+        if (rcvd_size != sizeof (usb_port_status_t)) {
+                usb_log_error("received status has incorrect size\n");
+                return;
+        }
+        //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);
         }
 }
@@ -866 +961 @@
 
         ///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) {
-                bool interrupt =
-                        (((uint8_t*) change_bitmap)[port / 8] >> (port % 8)) % 2;
+                interrupt =
+                        ((uint8_t*) change_bitmap)[port / 8] & (1<<(port % 8));
                 if (interrupt) {
                         usb_hub_process_interrupt(
@@ -874 +974 @@
                 }
         }
+        /// \todo check hub status
         usb_hc_connection_close(&hub_info->connection);
         usb_pipe_end_session(hub_info->control_pipe);