Changes in kernel/genarch/src/drivers/ega/ega.c [28a5ebd:39e1b9a] in mainline

File:

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

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

@@ -42 +42 @@
 #include <typedefs.h>
 #include <arch/asm.h>
-#include <mem.h>
+#include <memw.h>
 #include <str.h>
 #include <console/chardev.h>
@@ -69 +69 @@
         uint8_t *backbuf;
         ioport8_t *base;
+        mbstate_t mbstate;
 } ega_instance_t;
 
-static void ega_putuchar(outdev_t *, char32_t);
+static void ega_write(outdev_t *, const char *, size_t);
 static void ega_redraw(outdev_t *);
 
 static outdev_operations_t egadev_ops = {
-        .write = ega_putuchar,
+        .write = ega_write,
         .redraw = ega_redraw,
         .scroll_up = NULL,
@@ -538 +539 @@
 }
 
-static void ega_putuchar(outdev_t *dev, char32_t ch)
-{
-        ega_instance_t *instance = (ega_instance_t *) dev->data;
-
-        irq_spinlock_lock(&instance->lock, true);
-
+static void _putuchar(ega_instance_t *instance, char32_t ch)
+{
         switch (ch) {
         case '\n':
@@ -564 +561 @@
         ega_check_cursor(instance);
         ega_move_cursor(instance);
+}
+
+static void ega_write(outdev_t *dev, const char *s, size_t n)
+{
+        ega_instance_t *instance = (ega_instance_t *) dev->data;
+
+        irq_spinlock_lock(&instance->lock, true);
+
+        size_t offset = 0;
+        char32_t ch;
+
+        while ((ch = str_decode_r(s, &offset, n, U_SPECIAL, &instance->mbstate)))
+                _putuchar(instance, ch);
 
         irq_spinlock_unlock(&instance->lock, true);
 }
 
-static void ega_redraw(outdev_t *dev)
-{
-        ega_instance_t *instance = (ega_instance_t *) dev->data;
-
-        irq_spinlock_lock(&instance->lock, true);
-
+static void ega_redraw_internal(ega_instance_t *instance)
+{
         memcpy(instance->addr, instance->backbuf, EGA_VRAM_SIZE);
         ega_move_cursor(instance);
         ega_show_cursor(instance);
-
+}
+
+static void ega_redraw(outdev_t *dev)
+{
+        ega_instance_t *instance = (ega_instance_t *) dev->data;
+
+        irq_spinlock_lock(&instance->lock, true);
+        ega_redraw_internal(instance);
         irq_spinlock_unlock(&instance->lock, true);
+}
+
+/** EGA was mapped or unmapped.
+ *
+ * @param arg EGA instance
+ */
+static void ega_mapped_changed(void *arg)
+{
+        ega_instance_t *instance = (ega_instance_t *) arg;
+
+        if (!instance->parea.mapped) {
+                irq_spinlock_lock(&instance->lock, true);
+                ega_redraw_internal(instance);
+                irq_spinlock_unlock(&instance->lock, true);
+        }
 }
 
@@ -621 +649 @@
         instance->parea.unpriv = false;
         instance->parea.mapped = false;
+        instance->parea.mapped_changed = ega_mapped_changed;
+        instance->parea.arg = (void *) instance;
         ddi_parea_register(&instance->parea);