Changes in uspace/drv/usbhub/usbhub.c [8123695a:66a54cc] in mainline

File:

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

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_disable_port_feature_request(&request, port,
-                                                USB_HUB_FEATURE_PORT_CONNECTION);
+                                usb_hub_set_enable_port_feature_request(&request, port,
+                                                USB_HUB_FEATURE_C_PORT_CONNECTION);
                                 opResult = usb_pipe_control_read(
                                                 hub->control_pipe,
@@ -326 +326 @@
                                 if (opResult != EOK) {
                                         usb_log_warning(
-                                                        "could not clear port connection on port %d errno:%d\n",
+                                                        "could not set port change 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));
                 }
         }
@@ -627 +582 @@
         //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");
@@ -638 +592 @@
         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);
@@ -655 +608 @@
                 }
         }
-        usb_log_debug("status %x\n ",status);
 
         usb_port_set_connect_change(&status, false);