Merge branch 'ohligs' into mshell

This commit is contained in:
Marian Ohligs 2011-05-24 15:44:40 +02:00
commit cf570ee42a

View file

@ -110,8 +110,13 @@ static void keyboard_handler(struct state *r)
*/
kputchar(kbdus[scancode]);
if (kb_buffer.size <= kb_buffer.maxsize && kb_buffer.buffer != NULL) {
memcpy(kb_buffer.buffer + kb_buffer.size, &kbdus[scancode], 1);
kb_buffer.size++;
if (scancode == 14) {
kb_buffer.size--;
}
else {
memcpy(kb_buffer.buffer + kb_buffer.size, &kbdus[scancode], 1);
kb_buffer.size++;
}
if (scancode == 28 || scancode == 15 || kb_buffer.size >= kb_buffer.maxsize) {
wakeup_task(kb_buffer.tid);
reschedule();