Changeset 8123695a in mainline for uspace/drv/usbhub

Timestamp:

2011-04-02T16:07:29Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

322a8066

Parents:

c6ba274

Message:

ohci root hub set/clear feature requests redesigned
hub: fix for non-removable devices 3.0

Location:

uspace/drv/usbhub

Files:

• port_status.h (modified) (1 diff)
• usbhub.c (modified) (5 diffs)

uspace/drv/usbhub/port_status.h

@@ -95 +95 @@
 }
 
+/**
+ * set the device request to be a port feature clear request
+ * @param request
+ * @param port
+ * @param feature_selector
+ */
+static inline void usb_hub_set_disable_port_feature_request(
+usb_device_request_setup_packet_t * request, uint16_t port,
+                uint16_t feature_selector
+){
+        request->index = port;
+        request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE;
+        request->request = USB_HUB_REQUEST_CLEAR_FEATURE;
+        request->value = feature_selector;
+        request->length = 0;
+}
 
 /**

uspace/drv/usbhub/usbhub.c

@@ -317 +317 @@
                         //set the status change bit, so it will be noticed in driver loop
                         if(usb_port_dev_connected(&status)){
-                                usb_hub_set_enable_port_feature_request(&request, port,
-                                                USB_HUB_FEATURE_C_PORT_CONNECTION);
+                                usb_hub_set_disable_port_feature_request(&request, port,
+                                                USB_HUB_FEATURE_PORT_CONNECTION);
                                 opResult = usb_pipe_control_read(
                                                 hub->control_pipe,
@@ -326 +326 @@
                                 if (opResult != EOK) {
                                         usb_log_warning(
-                                                        "could not set port change on port %d errno:%d\n",
+                                                        "could not clear port connection on port %d errno:%d\n",
                                                         port, opResult);
                                 }
+                                usb_log_debug("cleared port connection\n");
+                                usb_hub_set_enable_port_feature_request(&request, port,
+                                                USB_HUB_FEATURE_PORT_ENABLE);
+                                opResult = usb_pipe_control_read(
+                                                hub->control_pipe,
+                                                &request, sizeof(usb_device_request_setup_packet_t),
+                                                &status, 4, &rcvd_size
+                                                );
+                                if (opResult != EOK) {
+                                        usb_log_warning(
+                                                        "could not set port enabled on port %d errno:%d\n",
+                                                        port, opResult);
+                                }
+                                usb_log_debug("port set to enabled - should lead to connection change\n");
                         }
                 }
@@ -613 +627 @@
         //something connected/disconnected
         if (usb_port_connect_change(&status)) {
+                usb_log_debug("connection change on port\n");
                 if (usb_port_dev_connected(&status)) {
                         usb_log_debug("some connection changed\n");
@@ -623 +638 @@
         if (usb_port_overcurrent_change(&status)) {
                 //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);
@@ -639 +655 @@
                 }
         }
+        usb_log_debug("status %x\n ",status);
 
         usb_port_set_connect_change(&status, false);