Rev 4337 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4337 | Rev 4338 | ||
|---|---|---|---|
| Line 116... | Line 116... | ||
| 116 | { |
116 | { |
| 117 | int ch; |
117 | int ch; |
| 118 | 118 | ||
| 119 | while(!(ch = ski_getchar())) |
119 | while(!(ch = ski_getchar())) |
| 120 | ; |
120 | ; |
| 121 | if(ch == '\r') |
121 | if (ch == '\r') |
| 122 | ch = '\n'; |
122 | ch = '\n'; |
| 123 | return (char) ch; |
123 | return (char) ch; |
| 124 | } |
124 | } |
| 125 | 125 | ||
| 126 | /** Ask keyboard if a key was pressed. */ |
126 | /** Ask keyboard if a key was pressed. */ |
| Line 141... | Line 141... | ||
| 141 | 141 | ||
| 142 | ch = ski_getchar(); |
142 | ch = ski_getchar(); |
| 143 | if(ch == '\r') |
143 | if(ch == '\r') |
| 144 | ch = '\n'; |
144 | ch = '\n'; |
| 145 | if (ch) { |
145 | if (ch) { |
| - | 146 | if (ski_kbd_irq.notif_cfg.notify && |
|
| 146 | if (ski_kbd_irq.notif_cfg.notify && ski_kbd_irq.notif_cfg.answerbox) { |
147 | ski_kbd_irq.notif_cfg.answerbox) { |
| 147 | chardev_push_character(&ski_uconsole, ch); |
148 | chardev_push_character(&ski_uconsole, ch); |
| 148 | ipc_irq_send_notif(&ski_kbd_irq); |
149 | ipc_irq_send_notif(&ski_kbd_irq); |
| 149 | } else { |
150 | } else { |
| 150 | chardev_push_character(&ski_console, ch); |
151 | chardev_push_character(&ski_console, ch); |
| 151 | } |
152 | } |
| Line 154... | Line 155... | ||
| 154 | interrupts_restore(ipl); |
155 | interrupts_restore(ipl); |
| 155 | return; |
156 | return; |
| 156 | } |
157 | } |
| 157 | 158 | ||
| 158 | if (last) { |
159 | if (last) { |
| - | 160 | if (ski_kbd_irq.notif_cfg.notify && |
|
| 159 | if (ski_kbd_irq.notif_cfg.notify && ski_kbd_irq.notif_cfg.answerbox) { |
161 | ski_kbd_irq.notif_cfg.answerbox) { |
| 160 | chardev_push_character(&ski_uconsole, 0); |
162 | chardev_push_character(&ski_uconsole, 0); |
| 161 | ipc_irq_send_notif(&ski_kbd_irq); |
163 | ipc_irq_send_notif(&ski_kbd_irq); |
| 162 | } |
164 | } |
| 163 | last = 0; |
165 | last = 0; |
| 164 | } |
166 | } |