More ICH2-specific code diked out.

[netwatch.git] / lib / serial.c

diff --git a/lib/serial.c b/lib/serial.c
index 5318c95ae733f3e7a5b117768b33d05a4b064625..95d830062c6aa7d8ccad55aa4ccb53ed43072b34 100644 (file)
--- a/lib/serial.c
+++ b/lib/serial.c
@@ -1,3 +1,13 @@
+/* serial.c
+ * Serial output routines.
+ * NetWatch system management mode administration console
+ *
+ * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.
+ * This program is free software; you can redistribute and/or modify it under
+ * the terms found in the file LICENSE in the root of this source tree.
+ *
+ */
+

 #include <minilib.h>
 #include <io.h>
 
 #include <minilib.h>
 #include <io.h>
 


@@ -33,10 +43,10 @@ unsigned char _inb(unsigned short port)
 void serial_init()
 {
        unsigned short baud = SER_BAUD_REQ / SER_BAUD_BASE;
 void serial_init()
 {
        unsigned short baud = SER_BAUD_REQ / SER_BAUD_BASE;

-       _outb(SER_LCR, inb(SER_LCR) | SER_LCR_DLAB);
+       _outb(SER_LCR, _inb(SER_LCR) | SER_LCR_DLAB);

        _outb(SER_DLL, baud & 0xFF);
        _outb(SER_DLM, baud >> 8);
        _outb(SER_DLL, baud & 0xFF);
        _outb(SER_DLM, baud >> 8);

-       _outb(SER_LCR, inb(SER_LCR) & ~SER_LCR_DLAB);
+       _outb(SER_LCR, _inb(SER_LCR) & ~SER_LCR_DLAB);

        _outb(SER_IER, 0x0);
        _outb(SER_FCR, 0x0);    /* FIFOs off */
        _outb(SER_LCR, 0x03);   /* 8 data bits, one stop bit, no parity */
        _outb(SER_IER, 0x0);
        _outb(SER_FCR, 0x0);    /* FIFOs off */
        _outb(SER_LCR, 0x03);   /* 8 data bits, one stop bit, no parity */


@@ -44,7 +54,9 @@ void serial_init()
 
 void serial_tx(unsigned char c)
 {
 
 void serial_tx(unsigned char c)
 {

-       while (!(_inb(SER_LSR) & SER_LSR_THR_EMPTY))
+       int i = 100000;
+       
+       while (!(_inb(SER_LSR) & SER_LSR_THR_EMPTY) && (i--))

                ;
        _outb(SER_THR, c);
 }
                ;
        _outb(SER_THR, c);
 }