Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1895 → Rev 1896

/trunk/kernel/genarch/src/kbd/ns16550.c
59,11 → 59,10
static void ns16550_suspend(chardev_t *);
static void ns16550_resume(chardev_t *);
 
chardev_t kbrd;
static chardev_operations_t ops = {
.suspend = ns16550_suspend,
.resume = ns16550_resume,
.read = key_read
.read = ns16550_key_read
};
 
void ns16550_interrupt(int n, istate_t *istate);
118,7 → 117,7
{
}
 
char key_read(chardev_t *d)
char ns16550_key_read(chardev_t *d)
{
char ch;
 
/trunk/kernel/genarch/src/kbd/i8042.c
80,11 → 80,10
static void i8042_suspend(chardev_t *);
static void i8042_resume(chardev_t *);
 
chardev_t kbrd;
static chardev_operations_t ops = {
.suspend = i8042_suspend,
.resume = i8042_resume,
.read = key_read
.read = i8042_key_read
};
 
static void i8042_interrupt(int n, istate_t *istate);
173,7 → 172,7
{
}
 
char key_read(chardev_t *d)
char i8042_key_read(chardev_t *d)
{
char ch;
 
/trunk/kernel/genarch/src/kbd/key.c
53,6 → 53,8
 
#define ACTIVE_READ_BUFF_SIZE 16 /* Must be power of 2 */
 
chardev_t kbrd;
 
static uint8_t active_read_buff[ACTIVE_READ_BUFF_SIZE];
 
SPINLOCK_INITIALIZE(keylock); /**< keylock protects keyflags and lockflags. */
/trunk/kernel/genarch/src/kbd/z8530.c
62,11 → 62,10
static void z8530_suspend(chardev_t *);
static void z8530_resume(chardev_t *);
 
chardev_t kbrd;
static chardev_operations_t ops = {
.suspend = z8530_suspend,
.resume = z8530_resume,
.read = key_read
.read = z8530_key_read
};
 
void z8530_wait(void);
141,7 → 140,7
{
}
 
char key_read(chardev_t *d)
char z8530_key_read(chardev_t *d)
{
char ch;