X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/59ecf21e36b2332f6adf2a568ef555283d8c119a..0165ff6162aa6546f9f471edff7eed8672c3159b:/lunaix-os/hal/term/term.c

diff --git a/lunaix-os/hal/term/term.c b/lunaix-os/hal/term/term.c
index b566c55..160b629 100644
--- a/lunaix-os/hal/term/term.c
+++ b/lunaix-os/hal/term/term.c
@@ -18,6 +18,8 @@ static struct term_lcntl* line_controls[] = {[ANSI_LCNTL] =
 
 static struct devclass termdev = DEVCLASS(DEVIF_NON, DEVFN_TTY, DEV_VTERM);
 
+struct device* sysconsole = NULL;
+
 static int
 term_exec_cmd(struct device* dev, u32_t req, va_list args)
 {
@@ -27,94 +29,79 @@ term_exec_cmd(struct device* dev, u32_t req, va_list args)
     device_lock(dev);
 
     switch (req) {
-    case TIOCSPGRP: {
-        pid_t pgid = va_arg(args, pid_t);
-        if (pgid < 0) {
-            err = EINVAL;
-            goto done;
-        }
-        term->fggrp = pgid;
-        break;
-    }
-    case TIOCGPGRP:
-        return term->fggrp;
-    case TDEV_TCPUSHLC: {
-        u32_t lcntl_idx = va_arg(args, u32_t);
-        struct term_lcntl* lcntl = term_get_lcntl(lcntl_idx);
-
-        if (!lcntl) {
-            err = EINVAL;
-            goto done;
-        }
-
-        term_push_lcntl(term, lcntl);
-        break;
-    }
-    case TDEV_TCPOPLC:
-        term_pop_lcntl(term);
-        break;
-    case TDEV_TCSETCHDEV: {
-        int fd = va_arg(args, int);
-        struct v_fd* vfd;
-
-        if (vfs_getfd(fd, &vfd)) {
-            err = EINVAL;
-            goto done;
-        }
-
-        struct device* cdev = device_cast(vfd->file->inode->data);
-        if (!cdev) {
-            err = ENOTDEV;
-            goto done;
-        }
-        if (cdev->dev_type != DEV_IFSEQ) {
-            err = EINVAL;
-            goto done;
+        case TIOCSPGRP: {
+            pid_t pgid = va_arg(args, pid_t);
+            if (pgid < 0) {
+                err = EINVAL;
+                goto done;
+            }
+            term->fggrp = pgid;
+            break;
         }
+        case TIOCGPGRP:
+            return term->fggrp;
+        case TDEV_TCSETCHDEV: {
+            int fd = va_arg(args, int);
+            struct v_fd* vfd;
+
+            if (vfs_getfd(fd, &vfd)) {
+                err = EINVAL;
+                goto done;
+            }
 
-        term_bind(term, cdev);
-        break;
-    }
-    case TDEV_TCGETCHDEV: {
-        struct dev_info* devinfo = va_arg(args, struct dev_info*);
+            struct device* cdev = resolve_device(vfd->file->inode->data);
+            if (!cdev) {
+                err = ENOTDEV;
+                goto done;
+            }
+            if (cdev->dev_type != DEV_IFSEQ) {
+                err = EINVAL;
+                goto done;
+            }
 
-        if (!term->chdev) {
-            err = ENODEV;
-            goto done;
+            term_bind(term, cdev);
+            break;
         }
+        case TDEV_TCGETCHDEV: {
+            struct dev_info* devinfo = va_arg(args, struct dev_info*);
 
-        if (devinfo) {
-            device_populate_info(term->chdev, devinfo);
-        }
-        break;
-    }
-    case TDEV_TCGETATTR: {
-        struct _termios* tios = va_arg(args, struct _termios*);
-        *tios = (struct _termios){.c_oflag = term->oflags,
-                                  .c_iflag = term->iflags,
-                                  .c_lflag = term->lflags};
-        memcpy(tios->c_cc, term->cc, _NCCS * sizeof(cc_t));
-        tios->c_baud = term->iospeed;
-    } break;
-    case TDEV_TCSETATTR: {
-        struct _termios* tios = va_arg(args, struct _termios*);
-        term->iflags = tios->c_iflag;
-        term->oflags = tios->c_oflag;
-        term->lflags = tios->c_lflag;
-        memcpy(term->cc, tios->c_cc, _NCCS * sizeof(cc_t));
-
-        if (tios->c_baud != term->iospeed) {
-            term->iospeed = tios->c_baud;
-            if (!term->chdev_ops.set_speed) {
+            if (!term->chdev) {
+                err = ENODEV;
                 goto done;
             }
 
-            term->chdev_ops.set_speed(term->chdev, tios->c_baud);
+            if (devinfo) {
+                device_populate_info(term->chdev, devinfo);
+            }
+            break;
         }
-    } break;
-    default:
-        err = EINVAL;
-        goto done;
+        case TDEV_TCGETATTR: {
+            struct _termios* tios = va_arg(args, struct _termios*);
+            *tios = (struct _termios){.c_oflag = term->oflags,
+                                      .c_iflag = term->iflags,
+                                      .c_lflag = term->lflags};
+            memcpy(tios->c_cc, term->cc, _NCCS * sizeof(cc_t));
+            tios->c_baud = term->iospeed;
+        } break;
+        case TDEV_TCSETATTR: {
+            struct _termios* tios = va_arg(args, struct _termios*);
+            term->iflags = tios->c_iflag;
+            term->oflags = tios->c_oflag;
+            term->lflags = tios->c_lflag;
+            memcpy(term->cc, tios->c_cc, _NCCS * sizeof(cc_t));
+
+            if (tios->c_baud != term->iospeed) {
+                term->iospeed = tios->c_baud;
+                if (!term->chdev_ops.set_speed) {
+                    goto done;
+                }
+
+                term->chdev_ops.set_speed(term->chdev, tios->c_baud);
+            }
+        } break;
+        default:
+            err = EINVAL;
+            goto done;
     }
 
 done:
@@ -129,13 +116,17 @@ tdev_do_write(struct device* dev, void* buf, size_t offset, size_t len)
     lbuf_ref_t current = ref_current(&tdev->line_out);
     size_t wrsz = 0;
     while (wrsz < len) {
-        wrsz += rbuffer_puts(deref(current), &((char*)buf)[offset + wrsz],
-                             len - wrsz);
+        wrsz += rbuffer_puts(
+            deref(current), &((char*)buf)[offset + wrsz], len - wrsz);
+
         if (rbuffer_full(deref(current))) {
             term_flush(tdev);
         }
     }
-
+    
+    if (!rbuffer_empty(deref(current))) {
+        term_flush(tdev);
+    }
     return 0;
 }
 
@@ -152,14 +143,23 @@ tdev_do_read(struct device* dev, void* buf, size_t offset, size_t len)
             cont = term_read(tdev);
         }
 
-        rdsz += rbuffer_gets(deref(current), &((char*)buf)[offset + rdsz],
-                             len - rdsz);
+        rdsz += rbuffer_gets(
+            deref(current), &((char*)buf)[offset + rdsz], len - rdsz);
     }
 
     return rdsz;
 }
 
-static cc_t default_cc[_NCCS] = {4, '\n', 8, 3, 1, 24, 22, 0, 0, 1, 1};
+static cc_t default_cc[_NCCS] = {4, '\n', 0x7f, 3, 1, 24, 22, 0, 0, 1, 1};
+
+static void 
+load_default_setting(struct term* tdev) 
+{
+    tdev->lflags = _ICANON | _IEXTEN | _ISIG | _ECHO | _ECHOE | _ECHONL;
+    tdev->iflags = _ICRNL | _IGNBRK;
+    tdev->oflags = _ONLCR | _OPOST;
+    memcpy(tdev->cc, default_cc, _NCCS * sizeof(cc_t));
+}
 
 struct term*
 term_create(struct device* chardev, char* suffix)
@@ -176,20 +176,20 @@ term_create(struct device* chardev, char* suffix)
     terminal->dev->ops.read = tdev_do_read;
     terminal->dev->ops.write = tdev_do_write;
 
-    llist_init_head(&terminal->lcntl_stack);
+    // TODO choice of lcntl can be flexible
+    terminal->lcntl = line_controls[ANSI_LCNTL];
+
     line_alloc(&terminal->line_in, 1024);
     line_alloc(&terminal->line_out, 1024);
 
     if (chardev) {
         int cdev_var = DEV_VAR_FROM(chardev->ident.unique);
-        device_register(terminal->dev, &termdev, "tty%s%d", suffix, cdev_var);
+        register_device(terminal->dev, &termdev, "tty%s%d", suffix, cdev_var);
     } else {
-        device_register(terminal->dev, &termdev, "tty%d", termdev.variant++);
+        register_device(terminal->dev, &termdev, "tty%d", termdev.variant++);
     }
 
-    terminal->lflags = _ICANON | _IEXTEN | _ISIG | _ECHO;
-    terminal->iflags = _ICRNL;
-    memcpy(terminal->cc, default_cc, _NCCS * sizeof(cc_t));
+    load_default_setting(terminal);
 
     return terminal;
 }
@@ -206,57 +206,6 @@ term_bind(struct term* term, struct device* chdev)
     return 0;
 }
 
-struct term_lcntl*
-term_get_lcntl(u32_t lcntl_index)
-{
-    if (lcntl_index >= LCNTL_TABLE_LEN) {
-        return NULL;
-    }
-
-    struct term_lcntl* lcntl_template = line_controls[lcntl_index];
-    struct term_lcntl* lcntl_instance = valloc(sizeof(struct term_lcntl));
-
-    if (!lcntl_instance) {
-        return NULL;
-    }
-
-    lcntl_instance->process_and_put = lcntl_template->process_and_put;
-
-    return lcntl_instance;
-}
-
-int
-term_push_lcntl(struct term* term, struct term_lcntl* lcntl)
-{
-    device_lock(term->dev);
-
-    llist_append(&term->lcntl_stack, &lcntl->lcntls);
-
-    device_unlock(term->dev);
-
-    return 0;
-}
-
-int
-term_pop_lcntl(struct term* term)
-{
-    if (term->lcntl_stack.prev == &term->lcntl_stack) {
-        return 0;
-    }
-
-    device_lock(term->dev);
-
-    struct term_lcntl* lcntl =
-        list_entry(term->lcntl_stack.prev, struct term_lcntl, lcntls);
-    llist_delete(term->lcntl_stack.prev);
-
-    vfree(lcntl);
-
-    device_unlock(term->dev);
-
-    return 1;
-}
-
 void
 line_alloc(struct linebuffer* lbf, size_t sz_hlf)
 {