Changeset 26e7d6d in mainline for kernel/genarch/src/drivers/dsrln/dsrlnout.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a347a11

Parents:

3842a955 (diff), 086290d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/genarch/src/drivers/dsrln/dsrlnout.c (modified) (3 diffs)

kernel/genarch/src/drivers/dsrln/dsrlnout.c

@@ -42 +42 @@
 #include <sysinfo/sysinfo.h>
 #include <str.h>
+#include <ddi/ddi.h>
 
 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 +72 @@
                 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 +83 @@
         
         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.
                  */