Index: kernel/genarch/src/drivers/dsrln/dsrlnout.c =================================================================== --- kernel/genarch/src/drivers/dsrln/dsrlnout.c (revision c263c77c4712f982349c184bbee4df2163f68baa) +++ kernel/genarch/src/drivers/dsrln/dsrlnout.c (revision b511c2003b4475be254644e2e4cc4462936e14b7) @@ -42,14 +42,16 @@ #include #include +#include typedef struct { + parea_t parea; ioport8_t *base; } dsrlnout_instance_t; -static void dsrlnout_putchar(outdev_t *dev, const wchar_t ch, bool silent) +static void dsrlnout_putchar(outdev_t *dev, const wchar_t ch) { dsrlnout_instance_t *instance = (dsrlnout_instance_t *) dev->data; - if (!silent) { + if ((!instance->parea.mapped) || (console_override)) { if (ascii_check(ch)) pio_write_8(instance->base, ch); @@ -70,5 +72,6 @@ return NULL; - dsrlnout_instance_t *instance = malloc(sizeof(dsrlnout_instance_t), FRAME_ATOMIC); + dsrlnout_instance_t *instance = malloc(sizeof(dsrlnout_instance_t), + FRAME_ATOMIC); if (!instance) { free(dsrlndev); @@ -80,8 +83,15 @@ instance->base = base; + link_initialize(&instance->parea.link); + instance->parea.pbase = KA2PA(base); + instance->parea.frames = 1; + instance->parea.unpriv = false; + instance->parea.mapped = false; + ddi_parea_register(&instance->parea); if (!fb_exported) { /* - * This is the necessary evil until the userspace driver is entirely + * This is the necessary evil until + * the userspace driver is entirely * self-sufficient. */ Index: kernel/genarch/src/drivers/ega/ega.c =================================================================== --- kernel/genarch/src/drivers/ega/ega.c (revision c263c77c4712f982349c184bbee4df2163f68baa) +++ kernel/genarch/src/drivers/ega/ega.c (revision b511c2003b4475be254644e2e4cc4462936e14b7) @@ -64,4 +64,6 @@ IRQ_SPINLOCK_DECLARE(lock); + parea_t parea; + uint32_t cursor; uint8_t *addr; @@ -70,5 +72,5 @@ } ega_instance_t; -static void ega_putchar(outdev_t *, wchar_t, bool); +static void ega_putchar(outdev_t *, wchar_t); static void ega_redraw(outdev_t *); @@ -437,5 +439,5 @@ * This function takes care of scrolling. */ -static void ega_check_cursor(ega_instance_t *instance, bool silent) +static void ega_check_cursor(ega_instance_t *instance) { if (instance->cursor < EGA_SCREEN) @@ -448,5 +450,5 @@ EGA_COLS, EMPTY_CHAR); - if (!silent) { + if ((!instance->parea.mapped) || (console_override)) { memmove((void *) instance->addr, (void *) (instance->addr + EGA_COLS * 2), @@ -459,7 +461,7 @@ } -static void ega_show_cursor(ega_instance_t *instance, bool silent) -{ - if (!silent) { +static void ega_show_cursor(ega_instance_t *instance) +{ + if ((!instance->parea.mapped) || (console_override)) { pio_write_8(instance->base + EGA_INDEX_REG, 0x0a); uint8_t stat = pio_read_8(instance->base + EGA_DATA_REG); @@ -469,7 +471,7 @@ } -static void ega_move_cursor(ega_instance_t *instance, bool silent) -{ - if (!silent) { +static void ega_move_cursor(ega_instance_t *instance) +{ + if ((!instance->parea.mapped) || (console_override)) { pio_write_8(instance->base + EGA_INDEX_REG, 0x0e); pio_write_8(instance->base + EGA_DATA_REG, @@ -481,7 +483,7 @@ } -static void ega_sync_cursor(ega_instance_t *instance, bool silent) -{ - if (!silent) { +static void ega_sync_cursor(ega_instance_t *instance) +{ + if ((!instance->parea.mapped) || (console_override)) { pio_write_8(instance->base + EGA_INDEX_REG, 0x0e); uint8_t hi = pio_read_8(instance->base + EGA_DATA_REG); @@ -503,14 +505,14 @@ EGA_SCREEN - instance->cursor, EMPTY_CHAR); - if (!silent) + if ((!instance->parea.mapped) || (console_override)) memsetw(instance->addr + instance->cursor * 2, EGA_SCREEN - instance->cursor, EMPTY_CHAR); - ega_check_cursor(instance, silent); - ega_move_cursor(instance, silent); - ega_show_cursor(instance, silent); -} - -static void ega_display_char(ega_instance_t *instance, wchar_t ch, bool silent) + ega_check_cursor(instance); + ega_move_cursor(instance); + ega_show_cursor(instance); +} + +static void ega_display_char(ega_instance_t *instance, wchar_t ch) { uint16_t index = ega_oem_glyph(ch); @@ -529,5 +531,5 @@ instance->backbuf[instance->cursor * 2 + 1] = style; - if (!silent) { + if ((!instance->parea.mapped) || (console_override)) { instance->addr[instance->cursor * 2] = glyph; instance->addr[instance->cursor * 2 + 1] = style; @@ -535,5 +537,5 @@ } -static void ega_putchar(outdev_t *dev, wchar_t ch, bool silent) +static void ega_putchar(outdev_t *dev, wchar_t ch) { ega_instance_t *instance = (ega_instance_t *) dev->data; @@ -555,10 +557,10 @@ break; default: - ega_display_char(instance, ch, silent); + ega_display_char(instance, ch); instance->cursor++; break; } - ega_check_cursor(instance, silent); - ega_move_cursor(instance, silent); + ega_check_cursor(instance); + ega_move_cursor(instance); irq_spinlock_unlock(&instance->lock, true); @@ -572,6 +574,6 @@ memcpy(instance->addr, instance->backbuf, EGA_VRAM_SIZE); - ega_move_cursor(instance, silent); - ega_show_cursor(instance, silent); + ega_move_cursor(instance); + ega_show_cursor(instance); irq_spinlock_unlock(&instance->lock, true); @@ -612,12 +614,20 @@ } + link_initialize(&instance->parea.link); + instance->parea.pbase = addr; + instance->parea.frames = SIZE2FRAMES(EGA_VRAM_SIZE); + instance->parea.unpriv = false; + instance->parea.mapped = false; + ddi_parea_register(&instance->parea); + /* Synchronize the back buffer and cursor position. */ memcpy(instance->backbuf, instance->addr, EGA_VRAM_SIZE); - ega_sync_cursor(instance, silent); + ega_sync_cursor(instance); if (!fb_exported) { /* - * This is the necessary evil until the userspace driver is entirely - * self-sufficient. + * We export the kernel framebuffer for uspace usage. + * This is used in the case the uspace framebuffer + * driver is not self-sufficient. */ sysinfo_set_item_val("fb", NULL, true); Index: kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c =================================================================== --- kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c (revision c263c77c4712f982349c184bbee4df2163f68baa) +++ kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c (revision b511c2003b4475be254644e2e4cc4462936e14b7) @@ -44,4 +44,5 @@ #include #include +#include #include #include @@ -59,11 +60,14 @@ } -static void s3c24xx_uart_putchar(outdev_t *dev, wchar_t ch, bool silent) +static void s3c24xx_uart_putchar(outdev_t *dev, wchar_t ch) { - if (!silent) { + s3c24xx_uart_t *uart = + (s3c24xx_uart_t *) dev->data; + + if ((!uart->parea.mapped) || (console_override)) { if (!ascii_check(ch)) { s3c24xx_uart_sendb(dev, U_SPECIAL); } else { - if (ch == '\n') + if (ch == '\n') s3c24xx_uart_sendb(dev, (uint8_t) '\r'); s3c24xx_uart_sendb(dev, (uint8_t) ch); @@ -93,5 +97,5 @@ }; -outdev_t *s3c24xx_uart_init(s3c24xx_uart_io_t *io, inr_t inr) +outdev_t *s3c24xx_uart_init(uintptr_t paddr, inr_t inr) { outdev_t *uart_dev = malloc(sizeof(outdev_t), FRAME_ATOMIC); @@ -109,5 +113,5 @@ uart_dev->data = uart; - uart->io = io; + uart->io = (s3c24xx_uart_io_t *) hw_map(paddr, PAGE_SIZE); uart->indev = NULL; @@ -127,13 +131,21 @@ pio_write_32(&uart->io->ucon, pio_read_32(&uart->io->ucon) & ~UCON_RX_INT_LEVEL); - + + link_initialize(&uart->parea.link); + uart->parea.pbase = paddr; + uart->parea.frames = 1; + uart->parea.unpriv = false; + uart->parea.mapped = false; + ddi_parea_register(&uart->parea); + if (!fb_exported) { /* - * This is the necessary evil until the userspace driver is entirely + * This is the necessary evil until + * the userspace driver is entirely * self-sufficient. */ sysinfo_set_item_val("fb", NULL, true); sysinfo_set_item_val("fb.kind", NULL, 3); - sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(io)); + sysinfo_set_item_val("fb.address.physical", NULL, paddr); fb_exported = true;