Changeset 82122f3 in mainline for uspace/drv/usbkbd/main.c

Timestamp:

2010-12-17T14:51:41Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1f383dde

Parents:

692f13e4 (diff), 11658b64 (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:

Merged development into lelian/hidd

File:

• uspace/drv/usbkbd/main.c (modified) (3 diffs)

uspace/drv/usbkbd/main.c

@@ -40 +40 @@
 #define NAME "usbkbd"
 
-static const usb_endpoint_t CONTROL_EP = 0;
+#define GUESSED_POLL_ENDPOINT 1
 
 /*
@@ -130 +130 @@
 
         // default endpoint
-        kbd_dev->default_ep = CONTROL_EP;
+        kbd_dev->poll_endpoint = GUESSED_POLL_ENDPOINT;
         
         /*
@@ -178 +178 @@
         usb_target_t poll_target = {
                 .address = kbd_dev->address,
-                .endpoint = kbd_dev->default_ep
+                .endpoint = kbd_dev->poll_endpoint
         };
 
         while (true) {
+                async_usleep(1000 * 1000);
                 rc = usb_drv_async_interrupt_in(kbd_dev->device->parent_phone,
                     poll_target, buffer, BUFFER_SIZE, &actual_size, &handle);