Changeset 426d31a in mainline

Timestamp:

2011-05-07T11:14:30Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

192ba25

Parents:

abfd36b

Message:

corrected change disabling

Location:

uspace/drv

Files:

• ohci/root_hub.c (modified) (1 diff)
• usbhub/ports.c (modified) (3 diffs)

uspace/drv/ohci/root_hub.c

@@ -275 +275 @@
 void rh_interrupt(rh_t *instance) {
         if (!instance->unfinished_interrupt_transfer) {
-
                 return;
         }

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?
-        unsigned int bit_idx;
-        for(bit_idx = 16;bit_idx<32;++bit_idx){
+        
+        //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(
@@ -157 +173 @@
                 }
         }
-        if (status >> 16) {
-                usb_log_info("there was a mistake on port %d "
-                    "(not cleared status change): %X\n",
-                        port, status);
-        }
 }