Changeset f9a0cef in mainline

Timestamp:

2010-12-13T00:31:22Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

37f7cfe, ea5dbaf

Parents:

1e32a63

Message:

Add clearing status changes in hub driver

Also, both keyboard and hub driver question with interval of 1s.

Location:

uspace/drv

Files:

• usbhub/main.c (modified) (1 diff)
• usbhub/usbhub_private.h (modified) (1 diff)
• usbhub/utils.c (modified) (2 diffs)
• usbkbd/main.c (modified) (1 diff)

uspace/drv/usbhub/main.c

@@ -50 +50 @@
         while(true){
                 usb_hub_check_hub_changes();
-                async_usleep(100 * 1000);
+                async_usleep(1000 * 1000);
         }
         return 0;

uspace/drv/usbhub/usbhub_private.h

@@ -182 +182 @@
 }
 
+static inline int usb_hub_clear_port_feature(int hc, usb_address_t address,
+    int port_index,
+    usb_hub_class_feature_t feature) {
+        usb_target_t target = {
+                .address = address,
+                .endpoint = 0
+        };
+        usb_device_request_setup_packet_t clear_request = {
+                .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE,
+                .request = USB_DEVREQ_CLEAR_FEATURE,
+                .length = 0,
+                .index = port_index
+        };
+        clear_request.value = feature;
+        return usb_drv_psync_control_write(hc, target, &clear_request,
+            sizeof(clear_request), NULL, 0);
+}
+
 
 

uspace/drv/usbhub/utils.c

@@ -508 +508 @@
         int opResult;
         printf("[usb_hub] finalizing add device\n");
+        opResult = usb_hub_clear_port_feature(hc, target.address,
+            port, USB_HUB_FEATURE_C_PORT_RESET);
+        if (opResult != EOK) {
+                goto release;
+        }
 
         /* Request address at from host controller. */
@@ -625 +630 @@
         //something connected/disconnected
         if (usb_port_connect_change(&status)) {
+                opResult = usb_hub_clear_port_feature(hc, target.address,
+                    port, USB_HUB_FEATURE_C_PORT_CONNECTION);
+                // TODO: check opResult
                 if (usb_port_dev_connected(&status)) {
                         printf("[usb_hub] some connection changed\n");

uspace/drv/usbkbd/main.c

@@ -208 +208 @@
 
         while (true) {
-                async_usleep(10 * 1000);
+                async_usleep(1000 * 1000);
                 rc = usb_drv_async_interrupt_in(kbd_dev->device->parent_phone,
                     poll_target, buffer, BUFFER_SIZE, &actual_size, &handle);