Changeset 7eaeec1 in mainline for uspace/srv/hid/output/ctl/serial.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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:

• uspace/srv/hid/output/ctl/serial.c (moved) (moved from uspace/srv/hid/fb/ctl/serial.c ) (2 diffs)

uspace/srv/hid/output/ctl/serial.c

@@ -28 +28 @@
  */
 
-/** @file
+/** @addtogroup console
+ * @{
+ */
+/**
+ * @file
  */
 
 #include <sys/types.h>
 #include <errno.h>
-#include <malloc.h>
-#include <screenbuffer.h>
+#include <io/chargrid.h>
+#include "../output.h"
 #include "../proto/vt100.h"
-#include "../fb.h"
 #include "serial.h"
 
-/** Draw the character at the specified position in viewport.
+#define SERIAL_COLS  80
+#define SERIAL_ROWS  24
+
+/** Draw the character at the specified position.
  *
  * @param state VT100 protocol state.
- * @param vp    Viewport.
- * @param col   Screen position relative to viewport.
- * @param row   Screen position relative to viewport.
+ * @param field Character field.
+ * @param col   Horizontal screen position.
+ * @param row   Vertical screen position.
  *
  */
-static void draw_vp_char(vt100_state_t *state, fbvp_t *vp, sysarg_t col,
-    sysarg_t row)
+static void draw_char(vt100_state_t *state, charfield_t *field,
+    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);
-        
-        vt100_goto(state, x, y);
+        vt100_goto(state, col, row);
         vt100_set_attr(state, field->attrs);
         vt100_putchar(state, field->ch);
 }
 
-static int serial_yield(fbdev_t *dev)
+static int serial_yield(outdev_t *dev)
 {
         vt100_state_t *state = (vt100_state_t *) dev->data;
+        
         return vt100_yield(state);
 }
 
-static int serial_claim(fbdev_t *dev)
+static int serial_claim(outdev_t *dev)
 {
         vt100_state_t *state = (vt100_state_t *) dev->data;
+        
         return vt100_claim(state);
 }
 
-static int serial_get_resolution(fbdev_t *dev, sysarg_t *width, sysarg_t *height)
-{
-        vt100_state_t *state = (vt100_state_t *) dev->data;
-        vt100_get_resolution(state, width, height);
-        return EOK;
-}
-
-static void serial_font_metrics(fbdev_t *dev, sysarg_t width, sysarg_t height,
-    sysarg_t *cols, sysarg_t *rows)
-{
-        *cols = width;
-        *rows = height;
-}
-
-static int serial_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 serial_vp_destroy(fbdev_t *dev, fbvp_t *vp)
-{
-        /* No-op */
-}
-
-static void serial_vp_clear(fbdev_t *dev, fbvp_t *vp)
+static void serial_get_dimensions(outdev_t *dev, sysarg_t *cols,
+    sysarg_t *rows)
 {
         vt100_state_t *state = (vt100_state_t *) dev->data;
         
-        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(state, vp, col, row);
-                }
-        }
+        vt100_get_dimensions(state, cols, rows);
 }
 
-static console_caps_t serial_vp_get_caps(fbdev_t *dev, fbvp_t *vp)
+static console_caps_t serial_get_caps(outdev_t *dev)
 {
         return (CONSOLE_CAP_STYLE | CONSOLE_CAP_INDEXED);
 }
 
-static void serial_vp_cursor_update(fbdev_t *dev, fbvp_t *vp,
-    sysarg_t prev_col, sysarg_t prev_row, sysarg_t col, sysarg_t row,
-    bool visible)
+static void serial_cursor_update(outdev_t *dev, sysarg_t prev_col,
+    sysarg_t prev_row, sysarg_t col, sysarg_t row, bool visible)
 {
         vt100_state_t *state = (vt100_state_t *) dev->data;
         
-        vt100_goto(state, vp->x + col, vp->y + row);
+        vt100_goto(state, col, row);
         vt100_cursor_visibility(state, visible);
 }
 
-static void serial_vp_char_update(fbdev_t *dev, fbvp_t *vp, sysarg_t col,
-    sysarg_t row)
+static void serial_char_update(outdev_t *dev, sysarg_t col, sysarg_t row)
 {
         vt100_state_t *state = (vt100_state_t *) dev->data;
-        draw_vp_char(state, vp, col, row);
+        charfield_t *field =
+            chargrid_charfield_at(dev->backbuf, col, row);
+        
+        draw_char(state, field, col, row);
 }
 
-static fbdev_ops_t serial_ops = {
+static outdev_ops_t serial_ops = {
         .yield = serial_yield,
         .claim = serial_claim,
-        .get_resolution = serial_get_resolution,
-        .font_metrics = serial_font_metrics,
-        .vp_create = serial_vp_create,
-        .vp_destroy = serial_vp_destroy,
-        .vp_clear = serial_vp_clear,
-        .vp_get_caps = serial_vp_get_caps,
-        .vp_cursor_update = serial_vp_cursor_update,
-        .vp_char_update = serial_vp_char_update
+        .get_dimensions = serial_get_dimensions,
+        .get_caps = serial_get_caps,
+        .cursor_update = serial_cursor_update,
+        .char_update = serial_char_update
 };
 
@@ -156 +119 @@
 {
         vt100_state_t *state =
-            vt100_state_create(80, 24, putchar_fn, control_puts_fn);
+            vt100_state_create(SERIAL_COLS, SERIAL_ROWS, putchar_fn,
+            control_puts_fn);
         if (state == NULL)
                 return ENOMEM;
         
-        fbdev_t *dev = fbdev_register(&serial_ops, state);
-        if (dev == NULL)
-                return EINVAL;
+        outdev_t *dev = outdev_register(&serial_ops, state);
+        if (dev == NULL) {
+                vt100_state_destroy(state);
+                return ENOMEM;
+        }
         
         return EOK;