Changeset aa2b32c in mainline for uspace/srv/hid/console/console.c

Timestamp:

2013-04-29T12:44:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a269d05

Parents:

06b0211b (diff), 9e7898e (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 mainline changes

File:

• uspace/srv/hid/console/console.c (modified) (3 diffs)

uspace/srv/hid/console/console.c

@@ -129 +129 @@
 static void cons_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void cons_set_cursor_visibility(con_srv_t *, bool);
-static int cons_get_event(con_srv_t *, kbd_event_t *);
+static int cons_get_event(con_srv_t *, cons_event_t *);
 
 static con_ops_t con_ops = {
@@ -490 +490 @@
 }
 
-static int cons_get_event(con_srv_t *srv, kbd_event_t *event)
+static int cons_get_event(con_srv_t *srv, cons_event_t *event)
 {
         console_t *cons = srv_to_console(srv);
@@ -496 +496 @@
         kbd_event_t *kevent = list_get_instance(link, kbd_event_t, link);
         
-        *event = *kevent;
+        event->type = CEV_KEY;
+        event->ev.key = *kevent;
         free(kevent);
         return EOK;