removed waiting for CTS in serial out and reinstated the serial output by default...

[bootcensus] / src / serial.c

diff --git a/src/serial.c b/src/serial.c
index c707591..e833672 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -1,3 +1,20 @@
+/*
+pcboot - bootable PC demo/game kernel
+Copyright (C) 2018  John Tsiombikas <nuclear@member.fsf.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY, without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
 #include <stdio.h>
 #include <string.h>
 #include "serial.h"
@@ -211,8 +228,13 @@ static int can_send(int fd)
 void ser_putc(int fd, char c)
 {
        int base = ports[fd].base;
+
+       if(c == '\n') {
+               ser_putc(fd, '\r');
+       }
+
        while(!can_send(fd));
-       while((inb(base + UART_MSTAT) & MST_CTS) == 0);
+       /*while((inb(base + UART_MSTAT) & MST_CTS) == 0);*/
        outb(c, base + UART_DATA);
 }