Rev 521 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 521 | Rev 523 | ||
|---|---|---|---|
| 1 | /* |
1 | /* |
| 2 | * Copyright (C) 2003 Josef Cejka |
- | |
| 3 | * Copyright (C) 2005 Jakub Jermar |
- | |
| 4 | * Copyright (C) 2005 Jakub Vana |
2 | * Copyright (C) 2005 Jakub Vana |
| 5 | * All rights reserved. |
3 | * All rights reserved. |
| 6 | * |
4 | * |
| 7 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
| 8 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
| 9 | * are met: |
7 | * are met: |
| 10 | * |
8 | * |
| 11 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
| 12 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
| 13 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
| 14 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
| 15 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
| 16 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
| 17 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
| 18 | * |
16 | * |
| 19 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| 20 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| 21 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| 22 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| 23 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| 24 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 28 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 | */ |
27 | */ |
| 30 | 28 | ||
| 31 | #include <arch/drivers/keyboard.h> |
29 | #include <arch/drivers/keyboard.h> |
| 32 | #include <console/chardev.h> |
30 | #include <console/chardev.h> |
| 33 | #include <console/console.h> |
31 | #include <console/console.h> |
| 34 | #include <putchar.h> |
32 | #include <putchar.h> |
| 35 | #include <synch/spinlock.h> |
33 | #include <synch/spinlock.h> |
| 36 | #include <synch/waitq.h> |
34 | #include <synch/waitq.h> |
| 37 | #include <typedefs.h> |
35 | #include <typedefs.h> |
| 38 | #include <print.h> |
36 | #include <print.h> |
| 39 | 37 | ||
| 40 | static void keyboard_enable(void); |
38 | static void keyboard_enable(void); |
| 41 | static void keyboard_disable(void); |
39 | static void keyboard_disable(void); |
| 42 | 40 | ||
| 43 | static chardev_t kbrd; |
41 | static chardev_t kbrd; |
| 44 | static chardev_operations_t ops = { |
42 | static chardev_operations_t ops = { |
| 45 | .resume = keyboard_enable, |
43 | .resume = keyboard_enable, |
| 46 | .suspend = keyboard_disable |
44 | .suspend = keyboard_disable |
| 47 | }; |
45 | }; |
| 48 | 46 | ||
| 49 | - | ||
| 50 | int kb_disable; |
47 | bool kb_disable; |
| 51 | - | ||
| 52 | 48 | ||
| 53 | /** Initialize keyboard subsystem. */ |
49 | /** Initialize keyboard subsystem. */ |
| 54 | void keyboard_init(void) |
50 | void keyboard_init(void) |
| 55 | { |
51 | { |
| 56 | chardev_initialize(&kbrd, &ops); |
52 | chardev_initialize(&kbrd, &ops); |
| 57 | stdin = &kbrd; |
53 | stdin = &kbrd; |
| 58 | kb_disable = false; |
54 | kb_disable = false; |
| 59 | } |
55 | } |
| 60 | 56 | ||
| 61 | /** Process keyboard interrupt. */ |
57 | /** Ask keyboard if a key was pressed. */ |
| 62 | void poll_keyboard(void) |
58 | void poll_keyboard(void) |
| 63 | { |
59 | { |
| 64 | if(kb_disable) return; |
- | |
| 65 | char ch; |
60 | char ch; |
| 66 | 61 | ||
| - | 62 | if (kb_disable) |
|
| - | 63 | return; |
|
| - | 64 | ||
| 67 | ch = ski_getchar(); |
65 | ch = ski_getchar(); |
| 68 | if(ch=='\r') ch='\n'; |
66 | if(ch == '\r') |
| - | 67 | ch = '\n'; |
|
| - | 68 | if (ch) |
|
| 69 | if(ch) chardev_push_character(&kbrd, ch); |
69 | chardev_push_character(&kbrd, ch); |
| 70 | - | ||
| 71 | } |
70 | } |
| 72 | 71 | ||
| 73 | /* Called from getc(). */ |
72 | /* Called from getc(). */ |
| 74 | void keyboard_enable(void) |
73 | void keyboard_enable(void) |
| 75 | { |
74 | { |
| 76 | kb_disable=false; |
75 | kb_disable = false; |
| 77 | } |
76 | } |
| 78 | 77 | ||
| 79 | /* Called from getc(). */ |
78 | /* Called from getc(). */ |
| 80 | void keyboard_disable(void) |
79 | void keyboard_disable(void) |
| 81 | { |
80 | { |
| 82 | kb_disable=true; |
81 | kb_disable = true; |
| 83 | } |
82 | } |
| 84 | 83 | ||