- Fix bugs.

- Enable serial output.


svn path=/trunk/; revision=45373
This commit is contained in:
evb 2010-02-01 19:28:40 +00:00
parent fc22be1381
commit 5024029061
5 changed files with 9 additions and 7 deletions

View file

@ -12,7 +12,7 @@ int
putchar(int c)
{
/* Write to the serial port */
// LlbSerialPutChar(c);
LlbSerialPutChar(c);
/* Write to the screen too */
LlbVideoPutChar(c);

View file

@ -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());

View file

@ -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

View file

@ -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++)

View file

@ -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);
}