| /trunk/kernel/arch/mips32/include/console.h |
|---|
| 35,8 → 35,6 |
| #ifndef KERN_mips32_CONSOLE_H_ |
| #define KERN_mips32_CONSOLE_H_ |
| extern void console_init(devno_t devno); |
| #endif |
| /** @} |
| /trunk/kernel/arch/mips32/include/drivers/serial.h |
|---|
| 35,41 → 35,8 |
| #ifndef KERN_mips32_SERIAL_H_ |
| #define KERN_mips32_SERIAL_H_ |
| #include <console/chardev.h> |
| #define SERIAL_ADDRESS 0x98000000 |
| #define SERIAL_MAX 4 |
| #define SERIAL_COM1 0x3f8 |
| #define SERIAL_COM1_IRQ 4 |
| #define SERIAL_COM2 0x2f8 |
| #define SERIAL_COM2_IRQ 3 |
| #define P_WRITEB(where, what) (*((volatile char *) (SERIAL_ADDRESS + where)) = what) |
| #define P_READB(where) (*((volatile char *) (SERIAL_ADDRESS + where))) |
| #define SERIAL_READ(x) P_READB(x) |
| #define SERIAL_WRITE(x, c) P_WRITEB(x, c) |
| /* Interrupt enable register */ |
| #define SERIAL_READ_IER(x) (P_READB((x) + 1)) |
| #define SERIAL_WRITE_IER(x,c) (P_WRITEB((x) + 1, c)) |
| /* Interrupt identification register */ |
| #define SERIAL_READ_IIR(x) (P_READB((x) + 2)) |
| /* Line status register */ |
| #define SERIAL_READ_LSR(x) (P_READB((x) + 5)) |
| #define TRANSMIT_EMPTY_BIT 5 |
| typedef struct { |
| int port; |
| int irq; |
| }serial_t; |
| extern void serial_console(devno_t devno); |
| extern int serial_init(void); |
| #endif |
| /** @} |
| /trunk/kernel/arch/mips32/Makefile.inc |
|---|
| 86,6 → 86,5 |
| arch/$(KARCH)/src/fpu_context.c \ |
| arch/$(KARCH)/src/ddi/ddi.c \ |
| arch/$(KARCH)/src/drivers/msim.c \ |
| arch/$(KARCH)/src/drivers/serial.c \ |
| arch/$(KARCH)/src/smp/dorder.c \ |
| arch/$(KARCH)/src/smp/smp.c |
| /trunk/kernel/arch/mips32/src/console.c |
|---|
| 38,14 → 38,6 |
| #include <arch/drivers/msim.h> |
| #include <genarch/fb/fb.h> |
| void console_init(devno_t devno) |
| { |
| if (serial_init()) |
| serial_console(devno); |
| else |
| msim_console(devno); |
| } |
| /** Acquire console back for kernel |
| * |
| */ |
| /trunk/kernel/arch/mips32/src/mips32.c |
|---|
| 56,6 → 56,7 |
| #include <ddi/device.h> |
| #include <config.h> |
| #include <string.h> |
| #include <arch/drivers/msim.h> |
| #include <arch/asm/regname.h> |
| 132,7 → 133,7 |
| void arch_post_mm_init(void) |
| { |
| interrupt_init(); |
| console_init(device_assign_devno()); |
| msim_console(device_assign_devno()); |
| #ifdef CONFIG_FB |
| /* GXemul framebuffer */ |
| fb_properties_t gxemul_prop = { |
| /trunk/kernel/arch/mips32/src/drivers/serial.c |
|---|
| File deleted |