| /trunk/kernel/arch/mips32/include/drivers/serial.h |
|---|
| 37,7 → 37,7 |
| #include <console/chardev.h> |
| #define SERIAL_ADDRESS 0x98000000 |
| #define SERIAL_ADDRESS 0xB8000000 |
| #define SERIAL_MAX 4 |
| #define SERIAL_COM1 0x3f8 |
| /trunk/kernel/arch/mips32/include/drivers/msim.h |
|---|
| 36,8 → 36,8 |
| #define KERN_mips32_MSIM_H_ |
| /** Address of devices. */ |
| #define MSIM_VIDEORAM 0x90000000 |
| #define MSIM_KBD_ADDRESS 0x90000000 |
| #define MSIM_VIDEORAM 0xB0000000 |
| #define MSIM_KBD_ADDRESS 0xB0000000 |
| #define MSIM_KBD_IRQ 2 |
| #include <console/chardev.h> |
| /trunk/kernel/arch/mips32/src/drivers/msim.c |
|---|
| 39,9 → 39,7 |
| #include <arch/cp0.h> |
| #include <console/console.h> |
| #include <sysinfo/sysinfo.h> |
| #include <ddi/ddi.h> |
| static parea_t msim_parea; |
| static chardev_t console; |
| static irq_t msim_irq; |
| 155,16 → 153,6 |
| sysinfo_set_item_val("kbd.devno", NULL, devno); |
| sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ); |
| sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS); |
| msim_parea.pbase = KA2PA(MSIM_VIDEORAM); |
| msim_parea.vbase = MSIM_VIDEORAM; |
| msim_parea.frames = 1; |
| msim_parea.cacheable = false; |
| ddi_parea_register(&msim_parea); |
| sysinfo_set_item_val("fb", NULL, true); |
| sysinfo_set_item_val("fb.kind", NULL, 3); |
| sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(MSIM_VIDEORAM)); |
| } |
| /** @} |
| /trunk/kernel/arch/ia32/src/drivers/ega.c |
|---|
| 93,6 → 93,8 |
| sysinfo_set_item_val("fb.width", NULL, ROW); |
| sysinfo_set_item_val("fb.height", NULL, ROWS); |
| sysinfo_set_item_val("fb.address.physical", NULL, VIDEORAM); |
| sysinfo_set_item_val("fb.address.color", NULL, PAGE_COLOR((uintptr_t) |
| videoram)); |
| } |
| static void ega_display_char(char ch) |
| /trunk/uspace/srv/fb/msim.c |
|---|
| File deleted |
| /trunk/uspace/srv/fb/msim.h |
|---|
| File deleted |
| /trunk/uspace/srv/fb/Makefile |
|---|
| 50,6 → 50,7 |
| font-8x16.c |
| CFLAGS += -DFB_ENABLED |
| endif |
| ifeq ($(ARCH), ia32) |
| SOURCES += ega.c |
| CFLAGS += -DEGA_ENABLED |
| 59,8 → 60,7 |
| CFLAGS += -DEGA_ENABLED |
| endif |
| ifeq ($(ARCH), mips32) |
| SOURCES += msim.c |
| CFLAGS += -DMSIM_ENABLED -DFB_INVERT_ENDIAN |
| CFLAGS += -DFB_INVERT_ENDIAN |
| endif |
| CFLAGS += -D$(ARCH) |
| /trunk/uspace/srv/fb/main.c |
|---|
| 37,7 → 37,6 |
| #include "fb.h" |
| #include "ega.h" |
| #include "msim.h" |
| #include "main.h" |
| #define NAME "fb" |
| 59,26 → 58,20 |
| printf(NAME ": HelenOS Framebuffer service\n"); |
| ipcarg_t phonead; |
| bool initialized = false; |
| int initialized = 0; |
| #ifdef FB_ENABLED |
| if (sysinfo_value("fb.kind") == 1) { |
| if (fb_init() == 0) |
| initialized = true; |
| initialized = 1; |
| } |
| #endif |
| #ifdef EGA_ENABLED |
| if ((!initialized) && (sysinfo_value("fb.kind") == 2)) { |
| if (!initialized && sysinfo_value("fb.kind") == 2) { |
| if (ega_init() == 0) |
| initialized = true; |
| initialized = 1; |
| } |
| #endif |
| #ifdef MSIM_ENABLED |
| if ((!initialized) && (sysinfo_value("fb.kind") == 3)) { |
| if (msim_init() == 0) |
| initialized = true; |
| } |
| #endif |
| if (!initialized) |
| return -1; |