/kernel/trunk/arch/mips32/src/drivers/arc.c |
---|
35,7 → 35,6 |
#include <mm/frame.h> |
#include <interrupt.h> |
#include <align.h> |
#include <console/console.h> |
/* This is a good joke, SGI HAS different types than NT bioses... */ |
/* Here is the SGI type */ |
247,14 → 246,14 |
arc_keyboard_poll(); |
} |
void arc_console(void) |
chardev_t * arc_console(void) |
{ |
kbd_polling_enabled = true; |
chardev_initialize("arc_console", &console, &arc_ops); |
old_timer = int_register(TIMER_IRQ, "arc_kb_poll", timer_replace); |
stdin = &console; |
stdout = &console; |
return &console; |
} |
/* Initialize frame zones from ARC firmware. |
/kernel/trunk/arch/mips32/src/drivers/serial.c |
---|
101,7 → 101,8 |
serial_interrupt(n, stack); |
} |
void serial_console(void) |
#include <print.h> |
chardev_t * serial_console(void) |
{ |
serial_t *sd = &sconf[0]; |
116,6 → 117,7 |
*/ |
old_timer = int_register(TIMER_IRQ, "serial_drvr_poll", timer_replace); |
stdin = &console; |
stdout = &console; |
return &console; |
} |
/kernel/trunk/arch/mips32/src/drivers/msim.c |
---|
30,7 → 30,6 |
#include <console/chardev.h> |
#include <arch/drivers/msim.h> |
#include <arch/cp0.h> |
#include <console/console.h> |
static chardev_t console; |
78,7 → 77,7 |
/* Return console object representing msim console */ |
void msim_console(void) |
chardev_t * msim_console(void) |
{ |
chardev_initialize("msim_console", &console, &msim_ops); |
86,6 → 85,5 |
cp0_unmask_int(MSIM_KBD_IRQ); |
stdin = &console; |
stdout = &console; |
return &console; |
} |
/kernel/trunk/arch/mips32/src/console.c |
---|
34,10 → 34,15 |
void console_init(void) |
{ |
chardev_t *console; |
if (arc_enabled()) { |
arc_console(); |
console = arc_console(); |
} else if (serial_init()) { |
serial_console(); |
console = serial_console(); |
} else |
msim_console(); |
console = msim_console(); |
stdin = console; |
stdout = console; |
} |
/kernel/trunk/arch/mips32/include/drivers/serial.h |
---|
56,7 → 56,7 |
int irq; |
}serial_t; |
void serial_console(void); |
chardev_t * serial_console(void); |
int serial_init(void); |
#endif |
/kernel/trunk/arch/mips32/include/drivers/arc.h |
---|
215,6 → 215,6 |
extern int arc_enabled(void); |
extern void arc_print_devices(void); |
void arc_frame_init(void); |
void arc_console(void); |
chardev_t * arc_console(void); |
#endif |
/kernel/trunk/arch/mips32/include/drivers/msim.h |
---|
36,6 → 36,6 |
#define MSIM_KBD_ADDRESS 0xB0000000 |
#define MSIM_KBD_IRQ 2 |
void msim_console(void); |
chardev_t * msim_console(void); |
#endif |