Changes in uspace/drv/usbhub/ports.c [2ad98fd:69df9373] in mainline

File:

• uspace/drv/usbhub/ports.c (modified) (7 diffs)

uspace/drv/usbhub/ports.c

@@ -33 +33 @@
  * Hub ports functions.
  */
-
-#include <bool.h>
+#include "port_status.h"
+#include <inttypes.h>
 #include <errno.h>
 #include <str_error.h>
-#include <inttypes.h>
-#include <fibril_synch.h>
-
+#include <usb/request.h>
 #include <usb/debug.h>
 
-#include "ports.h"
-#include "usbhub.h"
-#include "usbhub_private.h"
-#include "port_status.h"
-
+/** Retrieve port status.
+ *
+ * @param[in] ctrl_pipe Control pipe to use.
+ * @param[in] port Port number (starting at 1).
+ * @param[out] status Where to store the port status.
+ * @return Error code.
+ */
+static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port,
+    usb_port_status_t *status)
+{
+        size_t recv_size;
+        usb_device_request_setup_packet_t request;
+        usb_port_status_t status_tmp;
+
+        usb_hub_set_port_status_request(&request, port);
+        int rc = usb_pipe_control_read(ctrl_pipe,
+            &request, sizeof(usb_device_request_setup_packet_t),
+            &status_tmp, sizeof(status_tmp), &recv_size);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (recv_size != sizeof (status_tmp)) {
+                return ELIMIT;
+        }
+
+        if (status != NULL) {
+                *status = status_tmp;
+        }
+
+        return EOK;
+}
 
 /** Information for fibril for device discovery. */
@@ -55 +80 @@
 };
 
-static void usb_hub_removed_device(
-        usb_hub_info_t * hub, uint16_t port);
-
-static void usb_hub_port_reset_completed(usb_hub_info_t * hub,
-        uint16_t port, uint32_t status);
-
-static void usb_hub_port_over_current(usb_hub_info_t * hub,
-        uint16_t port, uint32_t status);
-
-static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port,
-    usb_port_status_t *status);
-
-static int enable_port_callback(int port_no, void *arg);
-
-static int add_device_phase1_worker_fibril(void *arg);
-
-static int create_add_device_fibril(usb_hub_info_t *hub, size_t port,
-    usb_speed_t speed);
-
-/**
- * Process interrupts on given hub port
- *
- * Accepts connection, over current and port reset change.
- * @param hub hub representation
- * @param port port number, starting from 1
- */
-void usb_hub_process_interrupt(usb_hub_info_t * hub,
-        uint16_t port) {
-        usb_log_debug("interrupt at port %d\n", port);
-        //determine type of change
-        //usb_pipe_t *pipe = hub->control_pipe;
-
-        int opResult;
-
-        usb_port_status_t status;
-        opResult = get_port_status(&hub->usb_device->ctrl_pipe, port, &status);
-        if (opResult != EOK) {
-                usb_log_error("Failed to get port %zu status: %s.\n",
-                    port, str_error(opResult));
-                return;
-        }
-        //connection change
-        if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_CONNECTION)) {
-                bool device_connected = usb_port_is_status(status,
-                    USB_HUB_FEATURE_PORT_CONNECTION);
-                usb_log_debug("Connection change on port %zu: %s.\n", port,
-                    device_connected ? "device attached" : "device removed");
-
-                if (device_connected) {
-                        opResult = create_add_device_fibril(hub, port,
-                            usb_port_speed(status));
-                        if (opResult != EOK) {
-                                usb_log_error(
-                                    "Cannot handle change on port %zu: %s.\n",
-                                    str_error(opResult));
-                        }
-                } else {
-                        usb_hub_removed_device(hub, port);
-                }
-        }
-        //over current
-        if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT)) {
-                //check if it was not auto-resolved
-                usb_log_debug("overcurrent change on port\n");
-                usb_hub_port_over_current(hub, port, status);
-        }
-        //port reset
-        if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_RESET)) {
-                usb_hub_port_reset_completed(hub, port, status);
-        }
-        usb_log_debug("status x%x : %d\n ", status, status);
-
-        usb_port_status_set_bit(
-            &status, USB_HUB_FEATURE_C_PORT_CONNECTION,false);
-        usb_port_status_set_bit(
-            &status, USB_HUB_FEATURE_PORT_RESET,false);
-        usb_port_status_set_bit(
-            &status, USB_HUB_FEATURE_C_PORT_RESET,false);
-        usb_port_status_set_bit(
-            &status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT,false);
-        /// \TODO what about port power change?
-        if (status >> 16) {
-                usb_log_info("there was unsupported change on port %d: %X\n",
-                        port, status);
-
-        }
-}
-
-
-/**
- * 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(
-        usb_hub_info_t * hub, uint16_t port) {
-
-        int opResult = usb_hub_clear_port_feature(hub->control_pipe,
-                port, USB_HUB_FEATURE_C_PORT_CONNECTION);
-        if (opResult != EOK) {
-                usb_log_warning("could not clear port-change-connection flag\n");
-        }
-        /** \TODO remove device from device manager - not yet implemented in
-         * devide manager
-         */
-
-        //close address
-        //if (hub->attached_devs[port].address != 0) {
-        if(hub->ports[port].attached_device.address >= 0){
-                /*uncomment this code to use it when DDF allows device removal
-                opResult = usb_hc_unregister_device(
-                        &hub->connection,
-                        hub->attached_devs[port].address);
-                if(opResult != EOK) {
-                        dprintf(USB_LOG_LEVEL_WARNING, "could not release "
-                                "address of "
-                            "removed device: %d", opResult);
-                }
-                hub->attached_devs[port].address = 0;
-                hub->attached_devs[port].handle = 0;
-                 */
-        } else {
-                usb_log_warning("this is strange, disconnected device had "
-                        "no address\n");
-                //device was disconnected before it`s port was reset -
-                //return default address
-                usb_hub_release_default_address(hub);
-        }
-}
-
-
-/**
- * Process port reset change
- *
- * After this change port should be enabled, unless some problem occured.
- * This functions triggers second phase of enabling new device.
- * @param hub
- * @param port
- * @param status
- */
-static void usb_hub_port_reset_completed(usb_hub_info_t * hub,
-        uint16_t port, uint32_t status){
-        usb_log_debug("Port %zu reset complete.\n", port);
-        if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_ENABLE)) {
-                /* Finalize device adding. */
-                usb_hub_port_t *the_port = hub->ports + port;
-                fibril_mutex_lock(&the_port->reset_mutex);
-                the_port->reset_completed = true;
-                fibril_condvar_broadcast(&the_port->reset_cv);
-                fibril_mutex_unlock(&the_port->reset_mutex);
-        } else {
-                usb_log_warning(
-                    "Port %zu reset complete but port not enabled.\n",
-                    port);
-        }
-}
-
-/**
- * Process over current condition on port.
- *
- * Turn off the power on the port.
- *
- * @param hub hub representation
- * @param port port number, starting from 1
- */
-static void usb_hub_port_over_current(usb_hub_info_t * hub,
-        uint16_t port, uint32_t status) {
-        int opResult;
-        if(usb_port_is_status(status, USB_HUB_FEATURE_PORT_OVER_CURRENT)){
-                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);
-                }
-        }
-}
-
-/** Retrieve port status.
- *
- * @param[in] ctrl_pipe Control pipe to use.
- * @param[in] port Port number (starting at 1).
- * @param[out] status Where to store the port status.
- * @return Error code.
- */
-static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port,
-    usb_port_status_t *status)
-{
-        size_t recv_size;
-        usb_device_request_setup_packet_t request;
-        usb_port_status_t status_tmp;
-
-        usb_hub_set_port_status_request(&request, port);
-        int rc = usb_pipe_control_read(ctrl_pipe,
-            &request, sizeof(usb_device_request_setup_packet_t),
-            &status_tmp, sizeof(status_tmp), &recv_size);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        if (recv_size != sizeof (status_tmp)) {
-                return ELIMIT;
-        }
-
-        if (status != NULL) {
-                *status = status_tmp;
-        }
-
-        return EOK;
-}
-
 /** Callback for enabling a specific port.
  *
@@ -288 +91 @@
 static int enable_port_callback(int port_no, void *arg)
 {
-        usb_hub_info_t *hub = arg;
+        usb_hub_info_t *hub = (usb_hub_info_t *) arg;
         int rc;
         usb_device_request_setup_packet_t request;
@@ -353 +156 @@
         data->hub->ports[data->port].attached_device.address = new_address;
 
-        usb_log_info("Detected new device on `%s' (port %zu), "
+        usb_log_info("Detected new device on `%s' (port %zu), " \
             "address %d (handle %" PRIun ").\n",
             data->hub->usb_device->ddf_dev->name, data->port,
@@ -363 +166 @@
         return EOK;
 }
-
 
 /** Start device adding when connection change is detected.
@@ -374 +176 @@
  * @return Error code.
  */
-static int create_add_device_fibril(usb_hub_info_t *hub, size_t port,
+static int add_device_phase1_new_fibril(usb_hub_info_t *hub, size_t port,
     usb_speed_t speed)
 {
@@ -411 +213 @@
 }
 
+/** Process change on a single port.
+ *
+ * @param hub Hub to which the port belongs.
+ * @param port Port index (starting at 1).
+ */
+static void process_port_change(usb_hub_info_t *hub, size_t port)
+{
+        int rc;
+
+        usb_port_status_t port_status;
+
+        rc = get_port_status(&hub->usb_device->ctrl_pipe, port, &port_status);
+        if (rc != EOK) {
+                usb_log_error("Failed to get port %zu status: %s.\n",
+                    port, str_error(rc));
+                return;
+        }
+
+        /*
+         * Check exact nature of the change.
+         */
+        usb_log_debug("Port %zu change status: %x.\n", port,
+            (unsigned int) port_status);
+
+        if (usb_port_connect_change(&port_status)) {
+                bool device_connected = usb_port_dev_connected(&port_status);
+                usb_log_debug("Connection change on port %zu: %s.\n", port,
+                    device_connected ? "device attached" : "device removed");
+
+                if (device_connected) {
+                        rc = add_device_phase1_new_fibril(hub, port,
+                            usb_port_speed(&port_status));
+                        if (rc != EOK) {
+                                usb_log_error(
+                                    "Cannot handle change on port %zu: %s.\n",
+                                    str_error(rc));
+                        }
+                } else {
+                        usb_hub_removed_device(hub, port);
+                }
+        }
+
+        if (usb_port_overcurrent_change(&port_status)) {
+                if (usb_port_over_current(&port_status)) {
+                        usb_log_warning("Overcurrent on port %zu.\n", port);
+                        usb_hub_over_current(hub, port);
+                } else {
+                        usb_log_debug("Overcurrent on port %zu autoresolved.\n",
+                            port);
+                }
+        }
+
+        if (usb_port_reset_completed(&port_status)) {
+                usb_log_debug("Port %zu reset complete.\n", port);
+                if (usb_port_enabled(&port_status)) {
+                        /* Finalize device adding. */
+                        usb_hub_port_t *the_port = hub->ports + port;
+                        fibril_mutex_lock(&the_port->reset_mutex);
+                        the_port->reset_completed = true;
+                        fibril_condvar_broadcast(&the_port->reset_cv);
+                        fibril_mutex_unlock(&the_port->reset_mutex);
+                } else {
+                        usb_log_warning(
+                            "Port %zu reset complete but port not enabled.\n",
+                            port);
+                }
+        }
+
+        usb_port_set_connect_change(&port_status, false);
+        usb_port_set_reset(&port_status, false);
+        usb_port_set_reset_completed(&port_status, false);
+        usb_port_set_dev_connected(&port_status, false);
+        if (port_status >> 16) {
+                usb_log_warning("Unsupported change on port %zu: %x.\n",
+                    port, (unsigned int) port_status);
+        }
+}
+
+
+/** Callback for polling hub for port changes.
+ *
+ * @param dev Device where the change occured.
+ * @param change_bitmap Bitmap of changed ports.
+ * @param change_bitmap_size Size of the bitmap in bytes.
+ * @param arg Custom argument, points to @c usb_hub_info_t.
+ * @return Whether to continue polling.
+ */
+bool hub_port_changes_callback(usb_device_t *dev,
+    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg)
+{
+        usb_hub_info_t *hub = (usb_hub_info_t *) arg;
+
+        /* FIXME: check that we received enough bytes. */
+        if (change_bitmap_size == 0) {
+                goto leave;
+        }
+
+        size_t port;
+        for (port = 1; port < hub->port_count + 1; port++) {
+                bool change = (change_bitmap[port / 8] >> (port % 8)) % 2;
+                if (change) {
+                        process_port_change(hub, port);
+                }
+        }
+
+
+leave:
+        /* FIXME: proper interval. */
+        async_usleep(1000 * 1000 * 10 );
+
+        return true;
+}
+
+
 /**
  * @}