Rev 4055 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4055 | Rev 4156 | ||
---|---|---|---|
Line 35... | Line 35... | ||
35 | #include <stdio.h> |
35 | #include <stdio.h> |
36 | #include <io/stream.h> |
36 | #include <io/stream.h> |
37 | #include <kbd/kbd.h> |
37 | #include <kbd/kbd.h> |
38 | #include <ipc/ipc.h> |
38 | #include <ipc/ipc.h> |
39 | #include <ipc/console.h> |
39 | #include <ipc/console.h> |
- | 40 | #include <console.h> |
|
40 | #include <async.h> |
41 | #include <async.h> |
41 | 42 | ||
42 | int kbd_get_event(kbd_event_t *ev) |
43 | int kbd_get_event(kbd_event_t *ev) |
43 | { |
44 | { |
44 | int console_phone = get_console_phone(); |
45 | int cons_phone = console_phone_get(); |
45 | ipcarg_t r0, r1, r2, r3; |
46 | ipcarg_t r0, r1, r2, r3; |
46 | int rc; |
47 | int rc; |
47 | 48 | ||
- | 49 | if (cons_phone < 0) |
|
- | 50 | return -1; |
|
- | 51 | ||
48 | rc = async_req_0_4(console_phone, CONSOLE_GETKEY, &r0, &r1, &r2, &r3); |
52 | rc = async_req_0_4(cons_phone, CONSOLE_GETKEY, &r0, &r1, &r2, &r3); |
49 | if (rc < 0) |
53 | if (rc < 0) |
50 | return -1; |
54 | return -1; |
51 | 55 | ||
52 | ev->type = r0; |
56 | ev->type = r0; |
53 | ev->key = r1; |
57 | ev->key = r1; |