Changeset 357d9dd in mainline for uspace/srv/hid

Timestamp:

2024-10-01T10:39:09Z (13 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

d31c3ea

Parents:

89e5c0c7

git-author:

Jiri Svoboda <jiri@…> (2024-09-30 18:39:04)

git-committer:

Jiri Svoboda <jiri@…> (2024-10-01 10:39:09)

Message:

The 'state' in vt100_state_t is unnecessary

Location:

uspace/srv/hid

Files:

• output/ctl/serial.c (modified) (8 diffs)
• remcons/remcons.c (modified) (1 diff)
• remcons/remcons.h (modified) (1 diff)

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

@@ -53 +53 @@
  *
  */
-static void draw_char(vt100_state_t *state, charfield_t *field,
+static void draw_char(vt100_t *state, charfield_t *field,
     sysarg_t col, sysarg_t row)
 {
@@ -63 +63 @@
 static errno_t serial_yield(outdev_t *dev)
 {
-        vt100_state_t *state = (vt100_state_t *) dev->data;
+        vt100_t *state = (vt100_t *) dev->data;
 
         return vt100_yield(state);
@@ -70 +70 @@
 static errno_t serial_claim(outdev_t *dev)
 {
-        vt100_state_t *state = (vt100_state_t *) dev->data;
+        vt100_t *state = (vt100_t *) dev->data;
 
         return vt100_claim(state);
@@ -78 +78 @@
     sysarg_t *rows)
 {
-        vt100_state_t *state = (vt100_state_t *) dev->data;
+        vt100_t *state = (vt100_t *) dev->data;
 
         vt100_get_dimensions(state, cols, rows);
@@ -92 +92 @@
     sysarg_t prev_row, sysarg_t col, sysarg_t row, bool visible)
 {
-        vt100_state_t *state = (vt100_state_t *) dev->data;
+        vt100_t *state = (vt100_t *) dev->data;
 
         vt100_goto(state, col, row);
@@ -100 +100 @@
 static void serial_char_update(outdev_t *dev, sysarg_t col, sysarg_t row)
 {
-        vt100_state_t *state = (vt100_state_t *) dev->data;
+        vt100_t *state = (vt100_t *) dev->data;
         charfield_t *field =
             chargrid_charfield_at(dev->backbuf, col, row);
@@ -109 +109 @@
 static void serial_flush(outdev_t *dev)
 {
-        vt100_state_t *state = (vt100_state_t *) dev->data;
+        vt100_t *state = (vt100_t *) dev->data;
 
         vt100_flush(state);
@@ -128 +128 @@
 {
         char_attrs_t attrs;
-        vt100_state_t *state =
-            vt100_state_create(NULL, SERIAL_COLS, SERIAL_ROWS, putuchar_fn,
+        vt100_t *vt100 =
+            vt100_create(NULL, SERIAL_COLS, SERIAL_ROWS, putuchar_fn,
             control_puts_fn, flush_fn);
-        if (state == NULL)
+        if (vt100 == NULL)
                 return ENOMEM;
-        state->enable_rgb = true;
+        vt100->enable_rgb = true;
 
-        vt100_cursor_visibility(state, false);
+        vt100_cursor_visibility(vt100, false);
         attrs.type = CHAR_ATTR_STYLE;
         attrs.val.style = STYLE_NORMAL;
-        vt100_set_attr(state, attrs);
-        vt100_cls(state);
+        vt100_set_attr(vt100, attrs);
+        vt100_cls(vt100);
 
-        outdev_t *dev = outdev_register(&serial_ops, state);
+        outdev_t *dev = outdev_register(&serial_ops, vt100);
         if (dev == NULL) {
-                vt100_state_destroy(state);
+                vt100_destroy(vt100);
                 return ENOMEM;
         }

uspace/srv/hid/remcons/remcons.c

@@ -568 +568 @@
         remcons->curs_visible = true;
 
-        remcons->vt = vt100_state_create((void *)remcons, 80, 25,
+        remcons->vt = vt100_create((void *)remcons, 80, 25,
             remcons_vt_putchar, remcons_vt_cputs, remcons_vt_flush);
         assert(remcons->vt != NULL); // XXX

uspace/srv/hid/remcons/remcons.h

@@ -47 +47 @@
 typedef struct {
         telnet_user_t *user;    /**< telnet user */
-        vt100_state_t *vt;      /**< virtual terminal driver */
+        vt100_t *vt;            /**< virtual terminal driver */
         bool enable_ctl;        /**< enable escape control sequences */
         bool enable_rgb;        /**< enable RGB color setting */