Changeset a81a1d09 in mainline for uspace/drv/usbhub

Timestamp:

2011-05-11T16:49:28Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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:

Merge development/ changes

Location:

uspace/drv/usbhub

Files:

• Makefile (modified) (1 diff)
• ports.c (modified) (4 diffs)
• usbhub.c (modified) (2 diffs)

uspace/drv/usbhub/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include
+
+LIBS = \
+        $(LIBUSBDEV_PREFIX)/libusbdev.a \
+        $(LIBUSB_PREFIX)/libusb.a \
+        $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += \
+        -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBDRV_PREFIX)/include
+
 BINARY = usbhub
 

uspace/drv/usbhub/ports.c

@@ -53 +53 @@
         size_t port;
         usb_speed_t speed;
+};
+
+/**
+ * count of port status changes that are not explicitly handled by
+ * any function here and must be cleared by hand
+ */
+static const unsigned int non_handled_changes_count = 2;
+
+/**
+ * port status changes that are not explicitly handled by
+ * any function here and must be cleared by hand
+ */
+static const int non_handled_changes[] =  {
+        USB_HUB_FEATURE_C_PORT_ENABLE,
+        USB_HUB_FEATURE_C_PORT_SUSPEND
 };
 
@@ -131 +146 @@
             &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);
-
+        
+        //clearing not yet handled changes      
+        unsigned int 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)){
+                        usb_log_info(
+                            "there was not yet handled change on port %d: %d"
+                            ";clearing it\n",
+                        port, bit_idx);
+                        int opResult = usb_hub_clear_port_feature(
+                            hub->control_pipe,
+                            port, bit_idx);
+                        if (opResult != EOK) {
+                                usb_log_warning(
+                                    "could not clear port flag %d: %d\n",
+                                    bit_idx, opResult
+                                    );
+                        }
+                        usb_port_status_set_bit(
+                            &status, bit_idx,false);
+                }
+        }
+        if(status>>16){
+                usb_log_info("there is still some unhandled change %X\n",
+                    status);
         }
 }
@@ -222 +257 @@
                     "Port %zu reset complete but port not enabled.\n",
                     (size_t) port);
+        }
+        /* Clear the port reset change. */
+        int rc = usb_hub_clear_port_feature(hub->control_pipe,
+            port, USB_HUB_FEATURE_C_PORT_RESET);
+        if (rc != EOK) {
+                usb_log_error("Failed to clear port %d reset feature: %s.\n",
+                    port, str_error(rc));
         }
 }
@@ -319 +361 @@
         fibril_mutex_unlock(&my_port->reset_mutex);
 
-        /* Clear the port reset change. */
-        rc = usb_hub_clear_port_feature(hub->control_pipe,
-            port_no, USB_HUB_FEATURE_C_PORT_RESET);
-        if (rc != EOK) {
-                usb_log_error("Failed to clear port %d reset feature: %s.\n",
-                    port_no, str_error(rc));
-                return rc;
-        }
-
         if (my_port->reset_okay) {
                 return EOK;

uspace/drv/usbhub/usbhub.c

@@ -411 +411 @@
 static int usb_process_hub_power_change(usb_hub_info_t * hub_info,
     usb_hub_status_t status) {
-        int opResult;
+        int opResult = EOK;
         if (!usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
                 //restart power on hub
@@ -431 +431 @@
                         }
                 }
-                opResult = usb_hub_clear_feature(hub_info->control_pipe,
-                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+        }
+        if(opResult!=EOK){
+                return opResult;//no feature clearing
+        }
+        opResult = usb_hub_clear_feature(hub_info->control_pipe,
+            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
                 if (opResult != EOK) {
-                        usb_log_error("cannnot clear hub power change flag: "
-                            "%d\n",
-                            opResult);
-                }
+                usb_log_error("cannnot clear hub power change flag: "
+                    "%d\n",
+                    opResult);
         }
         return opResult;