1 files changed, 139 insertions, 0 deletions

diff --git a/sys/dev/cons/cons.c b/sys/dev/cons/cons.c
index 3eb7c33..9921ff8 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;
@@ -335,6 +343,7 @@ cons_fast_putch(struct cons_screen *scr, char c)
 static int
 dev_write(dev_t dev, struct sio_txn *sio, int flags)
 {
+    cons_attach();
     cons_putstr(&g_root_scr, sio->buf, sio->len);
     cons_flush(&g_root_scr);
     return sio->len;
@@ -364,6 +373,7 @@ dev_read(dev_t dev, struct sio_txn *sio, int flags)
         return -EAGAIN;
     }
 
+    cons_attach();
     spinlock_acquire(&g_root_scr.lock);
     for (;;) {
         /* Buffer too small */
@@ -412,6 +422,116 @@ 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;
+}
+
+/*
+ * Detach the currently running process from the
+ * console.
+ */
+int
+cons_detach(void)
+{
+    struct cons_screen *scr;
+
+    scr = &g_root_scr;
+    if (scr->atproc == NULL) {
+        return 0;
+    }
+    if (scr->atproc_lock == NULL) {
+        return 0;
+    }
+
+    scr = &g_root_scr;
+    scr->atproc = NULL;
+    mutex_release(scr->atproc_lock);
+    return 0;
+}
+
+/*
+ * Attach the current process to the
+ * console.
+ */
+int
+cons_attach(void)
+{
+    struct cons_screen *scr;
+    struct proc *td, *atproc;
+
+    td = this_td();
+    if (td == NULL) {
+        return -1;
+    }
+
+    scr = &g_root_scr;
+    if (scr->atproc_lock == NULL) {
+        return 0;
+    }
+
+    scr = &g_root_scr;
+    atproc = scr->atproc;
+
+    if (atproc != NULL) {
+        if (atproc->pid == td->pid) {
+            return 0;
+        }
+
+        /*
+         * Do not release this here as we want
+         * any other process that tries to attach
+         * to wait.
+         */
+        mutex_acquire(scr->atproc_lock, 0);
+    }
+
+    scr->atproc = td;
+    return 0;
+}
+
 /*
  * Reset console color.
  */
@@ -492,6 +612,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;
@@ -500,6 +621,8 @@ cons_init(void)
     g_root_scr.nrows = fbdev.height / FONT_HEIGHT;
     g_root_scr.ncols = fbdev.width / FONT_WIDTH;
     g_root_scr.fbdev = fbdev;
+    g_root_scr.atproc = NULL;
+    g_root_scr.atproc_lock = NULL;
     memset(&g_root_scr.lock, 0, sizeof(g_root_scr.lock));
     cons_init_bufs(&g_root_scr);
     SHOW_CURSOR(&g_root_scr);
@@ -512,6 +635,7 @@ void
 cons_expose(void)
 {
     static int once = 0;
+    struct ctlfs_dev ctl;
     char devname[] = "console";
     devmajor_t major;
     dev_t dev;
@@ -521,11 +645,21 @@ cons_expose(void)
         return;
     }
 
+    /* Init the attached proc mutex lock */
+    g_root_scr.atproc_lock = mutex_new("console0");
+
     /* Register the device here */
     major = dev_alloc_major();
     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 +667,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
+};