Second Extended Filesystem (ext2) and other improvements (#33)

[lunaix-os.git] / lunaix-os / hal / term / term.c

diff --git a/lunaix-os/hal/term/term.c b/lunaix-os/hal/term/term.c
index 160b62981a7a5b10cda1eb8f4169f4c64dce719e..9f65d386beb1a1b3e1cd4f3b4b7b066111f5a9d0 100644 (file)
--- a/lunaix-os/hal/term/term.c
+++ b/lunaix-os/hal/term/term.c
@@ -8,15 +8,11 @@
 
 #include <usr/lunaix/ioctl_defs.h>
 
 
 #include <usr/lunaix/ioctl_defs.h>
 

-#define ANSI_LCNTL 0

 #define termdev(dev) ((struct term*)(dev)->underlay)
 
 #define termdev(dev) ((struct term*)(dev)->underlay)
 

-extern struct term_lcntl ansi_line_controller;
-static struct term_lcntl* line_controls[] = {[ANSI_LCNTL] =
-                                                 &ansi_line_controller};

 #define LCNTL_TABLE_LEN (sizeof(line_controls) / sizeof(struct term_lcntl*))
 
 #define LCNTL_TABLE_LEN (sizeof(line_controls) / sizeof(struct term_lcntl*))
 

-static struct devclass termdev = DEVCLASS(DEVIF_NON, DEVFN_TTY, DEV_VTERM);
+static struct devclass termdev_class = DEVCLASS(DEVIF_NON, DEVFN_TTY, DEV_VTERM);

 
 struct device* sysconsole = NULL;
 
 
 struct device* sysconsole = NULL;
 


@@ -76,27 +72,40 @@ term_exec_cmd(struct device* dev, u32_t req, va_list args)
             break;
         }
         case TDEV_TCGETATTR: {
             break;
         }
         case TDEV_TCGETATTR: {

-            struct _termios* tios = va_arg(args, struct _termios*);
-            *tios = (struct _termios){.c_oflag = term->oflags,
+            struct termios* tios = va_arg(args, struct termios*);
+            *tios = (struct termios){.c_oflag = term->oflags,

                                       .c_iflag = term->iflags,
                                       .c_iflag = term->iflags,

-                                      .c_lflag = term->lflags};
+                                      .c_lflag = term->lflags,
+                                      .c_cflag = term->cflags};

             memcpy(tios->c_cc, term->cc, _NCCS * sizeof(cc_t));
             tios->c_baud = term->iospeed;
         } break;
         case TDEV_TCSETATTR: {
             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*);
+            struct termport_cap_ops* cap_ops;
+            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));
 
             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));
 

+            tcflag_t old_cf = term->cflags;
+            term->cflags = tios->c_cflag;
+
+            if (!term->tp_cap) {
+                goto done;
+            }
+
+            cap_ops = term->tp_cap->cap_ops;
+

             if (tios->c_baud != term->iospeed) {
                 term->iospeed = tios->c_baud;
             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);
+                cap_ops->set_speed(term->chdev, tios->c_baud);
+            }
+
+            if (old_cf != tios->c_cflag) {
+                cap_ops->set_cntrl_mode(term->chdev, tios->c_cflag);

             }
         } break;
         default:
             }
         } break;
         default:


@@ -110,14 +119,14 @@ done:
 }
 
 static int
 }
 
 static int

-tdev_do_write(struct device* dev, void* buf, size_t offset, size_t len)
+tdev_do_write(struct device* dev, void* buf, off_t fpos, size_t len)

 {
     struct term* tdev = termdev(dev);
     lbuf_ref_t current = ref_current(&tdev->line_out);
     size_t wrsz = 0;
     while (wrsz < len) {
         wrsz += rbuffer_puts(
 {
     struct term* tdev = termdev(dev);
     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);
+            deref(current), &((char*)buf)[wrsz], len - wrsz);

 
         if (rbuffer_full(deref(current))) {
             term_flush(tdev);
 
         if (rbuffer_full(deref(current))) {
             term_flush(tdev);


@@ -127,26 +136,24 @@ tdev_do_write(struct device* dev, void* buf, size_t offset, size_t len)
     if (!rbuffer_empty(deref(current))) {
         term_flush(tdev);
     }
     if (!rbuffer_empty(deref(current))) {
         term_flush(tdev);
     }

-    return 0;
+    return wrsz;

 }
 
 static int
 }
 
 static int

-tdev_do_read(struct device* dev, void* buf, size_t offset, size_t len)
+tdev_do_read(struct device* dev, void* buf, off_t fpos, size_t len)

 {
     struct term* tdev = termdev(dev);
     lbuf_ref_t current = ref_current(&tdev->line_in);
     bool cont = true;
     size_t rdsz = 0;
 {
     struct term* tdev = termdev(dev);
     lbuf_ref_t current = ref_current(&tdev->line_in);
     bool cont = true;
     size_t rdsz = 0;

-    while (cont && rdsz < len) {
-        if (rbuffer_empty(deref(current))) {
-            tdev->line_in.sflags = 0;
-            cont = term_read(tdev);
-        }

 
 

+    while (cont && rdsz < len) {
+        cont = term_read(tdev);

         rdsz += rbuffer_gets(
         rdsz += rbuffer_gets(

-            deref(current), &((char*)buf)[offset + rdsz], len - rdsz);
+            deref(current), &((char*)buf)[rdsz], len - rdsz);

     }
     }

-
+    
+    tdev->line_in.sflags = 0;

     return rdsz;
 }
 
     return rdsz;
 }
 


@@ -158,37 +165,62 @@ load_default_setting(struct term* tdev)
     tdev->lflags = _ICANON | _IEXTEN | _ISIG | _ECHO | _ECHOE | _ECHONL;
     tdev->iflags = _ICRNL | _IGNBRK;
     tdev->oflags = _ONLCR | _OPOST;
     tdev->lflags = _ICANON | _IEXTEN | _ISIG | _ECHO | _ECHOE | _ECHONL;
     tdev->iflags = _ICRNL | _IGNBRK;
     tdev->oflags = _ONLCR | _OPOST;

+    tdev->iospeed = _B9600;

     memcpy(tdev->cc, default_cc, _NCCS * sizeof(cc_t));
 }
 
     memcpy(tdev->cc, default_cc, _NCCS * sizeof(cc_t));
 }
 

+static void
+alloc_term_buffer(struct term* terminal, size_t sz_hlf) 
+{
+    line_alloc(&terminal->line_in, sz_hlf);
+    line_alloc(&terminal->line_out, sz_hlf);
+    terminal->scratch_pad = valloc(sz_hlf);
+}
+

 struct term*
 term_create(struct device* chardev, char* suffix)
 {
 struct term*
 term_create(struct device* chardev, char* suffix)
 {

-    struct term* terminal = vzalloc(sizeof(struct term));
+    struct term* terminal;
+    struct device* tdev;
+    struct capability_meta* termport_cap;
+    struct capability_meta* tios_cap;

 
 

+    terminal = vzalloc(sizeof(struct term));

     if (!terminal) {
         return NULL;
     }
 
     if (!terminal) {
         return NULL;
     }
 

-    terminal->dev = device_allocseq(NULL, terminal);
+    tdev = device_allocseq(NULL, terminal);
+    terminal->dev = tdev;

     terminal->chdev = chardev;
 
     terminal->chdev = chardev;
 

-    terminal->dev->ops.read = tdev_do_read;
-    terminal->dev->ops.write = tdev_do_write;
+    tdev->ops.read = tdev_do_read;
+    tdev->ops.write = tdev_do_write;
+    tdev->ops.exec_cmd = term_exec_cmd;

 
 

-    // TODO choice of lcntl can be flexible
-    terminal->lcntl = line_controls[ANSI_LCNTL];
+    waitq_init(&terminal->line_in_event);

 
 

-    line_alloc(&terminal->line_in, 1024);
-    line_alloc(&terminal->line_out, 1024);
+    alloc_term_buffer(terminal, 1024);

 
     if (chardev) {
         int cdev_var = DEV_VAR_FROM(chardev->ident.unique);
 
     if (chardev) {
         int cdev_var = DEV_VAR_FROM(chardev->ident.unique);

-        register_device(terminal->dev, &termdev, "tty%s%d", suffix, cdev_var);
+        register_device(tdev, &termdev_class, "tty%s%d", suffix, cdev_var);

     } else {
     } else {

-        register_device(terminal->dev, &termdev, "tty%d", termdev.variant++);
+        register_device(tdev, &termdev_class, "tty%d", termdev_class.variant++);

     }
 
     }
 

+    termport_cap = device_get_capability(chardev, TERMPORT_CAP);
+    if (termport_cap) {
+        terminal->tp_cap = 
+            get_capability(termport_cap, struct termport_capability);
+        
+        assert(terminal->tp_cap->cap_ops);
+        terminal->tp_cap->term = terminal;
+    }
+
+    tios_cap = new_capability_marker(TERMIOS_CAP);
+    device_grant_capability(tdev, tios_cap);
+

     load_default_setting(terminal);
 
     return terminal;
     load_default_setting(terminal);
 
     return terminal;


@@ -228,6 +260,6 @@ void
 term_sendsig(struct term* tdev, int signal)
 {
     if ((tdev->lflags & _ISIG)) {
 term_sendsig(struct term* tdev, int signal)
 {
     if ((tdev->lflags & _ISIG)) {

-        proc_setsignal(get_process(tdev->fggrp), signal);
+        signal_send(-tdev->fggrp, signal);

     }
 }
\ No newline at end of file
     }
 }
\ No newline at end of file