Changeset c593b21 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-04-03T18:06:29Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c4e0b47

Parents:

0b4e7ca (diff), 0cec844 (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

File:

• uspace/drv/usbhub/usbhub.c (modified) (6 diffs)

uspace/drv/usbhub/usbhub.c

@@ -74 +74 @@
 
         while(errorCode == EOK){
+                async_usleep(1000 * 1000 * 10 );/// \TODO proper number once
                 errorCode = usb_hub_check_hub_changes(hub_info);
-                async_usleep(1000 * 1000 );/// \TODO proper number once
         }
         usb_log_error("something in ctrl loop went wrong, errno %d\n",errorCode);
@@ -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");
                         }
+                }
+        }
+        /// \TODO this is just a debug code
+        for(port=1;port<=descriptor->ports_count;++port){
+                bool is_non_removable =
+                                ((non_removable_dev_bitmap[port/8]) >> (port%8)) %2;
+                if(is_non_removable){
+                        usb_log_debug("port %d is non-removable\n",port);
+                        usb_port_status_t status;
+                        size_t rcvd_size;
+                        usb_device_request_setup_packet_t request;
+                        //int opResult;
+                        usb_hub_set_port_status_request(&request, port);
+                        //endpoint 0
+                        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_error("could not get port status %d\n",opResult);
+                        }
+                        if (rcvd_size != sizeof (usb_port_status_t)) {
+                                usb_log_error("received status has incorrect size\n");
+                        }
+                        //something connected/disconnected
+                        if (usb_port_connect_change(&status)) {
+                                usb_log_debug("some connection changed\n");
+                        }
+                        usb_log_debug("status: %s\n",usb_debug_str_buffer(
+                                        (uint8_t *)&status,4,4));
                 }
         }
@@ -582 +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");
@@ -592 +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);
@@ -608 +655 @@
                 }
         }
+        usb_log_debug("status %x\n ",status);
 
         usb_port_set_connect_change(&status, false);