Changes in uspace/drv/usbhub/ports.c [5c1a65e:192ba25] in mainline

File:

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

uspace/drv/usbhub/ports.c

@@ -47 +47 @@
 #include "port_status.h"
 
+
 /** Information for fibril for device discovery. */
 struct add_device_phase1 {
@@ -64 +65 @@
  * any function here and must be cleared by hand
  */
-static const int non_handled_changes[] = {
+static const int non_handled_changes[] =  {
         USB_HUB_FEATURE_C_PORT_ENABLE,
         USB_HUB_FEATURE_C_PORT_SUSPEND
@@ -70 +71 @@
 
 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);
+        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,
@@ -95 +96 @@
  * @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 %zu\n", (size_t) port);
+void usb_hub_process_interrupt(usb_hub_info_t * hub,
+        uint16_t port) {
+        usb_log_debug("interrupt at port %zu\n", (size_t) port);
         //determine type of change
         //usb_pipe_t *pipe = hub->control_pipe;
@@ -133 +134 @@
         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_log_debug("overcurrent change on port\n");
                 usb_hub_port_over_current(hub, port, status);
         }
@@ -140 +141 @@
                 usb_hub_port_reset_completed(hub, port, status);
         }
-        usb_log_debug("Status x%x : %d\n ", status, status);
+        usb_log_debug("status x%x : %d\n ", status, status);
 
         usb_port_status_set_bit(
-            &status, USB_HUB_FEATURE_C_PORT_CONNECTION, false);
+            &status, USB_HUB_FEATURE_C_PORT_CONNECTION,false);
         usb_port_status_set_bit(
-            &status, USB_HUB_FEATURE_C_PORT_RESET, false);
+            &status, USB_HUB_FEATURE_C_PORT_RESET,false);
         usb_port_status_set_bit(
-            &status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT, false);
-
+            &status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT,false);
+        
         //clearing not yet handled changes      
         unsigned int feature_idx;
-        for (feature_idx = 0;
-            feature_idx < non_handled_changes_count;
-            ++feature_idx) {
+        for(feature_idx = 0;feature_idx<non_handled_changes_count;
+            ++feature_idx){
                 unsigned int bit_idx = non_handled_changes[feature_idx];
-                if (status & (1 << bit_idx)) {
+                if(status & (1<<bit_idx)){
                         usb_log_info(
-                            "There was not yet handled change on port %d: %d"
+                            "there was not yet handled change on port %d: %d"
                             ";clearing it\n",
-                            port, bit_idx);
+                        port, bit_idx);
                         int opResult = usb_hub_clear_port_feature(
                             hub->control_pipe,
@@ -165 +165 @@
                         if (opResult != EOK) {
                                 usb_log_warning(
-                                    "Could not clear port flag %d: %s\n",
-                                    bit_idx, str_error(opResult)
+                                    "could not clear port flag %d: %d\n",
+                                    bit_idx, opResult
                                     );
                         }
                         usb_port_status_set_bit(
-                            &status, bit_idx, false);
+                            &status, bit_idx,false);
                 }
         }
-        if (status >> 16) {
-                usb_log_info("There is still some unhandled change %X\n",
+        if(status>>16){
+                usb_log_info("there is still some unhandled change %X\n",
                     status);
         }
 }
+
 
 /**
@@ -189 +190 @@
  */
 static void usb_hub_removed_device(
-    usb_hub_info_t *hub, uint16_t port) {
+        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);
+                port, USB_HUB_FEATURE_C_PORT_CONNECTION);
         if (opResult != EOK) {
-                usb_log_warning("Could not clear port-change-connection flag\n");
+                usb_log_warning("could not clear port-change-connection flag\n");
         }
         /** \TODO remove device from device manager - not yet implemented in
@@ -201 +202 @@
 
         //close address
-
-        usb_hub_port_t *the_port = hub->ports + port;
-
-        fibril_mutex_lock(&hub->port_mutex);
-
-        if (the_port->attached_device.address >= 0) {
-                usb_log_warning("Device unplug on `%s' (port %zu): " \
-                    "not implemented.\n", hub->usb_device->ddf_dev->name,
-                    (size_t) port);
-                the_port->attached_device.address = -1;
-                the_port->attached_device.handle = 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("Device removed before being registered.\n");
@@ -220 +223 @@
                  * port reset callback from new device wrapper.
                  */
+                usb_hub_port_t *the_port = hub->ports + port;
                 fibril_mutex_lock(&the_port->reset_mutex);
                 the_port->reset_completed = true;
@@ -226 +230 @@
                 fibril_mutex_unlock(&the_port->reset_mutex);
         }
-
-        fibril_mutex_unlock(&hub->port_mutex);
-}
+}
+
 
 /**
@@ -239 +242 @@
  * @param status
  */
-static void usb_hub_port_reset_completed(usb_hub_info_t *hub,
-    uint16_t port, uint32_t 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", (size_t) port);
         if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_ENABLE)) {
@@ -272 +275 @@
  * @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) {
+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)) {
+        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);
+                        port, USB_HUB_FEATURE_PORT_POWER);
                 if (opResult != EOK) {
-                        usb_log_error("Cannot power off port %d; %s\n",
-                            port, str_error(opResult));
+                        usb_log_error("cannot power off port %d;  %d\n",
+                                port, opResult);
                 }
-        } else {
+        }else{
                 opResult = usb_hub_set_port_feature(hub->control_pipe,
-                    port, USB_HUB_FEATURE_PORT_POWER);
+                        port, USB_HUB_FEATURE_PORT_POWER);
                 if (opResult != EOK) {
-                        usb_log_error("Cannot power on port %d; %s\n",
-                            port, str_error(opResult));
+                        usb_log_error("cannot power on port %d;  %d\n",
+                                port, opResult);
                 }
         }
@@ -300 +303 @@
  */
 static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port,
-    usb_port_status_t *status) {
+    usb_port_status_t *status)
+{
         size_t recv_size;
         usb_device_request_setup_packet_t request;
@@ -307 +311 @@
         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);
+            &request, sizeof(usb_device_request_setup_packet_t),
+            &status_tmp, sizeof(status_tmp), &recv_size);
         if (rc != EOK) {
                 return rc;
@@ -333 +337 @@
  * @return Error code.
  */
-static int enable_port_callback(int port_no, void *arg) {
+static int enable_port_callback(int port_no, void *arg)
+{
         usb_hub_info_t *hub = arg;
         int rc;
@@ -341 +346 @@
         usb_hub_set_reset_port_request(&request, port_no);
         rc = usb_pipe_control_write(hub->control_pipe,
-            &request, sizeof (request), NULL, 0);
+            &request, sizeof(request), NULL, 0);
         if (rc != EOK) {
                 usb_log_warning("Port reset failed: %s.\n", str_error(rc));
@@ -371 +376 @@
  * @return 0 Always.
  */
-static int add_device_phase1_worker_fibril(void *arg) {
+static int add_device_phase1_worker_fibril(void *arg)
+{
         struct add_device_phase1 *data
             = (struct add_device_phase1 *) arg;
@@ -390 +396 @@
         }
 
-        fibril_mutex_lock(&data->hub->port_mutex);
         data->hub->ports[data->port].attached_device.handle = child_handle;
         data->hub->ports[data->port].attached_device.address = new_address;
-        fibril_mutex_unlock(&data->hub->port_mutex);
 
         usb_log_info("Detected new device on `%s' (port %zu), "
@@ -403 +407 @@
         free(arg);
 
-        fibril_mutex_lock(&data->hub->pending_ops_mutex);
-        assert(data->hub->pending_ops_count > 0);
-        data->hub->pending_ops_count--;
-        fibril_condvar_signal(&data->hub->pending_ops_cv);
-        fibril_mutex_unlock(&data->hub->pending_ops_mutex);
-
-
         return EOK;
 }
+
 
 /** Start device adding when connection change is detected.
@@ -423 +421 @@
  */
 static int create_add_device_fibril(usb_hub_info_t *hub, size_t port,
-    usb_speed_t speed) {
+    usb_speed_t speed)
+{
         struct add_device_phase1 *data
-            = malloc(sizeof (struct add_device_phase1));
+            = malloc(sizeof(struct add_device_phase1));
         if (data == NULL) {
                 return ENOMEM;
@@ -453 +452 @@
                 return ENOMEM;
         }
-        fibril_mutex_lock(&hub->pending_ops_mutex);
-        hub->pending_ops_count++;
-        fibril_mutex_unlock(&hub->pending_ops_mutex);
         fibril_add_ready(fibril);