From 3d1cd5d83b07686e67de5c311e28372c175ddc9f Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Sun, 12 May 2024 19:30:28 -0400
Subject: kernel: vcons: Don't touch termios

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 sys/dev/vcons/vcons_io.c      | 8 +++-----
 sys/include/dev/vcons/vcons.h | 1 -
 sys/kern/kern_syslog.c        | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/vcons/vcons_io.c b/sys/dev/vcons/vcons_io.c
index a3d6042..4c0151a 100644
--- a/sys/dev/vcons/vcons_io.c
+++ b/sys/dev/vcons/vcons_io.c
@@ -52,17 +52,15 @@ vcons_expand_tab(struct vcons_screen *scr)
 int
 vcons_process_output(struct vcons_screen *scr, int c)
 {
-    struct termios termios = scr->termios;
     struct vcons_cursor *cursor = &scr->cursor;
 
     switch (c) {
     case ASCII_LF:
-        if (__TEST(termios.c_oflag, OCRNL)) {
-            scr->cpy_x = 0;
-            cursor->xpos = 0;
-        }
         scr->cpy_y++;
         cursor->ypos += FONT_HEIGHT;
+
+        scr->cpy_x = 0;
+        cursor->xpos = 0;
         break;
     case ASCII_CR:
         scr->cpy_x = 0;
diff --git a/sys/include/dev/vcons/vcons.h b/sys/include/dev/vcons/vcons.h
index 801075a..492940f 100644
--- a/sys/include/dev/vcons/vcons.h
+++ b/sys/include/dev/vcons/vcons.h
@@ -60,7 +60,6 @@ struct vcons_screen {
 
     struct fbdev fbdev;
     struct vcons_cursor cursor;
-    struct termios termios;
 };
 
 #define is_cursor_drawing(screenptr) (screenptr)->cursor.is_drawing
diff --git a/sys/kern/kern_syslog.c b/sys/kern/kern_syslog.c
index c30f31a..fe996e4 100644
--- a/sys/kern/kern_syslog.c
+++ b/sys/kern/kern_syslog.c
@@ -76,7 +76,6 @@ syslog_init(void)
 
     g_syslog_screen.bg = 0x000000;
     g_syslog_screen.fg = 0x808080;
-    g_syslog_screen.termios = termios;
 
     vcons_attach(&g_syslog_screen);
 }
-- 
cgit v1.2.3