Changeset 03362fbd in mainline for uspace/srv/hid/output/port/ega.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/srv/hid/output/port/ega.c (moved) (moved from uspace/srv/hid/fb/port/ega.c ) (8 diffs)

uspace/srv/hid/output/port/ega.c

@@ -33 +33 @@
 #include <errno.h>
 #include <sysinfo.h>
-#include <task.h>
+#include <align.h>
+#include <as.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
-#include <as.h>
-#include <malloc.h>
-#include <align.h>
-#include <screenbuffer.h>
-#include "../fb.h"
+#include <io/chargrid.h>
+#include "../output.h"
 #include "ega.h"
 
@@ -46 +43 @@
 #define EGA_IO_SIZE  2
 
-#define FB_POS(x, y)  (((y) * ega.width + (x)) << 1)
+#define FB_POS(x, y)  (((y) * ega.cols + (x)) << 1)
 
 typedef struct {
-        sysarg_t width;
-        sysarg_t height;
+        sysarg_t cols;
+        sysarg_t rows;
+        
+        uint8_t style_normal;
+        uint8_t style_inverted;
         
         size_t size;
         uint8_t *addr;
-        
-        uint8_t style_normal;
-        uint8_t style_inverted;
-        
-        uint8_t *backbuf;
 } ega_t;
 
@@ -101 +96 @@
 }
 
-/** Draw the character at the specified position in viewport.
- *
- * @param vp     Viewport.
- * @param col    Screen position relative to viewport.
- * @param row    Screen position relative to viewport.
- *
- */
-static void draw_vp_char(fbvp_t *vp, sysarg_t col, sysarg_t row)
-{
-        sysarg_t x = vp->x + col;
-        sysarg_t y = vp->y + row;
-        
-        charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row);
-        
+/** Draw the character at the specified position.
+ *
+ * @param field Character field.
+ * @param col   Horizontal screen position.
+ * @param row   Vertical screen position.
+ *
+ */
+static void draw_char(charfield_t *field, sysarg_t col, sysarg_t row)
+{
         uint8_t glyph;
         
@@ -124 +114 @@
         uint8_t attr = attrs_attr(field->attrs);
         
-        ega.addr[FB_POS(x, y)] = glyph;
-        ega.addr[FB_POS(x, y) + 1] = attr;
-}
-
-static int ega_yield(fbdev_t *dev)
-{
-        if (ega.backbuf == NULL) {
-                ega.backbuf = malloc(ega.size);
-                if (ega.backbuf == NULL)
-                        return ENOMEM;
-        }
-        
-        memcpy(ega.backbuf, ega.addr, ega.size);
+        ega.addr[FB_POS(col, row)] = glyph;
+        ega.addr[FB_POS(col, row) + 1] = attr;
+}
+
+static int ega_yield(outdev_t *dev)
+{
         return EOK;
 }
 
-static int ega_claim(fbdev_t *dev)
-{
-        if (ega.backbuf == NULL)
-                return ENOENT;
-        
-        memcpy(ega.addr, ega.backbuf, ega.size);
+static int ega_claim(outdev_t *dev)
+{
         return EOK;
 }
 
-static int ega_get_resolution(fbdev_t *dev, sysarg_t *width, sysarg_t *height)
-{
-        *width = ega.width;
-        *height = ega.height;
-        return EOK;
-}
-
-static void ega_font_metrics(fbdev_t *dev, sysarg_t width, sysarg_t height,
-    sysarg_t *cols, sysarg_t *rows)
-{
-        *cols = width;
-        *rows = height;
-}
-
-static int ega_vp_create(fbdev_t *dev, fbvp_t *vp)
-{
-        vp->attrs.type = CHAR_ATTR_STYLE;
-        vp->attrs.val.style = STYLE_NORMAL;
-        vp->data = NULL;
-        
-        return EOK;
-}
-
-static void ega_vp_destroy(fbdev_t *dev, fbvp_t *vp)
-{
-        /* No-op */
-}
-
-static void ega_vp_clear(fbdev_t *dev, fbvp_t *vp)
-{
-        for (sysarg_t row = 0; row < vp->rows; row++) {
-                for (sysarg_t col = 0; col < vp->cols; col++) {
-                        charfield_t *field =
-                            screenbuffer_field_at(vp->backbuf, col, row);
-                        
-                        field->ch = 0;
-                        field->attrs = vp->attrs;
-                        
-                        draw_vp_char(vp, col, row);
-                }
-        }
-}
-
-static console_caps_t ega_vp_get_caps(fbdev_t *dev, fbvp_t *vp)
+static void ega_get_dimensions(outdev_t *dev, sysarg_t *cols, sysarg_t *rows)
+{
+        *cols = ega.cols;
+        *rows = ega.rows;
+}
+
+static console_caps_t ega_get_caps(outdev_t *dev)
 {
         return (CONSOLE_CAP_STYLE | CONSOLE_CAP_INDEXED);
 }
 
-static void ega_vp_cursor_update(fbdev_t *dev, fbvp_t *vp, sysarg_t prev_col,
+static void ega_cursor_update(outdev_t *dev, sysarg_t prev_col,
     sysarg_t prev_row, sysarg_t col, sysarg_t row, bool visible)
 {
         /* Cursor position */
-        uint16_t cursor = row * ega.width + col;
+        uint16_t cursor = row * ega.cols + col;
         
         pio_write_8(EGA_IO_BASE, 0x0e);
@@ -220 +162 @@
 }
 
-static void ega_vp_char_update(fbdev_t *dev, fbvp_t *vp, sysarg_t col,
-    sysarg_t row)
-{
-        draw_vp_char(vp, col, row);
-}
-
-static fbdev_ops_t ega_ops = {
+static void ega_char_update(outdev_t *dev, sysarg_t col, sysarg_t row)
+{
+        charfield_t *field =
+            chargrid_charfield_at(dev->backbuf, col, row);
+        
+        draw_char(field, col, row);
+}
+
+static outdev_ops_t ega_ops = {
         .yield = ega_yield,
         .claim = ega_claim,
-        .get_resolution = ega_get_resolution,
-        .font_metrics = ega_font_metrics,
-        .vp_create = ega_vp_create,
-        .vp_destroy = ega_vp_destroy,
-        .vp_clear = ega_vp_clear,
-        .vp_get_caps = ega_vp_get_caps,
-        .vp_cursor_update = ega_vp_cursor_update,
-        .vp_char_update = ega_vp_char_update
+        .get_dimensions = ega_get_dimensions,
+        .get_caps = ega_get_caps,
+        .cursor_update = ega_cursor_update,
+        .char_update = ega_char_update
 };
 
@@ -262 +202 @@
                 return rc;
         
-        sysarg_t width;
-        rc = sysinfo_get_value("fb.width", &width);
-        if (rc != EOK)
-                return rc;
-        
-        sysarg_t height;
-        rc = sysinfo_get_value("fb.height", &height);
-        if (rc != EOK)
-                return rc;
-        
-        rc = iospace_enable(task_get_id(), (void *) EGA_IO_BASE, EGA_IO_SIZE);
-        if (rc != EOK)
-                return rc;
-        
-        ega.width = width;
-        ega.height = height;
-        
-        ega.size = (width * height) << 1;
+        rc = sysinfo_get_value("fb.width", &ega.cols);
+        if (rc != EOK)
+                return rc;
+        
+        rc = sysinfo_get_value("fb.height", &ega.rows);
+        if (rc != EOK)
+                return rc;
+        
+        rc = pio_enable((void*)EGA_IO_BASE, EGA_IO_SIZE, NULL);
+        if (rc != EOK)
+                return rc;
+        
+        ega.size = (ega.cols * ega.rows) << 1;
         
         rc = physmem_map((void *) paddr,
@@ -300 +235 @@
         }
         
-        ega.backbuf = NULL;
-        
-        fbdev_t *dev = fbdev_register(&ega_ops, (void *) &ega);
+        outdev_t *dev = outdev_register(&ega_ops, (void *) &ega);
         if (dev == NULL) {
                 as_area_destroy(ega.addr);
@@ -311 +244 @@
 }
 
-/**
- * @}
- */
+/** @}
+ */