[ros-diffs] [evb] 45373: - Fix bugs. - Enable serial output.

[evb at svn.reactos.org]

Author: evb
Date: Mon Feb  1 20:28:40 2010
New Revision: 45373

URL: http://svn.reactos.org/svn/reactos?rev=45373&view=rev
Log:
- Fix bugs.
- Enable serial output.


Modified:
    trunk/reactos/boot/armllb/crtsupp.c
    trunk/reactos/boot/armllb/hw/serial.c
    trunk/reactos/boot/armllb/hw/versatile/hwuart.c
    trunk/reactos/boot/armllb/hw/video.c
    trunk/reactos/boot/armllb/main.c

Modified: trunk/reactos/boot/armllb/crtsupp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/crtsupp.c?rev=45373&r1=45372&r2=45373&view=diff
==============================================================================
--- trunk/reactos/boot/armllb/crtsupp.c [iso-8859-1] (original)
+++ trunk/reactos/boot/armllb/crtsupp.c [iso-8859-1] Mon Feb  1 20:28:40 2010
@@ -12,7 +12,7 @@
 putchar(int c)
 {
     /* Write to the serial port */
-//    LlbSerialPutChar(c);
+    LlbSerialPutChar(c);
     
     /* Write to the screen too */
     LlbVideoPutChar(c);

Modified: trunk/reactos/boot/armllb/hw/serial.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/serial.c?rev=45373&r1=45372&r2=45373&view=diff
==============================================================================
--- trunk/reactos/boot/armllb/hw/serial.c [iso-8859-1] (original)
+++ trunk/reactos/boot/armllb/hw/serial.c [iso-8859-1] Mon Feb  1 20:28:40 2010
@@ -13,7 +13,7 @@
 LlbSerialPutChar(IN CHAR c)
 {
     /* Properly support new-lines */
-    if (c == '\n') LlbSerialPutChar('\r');
+ //   if (c == '\n') LlbSerialPutChar('\r');
  
     /* Wait for ready */
     while (!LlbHwUartTxReady());

Modified: trunk/reactos/boot/armllb/hw/versatile/hwuart.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/hwuart.c?rev=45373&r1=45372&r2=45373&view=diff
==============================================================================
--- trunk/reactos/boot/armllb/hw/versatile/hwuart.c [iso-8859-1] (original)
+++ trunk/reactos/boot/armllb/hw/versatile/hwuart.c [iso-8859-1] Mon Feb  1 20:28:40 2010
@@ -45,6 +45,7 @@
 /* FUNCTIONS ******************************************************************/
 
 VOID
+NTAPI
 LlbHwVersaUartInitialize(VOID)
 {
     ULONG Divider, Remainder, Fraction, ClockRate, Baudrate;
@@ -92,7 +93,7 @@
 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

Modified: trunk/reactos/boot/armllb/hw/video.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/video.c?rev=45373&r1=45372&r2=45373&view=diff
==============================================================================
--- trunk/reactos/boot/armllb/hw/video.c [iso-8859-1] (original)
+++ trunk/reactos/boot/armllb/hw/video.c [iso-8859-1] Mon Feb  1 20:28:40 2010
@@ -281,7 +281,8 @@
     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 @@
     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++)

Modified: trunk/reactos/boot/armllb/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/main.c?rev=45373&r1=45372&r2=45373&view=diff
==============================================================================
--- trunk/reactos/boot/armllb/main.c [iso-8859-1] (original)
+++ trunk/reactos/boot/armllb/main.c [iso-8859-1] Mon Feb  1 20:28:40 2010
@@ -18,7 +18,7 @@
     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);
 }