Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 510 → Rev 509

/kernel/trunk/arch/mips32/src/drivers/keyboard.c
1,5 → 1,4
/*
* Copyright (C) 2003 Josef Cejka
* Copyright (C) 2005 Jakub Jermar
* All rights reserved.
*
28,53 → 27,16
*/
 
#include <arch/drivers/keyboard.h>
#include <console/chardev.h>
#include <console/console.h>
#include <arch/cp0.h>
#include <putchar.h>
#include <synch/spinlock.h>
#include <synch/waitq.h>
#include <typedefs.h>
 
static chardev_t kbrd;
 
static void keyboard_enable(void);
 
/** Initialize keyboard subsystem. */
void keyboard_init(void)
{
/* unmask keyboard interrupt */
cp0_unmask_int(KEYBOARD_IRQ);
chardev_initialize(&kbrd, keyboard_enable);
stdin = &kbrd;
}
 
/** Process keyboard interrupt.
*
* This function is called directly from the interrupt handler.
* It feeds the keyboard buffer with characters read. When the buffer
* is full, it simply masks the keyboard interrupt signal.
*/
void keyboard(void)
{
char ch;
 
spinlock_lock(&kbrd.lock);
kbrd.counter++;
if (kbrd.counter == CHARDEV_BUFLEN - 1) {
/* buffer full => disable keyboard interrupt */
cp0_mask_int(KEYBOARD_IRQ);
}
 
ch = *((char *) KEYBOARD_ADDRESS);
putchar(ch);
kbrd.buffer[kbrd.index++] = ch;
kbrd.index = kbrd.index % CHARDEV_BUFLEN; /* index modulo size of buffer */
waitq_wakeup(&kbrd.wq, WAKEUP_FIRST);
spinlock_unlock(&kbrd.lock);
putchar(*((char *) KEYBOARD_ADDRESS));
}
 
/* Called from getc(). */
void keyboard_enable(void)
{
cp0_unmask_int(KEYBOARD_IRQ);
}
/kernel/trunk/arch/mips32/src/mips32.c
37,7 → 37,6
#include <memstr.h>
#include <arch/interrupt.h>
#include <arch/drivers/arc.h>
#include <arch/drivers/keyboard.h>
#include <proc/thread.h>
#include <print.h>
 
83,7 → 82,6
cp0_compare_write(cp0_compare_value + cp0_count_read());
 
console_init();
keyboard_init();
arc_print_memory_map();
arc_print_devices();
}