Changes in kernel/genarch/src/drivers/ega/ega.c [da1bafb:b366a6f4] in mainline

File:

• kernel/genarch/src/drivers/ega/ega.c (modified) (14 diffs)

kernel/genarch/src/drivers/ega/ega.c

@@ -41 +41 @@
 #include <mm/slab.h>
 #include <arch/mm/page.h>
-#include <synch/spinlock.h>
 #include <typedefs.h>
 #include <arch/asm.h>
@@ -65 +64 @@
         IRQ_SPINLOCK_DECLARE(lock);
         
+        parea_t parea;
+        
         uint32_t cursor;
         uint8_t *addr;
@@ -71 +72 @@
 } 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 *);
 
@@ -438 +439 @@
  * 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)
@@ -449 +450 @@
             EGA_COLS, EMPTY_CHAR);
         
-        if (!silent) {
+        if ((!instance->parea.mapped) || (console_override)) {
                 memmove((void *) instance->addr,
                     (void *) (instance->addr + EGA_COLS * 2),
@@ -460 +461 @@
 }
 
-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);
@@ -470 +471 @@
 }
 
-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,
@@ -482 +483 @@
 }
 
-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);
@@ -504 +505 @@
             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);
@@ -530 +531 @@
         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;
@@ -536 +537 @@
 }
 
-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;
@@ -556 +557 @@
                 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);
@@ -573 +574 @@
         
         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);
@@ -613 +614 @@
         }
         
+        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);