Changeset 1b29d6fa in mainline

Timestamp:

2010-12-12T22:28:30Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9fe6e7d

Parents:

647492b

Message:

Fix wrong polling endpoint in keyboard driver

Location:

uspace

Files:

• drv/usbkbd/main.c (modified) (3 diffs)
• lib/usb/include/usb/classes/hid.h (modified) (1 diff)

uspace/drv/usbkbd/main.c

@@ -39 +39 @@
 #define NAME "usbkbd"
 
-static const usb_endpoint_t CONTROL_EP = 0;
+#define GUESSED_POLL_ENDPOINT 1
 
 /*
@@ -155 +155 @@
 
         // default endpoint
-        kbd_dev->default_ep = CONTROL_EP;
+        kbd_dev->poll_endpoint = GUESSED_POLL_ENDPOINT;
         
         /*
@@ -204 +204 @@
         usb_target_t poll_target = {
                 .address = kbd_dev->address,
-                .endpoint = kbd_dev->default_ep
+                .endpoint = kbd_dev->poll_endpoint
         };
 

uspace/lib/usb/include/usb/classes/hid.h

@@ -100 +100 @@
         device_t *device;
         usb_address_t address;
-        usb_endpoint_t default_ep;
+        usb_endpoint_t poll_endpoint;
         usb_hid_report_parser_t *parser;
 } usb_hid_dev_kbd_t;