Rev 4044 | Rev 4114 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4044 | Rev 4060 | ||
---|---|---|---|
Line 33... | Line 33... | ||
33 | */ |
33 | */ |
34 | 34 | ||
35 | #include <arch/ski/ski.h> |
35 | #include <arch/ski/ski.h> |
36 | #include <console/console.h> |
36 | #include <console/console.h> |
37 | #include <console/chardev.h> |
37 | #include <console/chardev.h> |
38 | #include <arch/interrupt.h> |
- | |
39 | #include <sysinfo/sysinfo.h> |
38 | #include <sysinfo/sysinfo.h> |
40 | #include <arch/types.h> |
39 | #include <arch/types.h> |
41 | #include <ddi/device.h> |
- | |
42 | #include <ddi/irq.h> |
- | |
43 | #include <ipc/irq.h> |
- | |
44 | #include <proc/thread.h> |
40 | #include <proc/thread.h> |
45 | #include <synch/spinlock.h> |
41 | #include <synch/spinlock.h> |
46 | #include <arch/asm.h> |
42 | #include <arch/asm.h> |
47 | #include <arch/drivers/kbd.h> |
43 | #include <arch/drivers/kbd.h> |
- | 44 | #include <arch.h> |
|
48 | 45 | ||
49 | #define SKI_KBD_INR 0 |
46 | static chardev_t *skiout; |
50 | 47 | ||
51 | static irq_t ski_kbd_irq; |
48 | static chardev_t ski_stdout; |
52 | static devno_t ski_kbd_devno; |
- | |
53 | - | ||
54 | chardev_t ski_console; |
- | |
55 | chardev_t ski_uconsole; |
- | |
56 | 49 | ||
57 | static bool kbd_disabled; |
50 | static bool kbd_disabled; |
58 | 51 | ||
59 | /** Display character on debug console |
52 | /** Display character on debug console |
60 | * |
53 | * |
Line 79... | Line 72... | ||
79 | if (ch == '\n') |
72 | if (ch == '\n') |
80 | ski_putchar(d, '\r', false); |
73 | ski_putchar(d, '\r', false); |
81 | } |
74 | } |
82 | } |
75 | } |
83 | 76 | ||
- | 77 | static chardev_operations_t ski_ops = { |
|
- | 78 | .write = ski_putchar |
|
- | 79 | }; |
|
- | 80 | ||
84 | /** Ask debug console if a key was pressed. |
81 | /** Ask debug console if a key was pressed. |
85 | * |
82 | * |
86 | * Use SSC (Simulator System Call) to |
83 | * Use SSC (Simulator System Call) to |
87 | * get character from debug console. |
84 | * get character from debug console. |
88 | * |
85 | * |
Line 105... | Line 102... | ||
105 | ); |
102 | ); |
106 | 103 | ||
107 | return (int32_t) ch; |
104 | return (int32_t) ch; |
108 | } |
105 | } |
109 | 106 | ||
110 | /** |
- | |
111 | * This is a blocking wrapper for ski_getchar(). |
- | |
112 | * To be used when the kernel crashes. |
- | |
113 | */ |
- | |
114 | static char ski_getchar_blocking(chardev_t *d) |
- | |
115 | { |
- | |
116 | int ch; |
- | |
117 | - | ||
118 | while(!(ch = ski_getchar())); |
- | |
119 | - | ||
120 | if (ch == '\r') |
- | |
121 | ch = '\n'; |
- | |
122 | return (char) ch; |
- | |
123 | } |
- | |
124 | - | ||
125 | /** Ask keyboard if a key was pressed. */ |
107 | /** Ask keyboard if a key was pressed. */ |
126 | static void poll_keyboard(void) |
108 | static void poll_keyboard(void) |
127 | { |
109 | { |
128 | char ch; |
110 | char ch; |
129 | static char last; |
- | |
130 | ipl_t ipl; |
111 | ipl_t ipl; |
131 | 112 | ||
132 | ipl = interrupts_disable(); |
113 | ipl = interrupts_disable(); |
133 | 114 | ||
134 | if (kbd_disabled) { |
115 | if (kbd_disabled) { |
135 | interrupts_restore(ipl); |
116 | interrupts_restore(ipl); |
136 | return; |
117 | return; |
137 | } |
118 | } |
138 | 119 | ||
139 | spinlock_lock(&ski_kbd_irq.lock); |
- | |
140 | - | ||
141 | ch = ski_getchar(); |
120 | ch = ski_getchar(); |
142 | if(ch == '\r') |
121 | if(ch == '\r') |
143 | ch = '\n'; |
122 | ch = '\n'; |
144 | if (ch) { |
123 | if (ch && skiout) { |
145 | if (ski_kbd_irq.notif_cfg.notify && |
- | |
146 | ski_kbd_irq.notif_cfg.answerbox) { |
- | |
147 | chardev_push_character(&ski_uconsole, ch); |
- | |
148 | /* XXX: send notification to userspace */ |
- | |
149 | } else { |
- | |
150 | chardev_push_character(&ski_console, ch); |
124 | chardev_push_character(skiout, ch); |
151 | } |
- | |
152 | last = ch; |
- | |
153 | spinlock_unlock(&ski_kbd_irq.lock); |
- | |
154 | interrupts_restore(ipl); |
125 | interrupts_restore(ipl); |
155 | return; |
126 | return; |
156 | } |
127 | } |
157 | 128 | ||
158 | if (last) { |
- | |
159 | if (ski_kbd_irq.notif_cfg.notify && |
- | |
160 | ski_kbd_irq.notif_cfg.answerbox) { |
- | |
161 | chardev_push_character(&ski_uconsole, 0); |
- | |
162 | /* XXX: send notification to userspace */ |
- | |
163 | } |
- | |
164 | last = 0; |
- | |
165 | } |
- | |
166 | - | ||
167 | spinlock_unlock(&ski_kbd_irq.lock); |
- | |
168 | interrupts_restore(ipl); |
129 | interrupts_restore(ipl); |
169 | } |
130 | } |
170 | 131 | ||
171 | /* Called from getc(). */ |
- | |
172 | static void ski_kbd_enable(chardev_t *d) |
132 | #define POLL_INTERVAL 10000 /* 10 ms */ |
173 | { |
- | |
174 | kbd_disabled = false; |
- | |
175 | } |
- | |
176 | 133 | ||
177 | /* Called from getc(). */ |
134 | /** Kernel thread for polling keyboard. */ |
178 | static void ski_kbd_disable(chardev_t *d) |
135 | static void kkbdpoll(void *arg) |
179 | { |
- | |
180 | kbd_disabled = true; |
- | |
181 | } |
- | |
182 | - | ||
183 | /** Decline to service hardware IRQ. |
- | |
184 | * |
- | |
185 | * This is only a virtual IRQ, so always decline. |
- | |
186 | * |
- | |
187 | * @return Always IRQ_DECLINE. |
- | |
188 | */ |
- | |
189 | static irq_ownership_t ski_kbd_claim(irq_t *irq) |
- | |
190 | { |
136 | { |
- | 137 | while (1) { |
|
- | 138 | if (!silent) { |
|
- | 139 | poll_keyboard(); |
|
- | 140 | } |
|
191 | return IRQ_DECLINE; |
141 | thread_usleep(POLL_INTERVAL); |
- | 142 | } |
|
192 | } |
143 | } |
193 | 144 | ||
194 | static chardev_operations_t ski_ops = { |
- | |
195 | .resume = ski_kbd_enable, |
- | |
196 | .suspend = ski_kbd_disable, |
- | |
197 | .write = ski_putchar, |
- | |
198 | .read = ski_getchar_blocking |
- | |
199 | }; |
- | |
200 | - | ||
201 | /** Initialize debug console |
145 | /** Initialize debug console |
202 | * |
146 | * |
203 | * Issue SSC (Simulator System Call) to |
147 | * Issue SSC (Simulator System Call) to |
204 | * to open debug console. |
148 | * to open debug console. |
205 | */ |
149 | */ |
206 | void ski_init_console(void) |
150 | void ski_console_init(chardev_t *devout) |
207 | { |
151 | { |
208 | asm volatile ( |
152 | asm volatile ( |
209 | "mov r15 = %0\n" |
153 | "mov r15 = %0\n" |
210 | "break 0x80000\n" |
154 | "break 0x80000\n" |
211 | : |
155 | : |
212 | : "i" (SKI_INIT_CONSOLE) |
156 | : "i" (SKI_INIT_CONSOLE) |
213 | : "r15", "r8" |
157 | : "r15", "r8" |
214 | ); |
158 | ); |
215 | 159 | ||
216 | chardev_initialize("ski_console", &ski_console, &ski_ops); |
160 | skiout = devout; |
217 | chardev_initialize("ski_uconsole", &ski_uconsole, &ski_ops); |
161 | chardev_initialize("ski_stdout", &ski_stdout, &ski_ops); |
218 | stdin = &ski_console; |
- | |
219 | stdout = &ski_console; |
162 | stdout = &ski_stdout; |
220 | 163 | ||
221 | ski_kbd_devno = device_assign_devno(); |
164 | thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true); |
222 | 165 | if (!t) |
|
223 | irq_initialize(&ski_kbd_irq); |
166 | panic("Cannot create kkbdpoll."); |
224 | ski_kbd_irq.inr = SKI_KBD_INR; |
- | |
225 | ski_kbd_irq.devno = ski_kbd_devno; |
- | |
226 | ski_kbd_irq.claim = ski_kbd_claim; |
- | |
227 | irq_register(&ski_kbd_irq); |
167 | thread_ready(t); |
228 | 168 | ||
229 | sysinfo_set_item_val("kbd", NULL, true); |
169 | sysinfo_set_item_val("kbd", NULL, true); |
230 | sysinfo_set_item_val("kbd.inr", NULL, SKI_KBD_INR); |
- | |
231 | sysinfo_set_item_val("kbd.devno", NULL, ski_kbd_devno); |
- | |
232 | sysinfo_set_item_val("kbd.type", NULL, KBD_SKI); |
170 | sysinfo_set_item_val("kbd.type", NULL, KBD_SKI); |
233 | 171 | ||
234 | sysinfo_set_item_val("fb", NULL, false); |
172 | sysinfo_set_item_val("fb", NULL, false); |
235 | } |
173 | } |
236 | 174 | ||
237 | void ski_kbd_grab(void) |
175 | void ski_kbd_grab(void) |
238 | { |
176 | { |
239 | ipl_t ipl = interrupts_disable(); |
- | |
240 | spinlock_lock(&ski_kbd_irq.lock); |
- | |
241 | ski_kbd_irq.notif_cfg.notify = false; |
177 | kbd_disabled = true; |
242 | spinlock_unlock(&ski_kbd_irq.lock); |
- | |
243 | interrupts_restore(ipl); |
- | |
244 | } |
178 | } |
245 | 179 | ||
246 | void ski_kbd_release(void) |
180 | void ski_kbd_release(void) |
247 | { |
181 | { |
248 | ipl_t ipl = interrupts_disable(); |
- | |
249 | spinlock_lock(&ski_kbd_irq.lock); |
- | |
250 | if (ski_kbd_irq.notif_cfg.answerbox) |
- | |
251 | ski_kbd_irq.notif_cfg.notify = true; |
- | |
252 | spinlock_unlock(&ski_kbd_irq.lock); |
- | |
253 | interrupts_restore(ipl); |
- | |
254 | } |
- | |
255 | - | ||
256 | - | ||
257 | #define POLL_INTERVAL 50000 /* 50 ms */ |
- | |
258 | - | ||
259 | /** Kernel thread for polling keyboard. */ |
- | |
260 | void kkbdpoll(void *arg) |
- | |
261 | { |
- | |
262 | while (1) { |
- | |
263 | if (!silent) { |
182 | kbd_disabled = false; |
264 | poll_keyboard(); |
- | |
265 | } |
- | |
266 | thread_usleep(POLL_INTERVAL); |
- | |
267 | } |
- | |
268 | } |
183 | } |
269 | 184 | ||
270 | /** @} |
185 | /** @} |
271 | */ |
186 | */ |