1 files changed, 69 insertions, 0 deletions

diff --git a/sys/dev/cons/cons.c b/sys/dev/cons/cons.c
index 3eb7c33..2cef071 100644
--- a/sys/dev/cons/cons.c
+++ b/sys/dev/cons/cons.c
@@ -37,6 +37,7 @@
 #include <dev/cons/font.h>
 #include <dev/cons/cons.h>
 #include <fs/devfs.h>
+#include <fs/ctlfs.h>
 #include <vm/dynalloc.h>
 #include <string.h>
 
@@ -62,6 +63,7 @@
 
 struct cons_screen g_root_scr = {0};
 static struct cdevsw cons_cdevsw;
+static struct ctlops cons_feat_ctl;
 
 static void cons_draw_cursor(struct cons_screen *scr, uint32_t color);
 static int cons_handle_special(struct cons_screen *scr, char c);
@@ -233,8 +235,14 @@ cons_handle_special(struct cons_screen *scr, char c)
 static void
 cons_draw_cursor(struct cons_screen *scr, uint32_t color)
 {
+    struct console_feat *featp;
     size_t idx;
 
+    featp = &scr->feat;
+    if (!featp->show_curs) {
+        color = scr->bg;
+    }
+
     /* Past screen width? */
     if (scr->curs_col >= scr->ncols) {
         scr->curs_col = 0;
@@ -412,6 +420,53 @@ cons_init_bufs(struct cons_screen *scr)
     return 0;
 }
 
+static int
+ctl_feat_read(struct ctlfs_dev *cdp, struct sio_txn *sio)
+{
+    struct cons_screen *scr = &g_root_scr;
+    struct console_feat *featp;
+
+    if (sio->buf == NULL || sio->len == 0) {
+        return -EINVAL;
+    }
+
+    featp = &scr->feat;
+    if (sio->len > sizeof(*featp)) {
+        sio->len = sizeof(*featp);
+    }
+
+    memcpy(sio->buf, featp, sio->len);
+    return sio->len;
+}
+
+static int
+ctl_feat_write(struct ctlfs_dev *cdp, struct sio_txn *sio)
+{
+    struct cons_screen *scr = &g_root_scr;
+    struct console_feat *featp, oldfeat;
+
+    featp = &scr->feat;
+    oldfeat = *featp;
+    if (sio->len > sizeof(*featp)) {
+        sio->len = sizeof(*featp);
+    }
+
+    memcpy(featp, sio->buf, sio->len);
+
+    /*
+     * If we are suddenly trying to reset the cursor
+     * status, redraw it.
+     */
+    if (featp->show_curs != oldfeat.show_curs) {
+        if (featp->show_curs == 0) {
+            HIDE_CURSOR(scr);
+        } else {
+            SHOW_CURSOR(scr);
+        }
+    }
+    return sio->len;
+}
+
 /*
  * Reset console color.
  */
@@ -492,6 +547,7 @@ cons_init(void)
 
     featp = &g_root_scr.feat;
     featp->ansi_esc = 1;
+    featp->show_curs = 1;
     g_root_scr.ch_col = 0;
     g_root_scr.ch_row = 0;
     g_root_scr.fg = CONSOLE_FG;
@@ -512,6 +568,7 @@ void
 cons_expose(void)
 {
     static int once = 0;
+    struct ctlfs_dev ctl;
     char devname[] = "console";
     devmajor_t major;
     dev_t dev;
@@ -526,6 +583,13 @@ cons_expose(void)
     dev = dev_alloc(major);
     dev_register(major, dev, &cons_cdevsw);
     devfs_create_entry(devname, major, dev, 0444);
+
+    /* Register the control file */
+    ctl.mode = 0666;
+    ctlfs_create_node(devname, &ctl);
+    ctl.devname = devname;
+    ctl.ops = &cons_feat_ctl;
+    ctlfs_create_entry("feat", &ctl);
     once ^= 1;
 }
 
@@ -533,3 +597,8 @@ static struct cdevsw cons_cdevsw = {
     .read = dev_read,
     .write = dev_write
 };
+
+static struct ctlops cons_feat_ctl = {
+    .read = ctl_feat_read,
+    .write = ctl_feat_write
+};