Changeset 41ef5b9 in mainline for uspace/drv/usbhid/kbddev.c

Timestamp:

2011-03-21T17:16:10Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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 from usb/development

File:

• uspace/drv/usbhid/kbddev.c (modified) (2 diffs)

uspace/drv/usbhid/kbddev.c

@@ -780 +780 @@
 
         while (true) {
-                sess_rc = usb_endpoint_pipe_start_session(
+                sess_rc = usb_pipe_start_session(
                     &kbd_dev->hid_dev->poll_pipe);
                 if (sess_rc != EOK) {
@@ -788 +788 @@
                 }
 
-                rc = usb_endpoint_pipe_read(&kbd_dev->hid_dev->poll_pipe, 
+                rc = usb_pipe_read(&kbd_dev->hid_dev->poll_pipe, 
                     buffer, BOOTP_BUFFER_SIZE, &actual_size);
                 
-                sess_rc = usb_endpoint_pipe_end_session(
+                sess_rc = usb_pipe_end_session(
                     &kbd_dev->hid_dev->poll_pipe);