Support to multi-threading and pthread interface (POSIX.1-2008) (#23)

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

diff --git a/lunaix-os/hal/term/term_io.c b/lunaix-os/hal/term/term_io.c
index 729e5496b083bc22e51b2bac9ec1c31f407c0152..b1115c83c9a4cd5e22cfb119ddd0548e926b6806 100644 (file)
--- a/lunaix-os/hal/term/term_io.c
+++ b/lunaix-os/hal/term/term_io.c
@@ -26,14 +26,14 @@ do_read_raw(struct term* tdev)
 
     while (sz <= min && dt <= expr) {
         // XXX should we held the device lock while we are waiting?
 
     while (sz <= min && dt <= expr) {
         // XXX should we held the device lock while we are waiting?

-        sched_yieldk();
+        sched_pass();

         dt = clock_systime() - t;
         t += dt;
 
         max_lb_sz -= sz;
 
         // TODO pass a flags to read to indicate it is non blocking ops
         dt = clock_systime() - t;
         t += dt;
 
         max_lb_sz -= sz;
 
         // TODO pass a flags to read to indicate it is non blocking ops

-        sz += chdev->ops.read_async(chdev, inbuffer, sz, max_lb_sz);
+        sz += chdev->ops.read_async(chdev, &inbuffer[sz], 0, max_lb_sz);

     }
 
     rbuffer_puts(line_in->next, inbuffer, sz);
     }
 
     rbuffer_puts(line_in->next, inbuffer, sz);


@@ -61,7 +61,6 @@ term_read_noncano(struct term* tdev)
 {
     struct device* chdev = tdev->chdev;
     return do_read_raw(tdev);
 {
     struct device* chdev = tdev->chdev;
     return do_read_raw(tdev);

-    ;

 }
 
 static int
 }
 
 static int


@@ -94,26 +93,35 @@ term_read(struct term* tdev)
 int
 term_flush(struct term* tdev)
 {
 int
 term_flush(struct term* tdev)
 {

-    if ((tdev->oflags & _OPOST)) {
-        lcntl_transform_inseq(tdev);
-    }
-

     struct linebuffer* line_out = &tdev->line_out;
     struct linebuffer* line_out = &tdev->line_out;

-    size_t xmit_len = line_out->current->len;
-    void* xmit_buf = line_out->next->buffer;
+    char* xmit_buf = tdev->scratch_pad;
+    lbuf_ref_t current_ref = ref_current(line_out);

 
 

-    rbuffer_gets(line_out->current, xmit_buf, xmit_len);
+    int count = 0;

 
 

-    off_t off = 0;
-    int ret = 0;
-    while (xmit_len && ret >= 0) {
-        ret = tdev->chdev->ops.write(tdev->chdev, xmit_buf, off, xmit_len);
-        xmit_len -= ret;
-        off += ret;
-    }
+    while (!rbuffer_empty(deref(current_ref))) {
+        if ((tdev->oflags & _OPOST)) {
+            lcntl_transform_outseq(tdev);
+        }
+
+        size_t xmit_len = line_out->current->len;

 
 

-    // put back the left over if transmittion went south
-    rbuffer_puts(line_out->current, xmit_buf, xmit_len);
+        rbuffer_gets(line_out->current, xmit_buf, xmit_len);
+
+        off_t off = 0;
+        int ret = 0;
+        while (xmit_len && ret >= 0) {
+            ret = tdev->chdev->ops.write(tdev->chdev, &xmit_buf[off], 0, xmit_len);
+            xmit_len -= ret;
+            off += ret;
+            count += ret;
+        }
+
+        // put back the left over if transmittion went south
+        rbuffer_puts(line_out->current, xmit_buf, xmit_len);
+
+        line_flip(line_out);
+    }

 
 

-    return off;
+    return count;

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