From 50240290618b54316803b1a22808a043e5d55eae Mon Sep 17 00:00:00 2001
From: evb <evb@svn.reactos.org>
Date: Mon, 1 Feb 2010 19:28:40 +0000
Subject: [PATCH] - Fix bugs. - Enable serial output.

svn path=/trunk/; revision=45373
---
 reactos/boot/armllb/crtsupp.c             | 2 +-
 reactos/boot/armllb/hw/serial.c           | 2 +-
 reactos/boot/armllb/hw/versatile/hwuart.c | 3 ++-
 reactos/boot/armllb/hw/video.c            | 7 ++++---
 reactos/boot/armllb/main.c                | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/reactos/boot/armllb/crtsupp.c b/reactos/boot/armllb/crtsupp.c
index b5a7723a262..9f70b17cc3e 100644
--- a/reactos/boot/armllb/crtsupp.c
+++ b/reactos/boot/armllb/crtsupp.c
@@ -12,7 +12,7 @@ int
 putchar(int c)
 {
     /* Write to the serial port */
-//    LlbSerialPutChar(c);
+    LlbSerialPutChar(c);
     
     /* Write to the screen too */
     LlbVideoPutChar(c);
diff --git a/reactos/boot/armllb/hw/serial.c b/reactos/boot/armllb/hw/serial.c
index 7bb09cf744d..e5507b65ba3 100755
--- a/reactos/boot/armllb/hw/serial.c
+++ b/reactos/boot/armllb/hw/serial.c
@@ -13,7 +13,7 @@ NTAPI
 LlbSerialPutChar(IN CHAR c)
 {
     /* Properly support new-lines */
-    if (c == '\n') LlbSerialPutChar('\r');
+ //   if (c == '\n') LlbSerialPutChar('\r');
  
     /* Wait for ready */
     while (!LlbHwUartTxReady());
diff --git a/reactos/boot/armllb/hw/versatile/hwuart.c b/reactos/boot/armllb/hw/versatile/hwuart.c
index f2aa6f114be..a3ae386957c 100755
--- a/reactos/boot/armllb/hw/versatile/hwuart.c
+++ b/reactos/boot/armllb/hw/versatile/hwuart.c
@@ -45,6 +45,7 @@ static const ULONG LlbHwVersaUartBase = 0x101F1000;
 /* FUNCTIONS ******************************************************************/
 
 VOID
+NTAPI
 LlbHwVersaUartInitialize(VOID)
 {
     ULONG Divider, Remainder, Fraction, ClockRate, Baudrate;
@@ -92,7 +93,7 @@ NTAPI
 LlbHwUartTxReady(VOID)
 {
     /* TX output buffer is ready? */
-    return (READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF);    
+    return ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) == 0);
 }
 
 ULONG
diff --git a/reactos/boot/armllb/hw/video.c b/reactos/boot/armllb/hw/video.c
index 2835e6ff9c5..8d446f6b172 100644
--- a/reactos/boot/armllb/hw/video.c
+++ b/reactos/boot/armllb/hw/video.c
@@ -281,7 +281,8 @@ LlbVideoDrawChar(IN CHAR c,
     PUSHORT Buffer;
     PCHAR Pixels;
     CHAR Line;
-    ULONG x, y, ScreenWidth;
+    ULONG y, ScreenWidth;
+    LONG x;
     PUSHORT VideoBuffer;
     
     /* Get screen width and frame buffer */
@@ -289,8 +290,8 @@ LlbVideoDrawChar(IN CHAR c,
     VideoBuffer = LlbHwGetFrameBuffer();
 
     /* Compute starting address on-screen and in the character-array */
-    buffer = VideoBuffer + ScreenWidth * cy + cx;
-    pixels = LlbHwBootFont + c * 8;
+    Buffer = VideoBuffer + ScreenWidth * cy + cx;
+    Pixels = LlbHwBootFont + c * 8;
 
     /* Loop y pixels */
     for (y = 0; y < 8; y++)
diff --git a/reactos/boot/armllb/main.c b/reactos/boot/armllb/main.c
index 80fc05aafb5..c936f4444f5 100755
--- a/reactos/boot/armllb/main.c
+++ b/reactos/boot/armllb/main.c
@@ -18,7 +18,7 @@ LlbStartup(VOID)
     LlbVideoClearScreen();
 
     /* Print header */
-    printf("ReactOS ARM Low-Level Boot Loader [" __DATE__ " "__TIME__ "]\n\n");
+    printf("ReactOS ARM Low-Level Boot Loader [" __DATE__ " "__TIME__ "]\n");
     while (TRUE);
 }
 
-- 
2.17.1