Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3962 → Rev 3963

/trunk/kernel/genarch/include/kbd/i8042.h
35,6 → 35,7
#ifndef KERN_I8042_H_
#define KERN_I8042_H_
 
#include <ddi/irq.h>
#include <arch/types.h>
#include <typedefs.h>
 
46,10 → 47,12
typedef struct i8042 i8042_t;
 
typedef struct i8042_instance {
devno_t devno;
irq_t irq;
i8042_t *i8042;
} i8042_instance_t;
 
extern void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr);
extern bool i8042_init(i8042_t *, devno_t, inr_t);
 
#endif
 
/trunk/kernel/genarch/src/kbd/i8042.c
89,10 → 89,6
.resume = i8042_resume,
};
 
/** Structure for i8042's IRQ. */
static irq_t i8042_kbd_irq;
static irq_t i8042_mouse_irq;
 
static irq_ownership_t i8042_claim(irq_t *irq)
{
i8042_instance_t *i8042_instance = irq->instance;
125,34 → 121,31
}
 
/** Initialize i8042. */
void
i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno,
inr_t mouse_inr)
bool
i8042_init(i8042_t *dev, devno_t devno, inr_t inr)
{
i8042_t *dev = lgcy_i8042_instance.i8042;
i8042_instance_t *instance;
 
chardev_initialize("i8042_kbd", &kbrd, &ops);
stdin = &kbrd;
irq_initialize(&i8042_kbd_irq);
i8042_kbd_irq.devno = kbd_devno;
i8042_kbd_irq.inr = kbd_inr;
i8042_kbd_irq.claim = i8042_claim;
i8042_kbd_irq.handler = i8042_irq_handler;
i8042_kbd_irq.instance = &lgcy_i8042_instance;
irq_register(&i8042_kbd_irq);
instance = malloc(sizeof(i8042_instance_t), FRAME_ATOMIC);
if (!instance)
return false;
irq_initialize(&i8042_mouse_irq);
i8042_mouse_irq.devno = mouse_devno;
i8042_mouse_irq.inr = mouse_inr;
i8042_mouse_irq.claim = i8042_claim;
i8042_mouse_irq.handler = i8042_irq_handler;
i8042_mouse_irq.instance = &lgcy_i8042_instance;
irq_register(&i8042_mouse_irq);
instance->devno = devno;
instance->i8042 = dev;
trap_virtual_enable_irqs(1 << kbd_inr);
trap_virtual_enable_irqs(1 << mouse_inr);
irq_initialize(&instance->irq);
instance->irq.devno = devno;
instance->irq.inr = inr;
instance->irq.claim = i8042_claim;
instance->irq.handler = i8042_irq_handler;
instance->irq.instance = instance;
irq_register(&instance->irq);
trap_virtual_enable_irqs(1 << inr);
/*
* Clear input buffer.
*/
164,14 → 157,13
* self-sufficient.
*/
sysinfo_set_item_val("kbd", NULL, true);
sysinfo_set_item_val("kbd.devno", NULL, kbd_devno);
sysinfo_set_item_val("kbd.inr", NULL, kbd_inr);
sysinfo_set_item_val("kbd.devno", NULL, devno);
sysinfo_set_item_val("kbd.inr", NULL, inr);
#ifdef KBD_LEGACY
sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
#endif
sysinfo_set_item_val("mouse", NULL, true);
sysinfo_set_item_val("mouse.devno", NULL, mouse_devno);
sysinfo_set_item_val("mouse.inr", NULL, mouse_inr);
 
return true;
}
 
/* Called from getc(). */
/trunk/kernel/arch/ia64/src/ia64.c
166,8 → 166,7
(void) ns16550_init((ns16550_t *)NS16550_BASE, kbd, NS16550_IRQ, NULL,
NULL);
#else
devno_t mouse = device_assign_devno();
i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
(void) i8042_init((i8042_t *)I8042_BASE, kbd, IRQ_KBD);
#endif
#endif
 
222,13 → 221,7
{
#ifdef SKI
ski_kbd_grab();
#else
#ifdef CONFIG_NS16550
ns16550_grab();
#else
i8042_grab();
#endif
#endif
}
 
/** Return console to userspace
238,13 → 231,7
{
#ifdef SKI
ski_kbd_release();
#else
#ifdef CONFIG_NS16550
ns16550_release();
#else
i8042_release();
#endif
#endif
}
 
void arch_reboot(void)
/trunk/kernel/arch/amd64/src/amd64.c
174,7 → 174,8
void arch_post_smp_init(void)
{
/* keyboard controller */
i8042_init(device_assign_devno(), IRQ_KBD, device_assign_devno(), IRQ_MOUSE);
(void) i8042_init((i8042_t *) I8042_BASE, device_assign_devno(),
IRQ_KBD);
}
 
void calibrate_delay_loop(void)
/trunk/kernel/arch/ia32/src/ia32.c
125,9 → 125,8
void arch_post_smp_init(void)
{
devno_t kbd = device_assign_devno();
devno_t mouse = device_assign_devno();
/* keyboard controller */
i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
(void) i8042_init((i8042_t *) I8042_BASE, kbd, IRQ_KBD);
}
 
void calibrate_delay_loop(void)