Changeset d49728c in mainline

Timestamp:

2011-03-04T13:08:26Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

332f860

Parents:

8c877b2 (diff), f06c9ec (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 with usb/development

Location:

uspace/drv/usbhid

Files:

• hiddev.c (modified) (1 diff)
• hiddev.h (modified) (1 diff)
• kbddev.c (modified) (2 diffs)

uspace/drv/usbhid/hiddev.c

@@ -206 +206 @@
         assert(endpoint_mapping[0].interface != NULL);
         
+        /*
+         * Save polling interval
+         */
+        hid_dev->poll_interval = endpoint_mapping[0].descriptor->poll_interval;
+        assert(hid_dev->poll_interval > 0);
+        
         rc = usbhid_dev_get_report_descriptor(hid_dev,
             descriptors, descriptors_size,

uspace/drv/usbhid/hiddev.h

@@ -57 +57 @@
         usb_endpoint_pipe_t poll_pipe;
         
+        short poll_interval;
+        
         uint16_t iface;
         

uspace/drv/usbhid/kbddev.c

@@ -593 +593 @@
 
         while (true) {
-                async_usleep(1000 * 10);
-
                 sess_rc = usb_endpoint_pipe_start_session(
                     &kbd_dev->hid_dev->poll_pipe);
@@ -635 +633 @@
                 usb_log_debug("Calling usbhid_kbd_process_data()\n");
                 usbhid_kbd_process_data(kbd_dev, buffer, actual_size);
+                
+                async_usleep(kbd_dev->hid_dev->poll_interval);
         }