Changeset e4f8c77 in mainline for kernel/genarch/src/drivers/ega/ega.c

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

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

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

@@ -64 +64 @@
         IRQ_SPINLOCK_DECLARE(lock);
         
+        parea_t parea;
+        
         uint32_t cursor;
         uint8_t *addr;
@@ -70 +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 *);
 
@@ -437 +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)
@@ -448 +450 @@
             EGA_COLS, EMPTY_CHAR);
         
-        if (!silent) {
+        if ((!instance->parea.mapped) || (console_override)) {
                 memmove((void *) instance->addr,
                     (void *) (instance->addr + EGA_COLS * 2),
@@ -459 +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);
@@ -469 +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,
@@ -481 +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);
@@ -503 +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);
@@ -529 +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;
@@ -535 +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;
@@ -555 +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);
@@ -572 +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);
@@ -612 +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);