Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[sir_richard] 45381: [NTOS]: Yet another fix for KiEnterInterruptTrap: Set correct DS/ES before touching the TrapFrame. [NTOS]: Make this operation an inline so any possible future code will not make this mistake twice. Thanks to Physicus for the bug report.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Feb 2 23:56:13 2010 New Revision: 45381 URL: http://svn.reactos.org/svn/reactos?rev=45381&view=rev Log: [NTOS]: Yet another fix for KiEnterInterruptTrap: Set correct DS/ES before touching the TrapFrame. [NTOS]: Make this operation an inline so any possible future code will not make this mistake twice. Thanks to Physicus for the bug report. Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Tue Feb 2 23:56:13 2010 @@ -490,7 +490,31 @@ : "r"(TrapFrame->SegCs) ); } - + +VOID +FORCEINLINE +KiSetSaneSegments(IN PKTRAP_FRAME TrapFrame) +{ + ULONG Ds, Es; + + /* + * We really have to get a good DS/ES first before touching any data. + * + * These two reads will either go in a register (with optimizations ON) or + * a stack variable (which is on SS:ESP, guaranteed to be good/valid). + * + * Because the assembly is marked volatile, the order of instructions is + * as-is, otherwise the optimizer could simply get rid of our DS/ES. + * + */ + Ds = Ke386GetDs(); + Es = Ke386GetEs(); + Ke386SetDs(KGDT_R3_DATA | RPL_MASK); + Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + TrapFrame->SegDs = Ds; + TrapFrame->SegEs = Es; +} + // // Generic Exit Routine // @@ -700,8 +724,6 @@ FORCEINLINE KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) { - ULONG Ds, Es; - /* Check for V86 mode, otherwise check for ring 3 code */ if (__builtin_expect(KiIsV8086TrapSafe(TrapFrame), 0)) { @@ -718,14 +740,9 @@ } else if (__builtin_expect(KiIsUserTrapSafe(TrapFrame), 1)) /* Ring 3 is more common */ { - /* Save DS/ES and load correct values */ - Es = Ke386GetEs(); - Ds = Ke386GetDs(); - TrapFrame->SegDs = Ds; - TrapFrame->SegEs = Es; - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - + /* Switch to sane segments */ + KiSetSaneSegments(TrapFrame); + /* Save FS/GS */ TrapFrame->SegFs = Ke386GetFs(); TrapFrame->SegGs = Ke386GetGs(); @@ -760,24 +777,8 @@ FORCEINLINE KiEnterTrap(IN PKTRAP_FRAME TrapFrame) { - ULONG Ds, Es; - - /* - * We really have to get a good DS/ES first before touching any data. - * - * These two reads will either go in a register (with optimizations ON) or - * a stack variable (which is on SS:ESP, guaranteed to be good/valid). - * - * Because the assembly is marked volatile, the order of instructions is - * as-is, otherwise the optimizer could simply get rid of our DS/ES. - * - */ - Ds = Ke386GetDs(); - Es = Ke386GetEs(); - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - TrapFrame->SegDs = Ds; - TrapFrame->SegEs = Es; + /* Switch to sane segments */ + KiSetSaneSegments(TrapFrame); /* Now we can save the other segments and then switch to the correct FS */ TrapFrame->SegFs = Ke386GetFs();

14 years, 7 months

[cwittich] 45380: [FREELDR] fix a typo

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Feb 2 18:28:10 2010 New Revision: 45380 URL: http://svn.reactos.org/svn/reactos?rev=45380&view=rev Log: [FREELDR] fix a typo Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Tue Feb 2 18:28:10 2010 @@ -1597,7 +1597,7 @@ FrLdrStartup(IN ULONG Magic) { // - // Disable interrupts (aleady done) + // Disable interrupts (already done) // //

14 years, 7 months

[evb] 45379: - Change ARM loading architecture to match EFI/Firmware model. LLB provides "firmware" routines, FreeLDR obtains "firmware" routines from the ARM block, and sets them as the Machine VTable. All board-specific FreeLDR code gone now. - Start work on UI. Serial output is now only for debugging, not usual console. - Need PL045 Keyboard code to handle KbHit/GetCh. - Have PL011 code ready for MachVideo routines, coming soon... - Start stub of environment functions.

by evb＠svn.reactos.org

Author: evb Date: Tue Feb 2 18:21:19 2010 New Revision: 45379 URL: http://svn.reactos.org/svn/reactos?rev=45379&view=rev Log: - Change ARM loading architecture to match EFI/Firmware model. LLB provides "firmware" routines, FreeLDR obtains "firmware" routines from the ARM block, and sets them as the Machine VTable. All board-specific FreeLDR code gone now. - Start work on UI. Serial output is now only for debugging, not usual console. - Need PL045 Keyboard code to handle KbHit/GetCh. - Have PL011 code ready for MachVideo routines, coming soon... - Start stub of environment functions. Added: trunk/reactos/boot/armllb/envir.c (with props) trunk/reactos/boot/armllb/fw.c (with props) trunk/reactos/boot/armllb/inc/fw.h (with props) Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c Modified: trunk/reactos/boot/armllb/armllb.rbuild trunk/reactos/boot/armllb/crtsupp.c trunk/reactos/boot/armllb/hw/versatile/hwinfo.c trunk/reactos/boot/armllb/hw/video.c trunk/reactos/boot/armllb/inc/hw.h trunk/reactos/boot/armllb/inc/osloader.h trunk/reactos/boot/armllb/inc/precomp.h trunk/reactos/boot/armllb/inc/video.h trunk/reactos/boot/armllb/main.c trunk/reactos/boot/armllb/os/loader.c trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h Modified: trunk/reactos/boot/armllb/armllb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/armllb.rbuild?… ============================================================================== --- trunk/reactos/boot/armllb/armllb.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/armllb.rbuild [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -21,6 +21,8 @@ <file first="true">boot.s</file> <file>main.c</file> <file>crtsupp.c</file> + <file>envir.c</file> + <file>fw.c</file> <directory name="hw"> <file>serial.c</file> <file>video.c</file> Modified: trunk/reactos/boot/armllb/crtsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/crtsupp.c?rev=… ============================================================================== --- trunk/reactos/boot/armllb/crtsupp.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/crtsupp.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -11,11 +11,11 @@ int putchar(int c) { - /* Write to the serial port */ + /* Write to the screen */ + LlbVideoPutChar(c); + + /* For DEBUGGING ONLY */ LlbSerialPutChar(c); - - /* Write to the screen too */ - LlbVideoPutChar(c); return 0; } @@ -32,13 +32,9 @@ unsigned int i; char printbuffer[1024]; - va_start (args, fmt); - - /* For this to work, printbuffer must be larger than - * anything we ever want to print. - */ - i = vsprintf (printbuffer, fmt, args); - va_end (args); + va_start(args, fmt); + i = vsprintf(printbuffer, fmt, args); + va_end(args); /* Print the string */ return puts(printbuffer); Added: trunk/reactos/boot/armllb/envir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/envir.c?rev=45… ============================================================================== --- trunk/reactos/boot/armllb/envir.c (added) +++ trunk/reactos/boot/armllb/envir.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/envir.c + * PURPOSE: LLB Environment Variable Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +PCHAR +NTAPI +LlbEnvRead(IN PCHAR ValueName) +{ + /* FIXME: HACK */ + return "RAMDISK"; +} + +/* EOF */ + Propchange: trunk/reactos/boot/armllb/envir.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/armllb/fw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/fw.c?rev=45379… ============================================================================== --- trunk/reactos/boot/armllb/fw.c (added) +++ trunk/reactos/boot/armllb/fw.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -1,0 +1,36 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/fw.c + * PURPOSE: LLB Firmware Routines (accessible by OS Loader) + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +VOID +LlbFwPutChar(INT Ch) +{ + /* Just call directly the video function */ + LlbVideoPutChar(Ch); + + /* DEBUG ONLY */ + LlbSerialPutChar(Ch); +} + +BOOLEAN +LlbFwKbHit(VOID) +{ + /* Not yet implemented */ + return FALSE; +} + +INT +LlbFwGetCh(VOID) +{ + /* Not yet implemented */ + while (TRUE); + return 0; +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/fw.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/armllb/hw/versatile/hwinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -47,15 +47,4 @@ LlbAllocateMemoryEntry(BiosMemoryReserved, 0x10000000, 128 * 1024 * 1024); } -// -// hwenv.c? or environment.c? or both? -// -PCHAR -NTAPI -LlbHwEnvRead(IN PCHAR Option) -{ - /* HACKFIX */ - return "RAMDISK"; -} - /* EOF */ Modified: trunk/reactos/boot/armllb/hw/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/video.c?rev… ============================================================================== --- trunk/reactos/boot/armllb/hw/video.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/hw/video.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -268,6 +268,28 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; +#if 0 +USHORT ColorPalette[16] = +{ + RGB565(0x00, 0x00, 0x00), + RGB565(0x00, 0x00, 0xAA), + RGB565(0x00, 0xAA, 0x00), + RGB565(0x00, 0xAA, 0xAA), + RGB565(0xAA, 0x00, 0x00), + RGB565(0xAA, 0x00, 0xAA), + RGB565(0xAA, 0x55, 0x00), + RGB565(0xAA, 0xAA, 0xAA), + RGB565(0x55, 0x55, 0x55), + RGB565(0x55, 0x55, 0xFF), + RGB565(0x55, 0xFF, 0x55), + RGB565(0x55, 0xFF, 0xFF), + RGB565(0xFF, 0x55, 0x55), + RGB565(0xFF, 0x55, 0xFF), + RGB565(0xFF, 0xFF, 0x55), + RGB565(0xFF, 0xFF, 0xFF), +}; +#endif + ULONG ScreenCursor; VOID @@ -312,7 +334,7 @@ VOID NTAPI -LlbVideoClearScreen(VOID) +LlbVideoClearScreen(IN BOOLEAN OsLoader) { ULONG ScreenSize, p; ULONG BackColor; @@ -323,8 +345,17 @@ ScreenCursor = 0; /* Backcolor on this machine */ - BackColor = LlbHwVideoCreateColor(14, 0, 82); - BackColor = (BackColor << 16) | BackColor; + if (OsLoader) + { + /* Black */ + BackColor = 0; + } + else + { + /* Deep blue */ + BackColor = LlbHwVideoCreateColor(14, 0, 82); + BackColor = (BackColor << 16) | BackColor; + } /* Screen size on this machine */ ScreenSize = LlbHwGetScreenWidth() * LlbHwGetScreenHeight(); @@ -369,3 +400,4 @@ } /* EOF */ + Added: trunk/reactos/boot/armllb/inc/fw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/fw.h?rev=4… ============================================================================== --- trunk/reactos/boot/armllb/inc/fw.h (added) +++ trunk/reactos/boot/armllb/inc/fw.h [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -1,0 +1,24 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/inc/fw.h + * PURPOSE: LLB Firmware Functions + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +VOID +LlbFwPutChar( + INT Ch +); + +BOOLEAN +LlbFwKbHit( + VOID +); + +INT +LlbFwGetCh( + VOID +); + +/* EOF */ Propchange: trunk/reactos/boot/armllb/inc/fw.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/inc/fw.h ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/reactos/boot/armllb/inc/hw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/hw.h?rev=4… ============================================================================== --- trunk/reactos/boot/armllb/inc/hw.h [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/inc/hw.h [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -92,12 +92,6 @@ VOID ); -PCHAR -NTAPI -LlbHwEnvRead( - IN PCHAR Option -); - #ifdef _VERSATILE_ #include "versa.h" #elif _OMAP3_ Modified: trunk/reactos/boot/armllb/inc/osloader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/osloader.h… ============================================================================== --- trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -14,6 +14,7 @@ IN PVOID BoardInit ); +#ifndef __REGISTRY_H // // Type of memory detected by LLB // @@ -35,12 +36,13 @@ ULONG Type; ULONG Reserved; } BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; +#endif // // Information sent from LLB to OS Loader // #define ARM_BOARD_CONFIGURATION_MAJOR_VERSION 1 -#define ARM_BOARD_CONFIGURATION_MINOR_VERSION 1 +#define ARM_BOARD_CONFIGURATION_MINOR_VERSION 2 typedef struct _ARM_BOARD_CONFIGURATION_BLOCK { ULONG MajorVersion; @@ -52,6 +54,9 @@ ULONG MemoryMapEntryCount; PBIOS_MEMORY_MAP MemoryMap; CHAR CommandLine[256]; + PVOID ConsPutChar; + PVOID ConsKbHit; + PVOID ConsGetCh; } ARM_BOARD_CONFIGURATION_BLOCK, *PARM_BOARD_CONFIGURATION_BLOCK; VOID @@ -92,4 +97,10 @@ IN PCHAR CommandLine ); +PCHAR +NTAPI +LlbEnvRead( + IN PCHAR Option +); + /* EOF */ Modified: trunk/reactos/boot/armllb/inc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/precomp.h?… ============================================================================== --- trunk/reactos/boot/armllb/inc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/inc/precomp.h [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -12,6 +12,7 @@ #include "machtype.h" #include "osloader.h" #include "hw.h" +#include "fw.h" #include "serial.h" #include "video.h" Modified: trunk/reactos/boot/armllb/inc/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/video.h?re… ============================================================================== --- trunk/reactos/boot/armllb/inc/video.h [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/inc/video.h [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -9,7 +9,7 @@ VOID NTAPI LlbVideoClearScreen( - VOID + IN BOOLEAN OsLoader ); VOID Modified: trunk/reactos/boot/armllb/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/main.c?rev=453… ============================================================================== --- trunk/reactos/boot/armllb/main.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/main.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -15,7 +15,7 @@ LlbHwInitialize(); /* Clean up the screen */ - LlbVideoClearScreen(); + LlbVideoClearScreen(FALSE); /* Print header */ printf("ReactOS ARM Low-Level Boot Loader [" __DATE__ " "__TIME__ "]\n"); @@ -25,4 +25,18 @@ while (TRUE); } +VOID +DbgPrint(const char *fmt, ...) +{ + va_list args; + unsigned int i; + char Buffer[1024]; + + va_start(args, fmt); + i = vsprintf(Buffer, fmt, args); + va_end(args); + + while (*Buffer) LlbSerialPutChar(*Buffer); +} + /* EOF */ Modified: trunk/reactos/boot/armllb/os/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/os/loader.c?re… ============================================================================== --- trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -69,6 +69,11 @@ /* Now load the memory map */ ArmBlock.MemoryMap = MemoryMap; + + /* Write firmware callbacks */ + ArmBlock.ConsPutChar = LlbFwPutChar; + ArmBlock.ConsKbHit = LlbFwKbHit; + ArmBlock.ConsGetCh = LlbFwGetCh; } VOID @@ -89,7 +94,7 @@ PCHAR BootDevice; /* Read the current boot device */ - BootDevice = LlbHwEnvRead("boot-device"); + BootDevice = LlbEnvRead("boot-device"); printf("Loading OS Loader from: %s...\n", BootDevice); if (!strcmp(BootDevice, "NAND")) { @@ -109,7 +114,7 @@ { //todo } - printf("OS Loader loaded at 0x%p...JUMP!\n", LoaderInit); + printf("OS Loader loaded at 0x%p...JUMP!\n\n\n\n\n", LoaderInit); } VOID Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/ferouart.c (removed) @@ -1,130 +1,0 @@ -/* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/arch/arm/ferouart.c - * PURPOSE: Implements code for Feroceon boards using the 16550 UART - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <freeldr.h> - -/* GLOBALS ********************************************************************/ - -// -// UART Registers -// -#define UART0_RBR (ArmBoardBlock->UartRegisterBase + 0x00) -#define UART0_THR UART0_RBR -#define UART0_IER (ArmBoardBlock->UartRegisterBase + 0x04) -#define UART0_FCR (ArmBoardBlock->UartRegisterBase + 0x08) -#define UART0_LCR (ArmBoardBlock->UartRegisterBase + 0x0C) -#define UART0_MCR (ArmBoardBlock->UartRegisterBase + 0x10) -#define UART0_LSR (ArmBoardBlock->UartRegisterBase + 0x14) -#define UART0_MSR (ArmBoardBlock->UartRegisterBase + 0x18) -#define UART0_SCR (ArmBoardBlock->UartRegisterBase + 0x1C) - -// -// When we enable the divisor latch -// -#define UART0_DLL UART0_RBR -#define UART0_DLM UART0_IER - -// -// FCR Values -// -#define FCR_FIFO_EN 0x01 -#define FCR_RXSR 0x02 -#define FCR_TXSR 0x04 - -// -// LCR Values -// -#define LCR_WLS_8 0x03 -#define LCR_1_STB 0x00 -#define LCR_DIVL_EN 0x80 -#define LCR_NO_PAR 0x00 - -// -// LSR Values -// -#define LSR_DR 0x01 -#define LSR_THRE 0x20 - -/* FUNCTIONS ******************************************************************/ - -VOID -ArmFeroSerialInit(IN ULONG Baudrate) -{ - ULONG BaudClock; - - // - // Calculate baudrate clock divider to set the baud rate - // - BaudClock = (ArmBoardBlock->ClockRate / 16) / Baudrate; - - // - // Disable interrupts - // - WRITE_REGISTER_UCHAR(UART0_IER, 0); - - // - // Set the baud rate to 115200 bps - // - WRITE_REGISTER_UCHAR(UART0_LCR, LCR_DIVL_EN); - WRITE_REGISTER_UCHAR(UART0_DLL, BaudClock); - WRITE_REGISTER_UCHAR(UART0_DLM, (BaudClock >> 8) & 0xFF); - - // - // Set 8 bits for data, 1 stop bit, no parity - // - WRITE_REGISTER_UCHAR(UART0_LCR, LCR_WLS_8 | LCR_1_STB | LCR_NO_PAR); - - // - // Clear and enable FIFO - // - WRITE_REGISTER_UCHAR(UART0_FCR, FCR_FIFO_EN | FCR_RXSR | FCR_TXSR); -} - -VOID -ArmFeroPutChar(IN INT Char) -{ - // - // Properly support new-lines - // - if (Char == '\n') ArmFeroPutChar('\r'); - - // - // Wait for ready - // - while ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_THRE) == 0); - - // - // Send the character - // - WRITE_REGISTER_UCHAR(UART0_THR, Char); -} - -INT -ArmFeroGetCh(VOID) -{ - // - // Wait for ready - // - while ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_DR) == 0); - - // - // Read the character - // - return READ_REGISTER_UCHAR(UART0_RBR); -} - -BOOLEAN -ArmFeroKbHit(VOID) -{ - // - // Return if something is ready - // - return ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_DR) != 0); -} Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -1607,6 +1607,7 @@ // // Initialize the page directory // + while (TRUE); ArmSetupPageDirectory(); // Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include <freeldr.h> +#define RGB565(r, g, b) (((r >> 3) << 11)| ((g >> 2) << 5)| ((b >> 3) << 0)) /* GLOBALS ********************************************************************/ @@ -33,7 +34,7 @@ ArmBoardBlock = BootContext; // - // Let's make sure we understand the boot-loader + // Let's make sure we understand the LLB // ASSERT(ArmBoardBlock->MajorVersion == ARM_BOARD_CONFIGURATION_MAJOR_VERSION); ASSERT(ArmBoardBlock->MinorVersion == ARM_BOARD_CONFIGURATION_MINOR_VERSION); @@ -133,32 +134,21 @@ // switch (ArmBoardBlock->BoardType) { - // - // Check for Feroceon-base boards - // + // + // Check for Feroceon-base boards + // case MACH_TYPE_FEROCEON: - - // - // These boards use a UART16550. Set us up for 115200 bps - // - ArmFeroSerialInit(115200); - MachVtbl.ConsPutChar = ArmFeroPutChar; - MachVtbl.ConsKbHit = ArmFeroKbHit; - MachVtbl.ConsGetCh = ArmFeroGetCh; break; - // - // Check for ARM Versatile PB boards - // + // + // Check for ARM Versatile PB boards + // case MACH_TYPE_VERSATILE_PB: - // - // These boards use a PrimeCell UART (PL011) - // - ArmVersaSerialInit(115200); - MachVtbl.ConsPutChar = ArmVersaPutChar; - MachVtbl.ConsKbHit = ArmVersaKbHit; - MachVtbl.ConsGetCh = ArmVersaGetCh; + /* Copy Machine Routines from Firmware Table */ + MachVtbl.ConsPutChar = ArmBoardBlock->ConsPutChar; + MachVtbl.ConsKbHit = ArmBoardBlock->ConsKbHit; + MachVtbl.ConsGetCh = ArmBoardBlock->ConsGetCh; break; // @@ -166,14 +156,6 @@ // For now that means only Beagle, but ZOOM and others should be ok too // case MACH_TYPE_OMAP3_BEAGLE: - - // - // These boards use a UART16550 - // - ArmOmap3SerialInit(115200); - MachVtbl.ConsPutChar = ArmOmap3PutChar; - MachVtbl.ConsKbHit = ArmOmap3KbHit; - MachVtbl.ConsGetCh = ArmOmap3GetCh; break; default: @@ -204,5 +186,5 @@ // We can now print to the console // TuiPrintf("%s for ARM\n", GetFreeLoaderVersionString()); - TuiPrintf("Bootargs: %s\n", CommandLine); + TuiPrintf("Bootargs: %s\n\n", CommandLine); } Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/omapuart.c (removed) @@ -1,162 +1,0 @@ -/* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/arch/arm/omapuart.c - * PURPOSE: Implements code for TI OMAP3 boards using the 16550 UART - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <freeldr.h> - -/* GLOBALS ********************************************************************/ - -// -// UART Registers -// -#define UART0_RHR (ArmBoardBlock->UartRegisterBase + 0x00) -#define UART0_THR UART0_RHR -#define UART0_IER (ArmBoardBlock->UartRegisterBase + 0x04) -#define UART0_FCR (ArmBoardBlock->UartRegisterBase + 0x08) -#define UART0_LCR (ArmBoardBlock->UartRegisterBase + 0x0C) -#define UART0_MCR (ArmBoardBlock->UartRegisterBase + 0x10) -#define UART0_LSR (ArmBoardBlock->UartRegisterBase + 0x14) -#define UART0_MDR1 (ArmBoardBlock->UartRegisterBase + 0x20) - -// -// When we enable the divisor latch -// -#define UART0_DLL UART0_RHR -#define UART0_DLH UART0_IER - -// -// FCR Values -// -#define FCR_FIFO_EN 0x01 -#define FCR_RXSR 0x02 -#define FCR_TXSR 0x04 - -// -// LCR Values -// -#define LCR_WLS_8 0x03 -#define LCR_1_STB 0x00 -#define LCR_DIVL_EN 0x80 -#define LCR_NO_PAR 0x00 - -// -// LSR Values -// -#define LSR_DR 0x01 -#define LSR_THRE 0x20 - -// -// MCR Values -// -#define MCR_DTR 0x01 -#define MCR_RTS 0x02 - -// -// MDR1 Modes -// -#define MDR1_UART16X 1 -#define MDR1_SIR 2 -#define MDR1_UART16X_AUTO_BAUD 3 -#define MDR1_UART13X 4 -#define MDR1_MIR 5 -#define MDR1_FIR 6 -#define MDR1_CIR 7 -#define MDR1_DISABLE 8 - -/* FUNCTIONS ******************************************************************/ - -VOID -ArmOmap3SerialInit(IN ULONG Baudrate) -{ - ULONG BaudClock; - - // - // Calculate baudrate clock divider to set the baud rate - // - BaudClock = (ArmBoardBlock->ClockRate / 16) / Baudrate; - - // - // Disable serial port - // - WRITE_REGISTER_UCHAR(UART0_MDR1, MDR1_DISABLE); - - // - // Disable interrupts - // - WRITE_REGISTER_UCHAR(UART0_IER, 0); - - // - // Set the baud rate to 115200 bps - // - WRITE_REGISTER_UCHAR(UART0_LCR, LCR_DIVL_EN); - WRITE_REGISTER_UCHAR(UART0_DLL, BaudClock); - WRITE_REGISTER_UCHAR(UART0_DLH, (BaudClock >> 8) & 0xFF); - - // - // Setup loopback - // - WRITE_REGISTER_UCHAR(UART0_MCR, MCR_DTR | MCR_RTS); - - // - // Set 8 bits for data, 1 stop bit, no parity - // - WRITE_REGISTER_UCHAR(UART0_LCR, LCR_WLS_8 | LCR_1_STB | LCR_NO_PAR); - - // - // Clear and enable FIFO - // - WRITE_REGISTER_UCHAR(UART0_FCR, FCR_FIFO_EN | FCR_RXSR | FCR_TXSR); - - // - // Enable serial port - // - WRITE_REGISTER_UCHAR(UART0_MDR1, MDR1_UART16X); -} - -VOID -ArmOmap3PutChar(IN INT Char) -{ - // - // Properly support new-lines - // - if (Char == '\n') ArmOmap3PutChar('\r'); - - // - // Wait for ready - // - while ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_THRE) == 0); - - // - // Send the character - // - WRITE_REGISTER_UCHAR(UART0_THR, Char); -} - -INT -ArmOmap3GetCh(VOID) -{ - // - // Wait for ready - // - while ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_DR) == 0); - - // - // Read the character - // - return READ_REGISTER_UCHAR(UART0_RHR); -} - -BOOLEAN -ArmOmap3KbHit(VOID) -{ - // - // Return if something is ready - // - return ((READ_REGISTER_UCHAR(UART0_LSR) & LSR_DR) != 0); -} Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/versuart.c (removed) @@ -1,132 +1,0 @@ -/* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/arch/arm/versuart.c - * PURPOSE: Implements code for Versatile boards using the PL011 UART - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <freeldr.h> - -/* GLOBALS ********************************************************************/ - -// -// UART Registers -// -#define UART_PL01x_DR (ArmBoardBlock->UartRegisterBase + 0x00) -#define UART_PL01x_RSR (ArmBoardBlock->UartRegisterBase + 0x04) -#define UART_PL01x_ECR (ArmBoardBlock->UartRegisterBase + 0x04) -#define UART_PL01x_FR (ArmBoardBlock->UartRegisterBase + 0x18) -#define UART_PL011_IBRD (ArmBoardBlock->UartRegisterBase + 0x24) -#define UART_PL011_FBRD (ArmBoardBlock->UartRegisterBase + 0x28) -#define UART_PL011_LCRH (ArmBoardBlock->UartRegisterBase + 0x2C) -#define UART_PL011_CR (ArmBoardBlock->UartRegisterBase + 0x30) -#define UART_PL011_IMSC (ArmBoardBlock->UartRegisterBase + 0x38) - -// -// LCR Values -// -#define UART_PL011_LCRH_WLEN_8 0x60 -#define UART_PL011_LCRH_FEN 0x10 - -// -// FCR Values -// -#define UART_PL011_CR_UARTEN 0x01 -#define UART_PL011_CR_TXE 0x100 -#define UART_PL011_CR_RXE 0x200 - -// -// LSR Values -// -#define UART_PL01x_FR_RXFE 0x10 -#define UART_PL01x_FR_TXFF 0x20 - -/* FUNCTIONS ******************************************************************/ - -VOID -ArmVersaSerialInit(IN ULONG Baudrate) -{ - ULONG Divider, Remainder, Fraction; - - // - // Calculate baudrate clock divider and remainder - // - Divider = ArmBoardBlock->ClockRate / (16 * Baudrate); - Remainder = ArmBoardBlock->ClockRate % (16 * Baudrate); - - // - // Calculate the fractional part - // - Fraction = (8 * Remainder / Baudrate) >> 1; - Fraction += (8 * Remainder / Baudrate) & 1; - - // - // Disable interrupts - // - WRITE_REGISTER_ULONG(UART_PL011_CR, 0); - - // - // Set the baud rate to 115200 bps - // - WRITE_REGISTER_ULONG(UART_PL011_IBRD, Divider); - WRITE_REGISTER_ULONG(UART_PL011_FBRD, Fraction); - - // - // Set 8 bits for data, 1 stop bit, no parity, FIFO enabled - // - WRITE_REGISTER_ULONG(UART_PL011_LCRH, - UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN); - - // - // Clear and enable FIFO - // - WRITE_REGISTER_ULONG(UART_PL011_CR, - UART_PL011_CR_UARTEN | - UART_PL011_CR_TXE | - UART_PL011_CR_RXE); -} - -VOID -ArmVersaPutChar(IN INT Char) -{ - // - // Properly support new-lines - // - if (Char == '\n') ArmVersaPutChar('\r'); - - // - // Wait for ready - // - while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); - - // - // Send the character - // - WRITE_REGISTER_ULONG(UART_PL01x_DR, Char); -} - -INT -ArmVersaGetCh(VOID) -{ - // - // Wait for ready - // - while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_RXFE) != 0); - - // - // Read the character - // - return READ_REGISTER_ULONG(UART_PL01x_DR); -} - -BOOLEAN -ArmVersaKbHit(VOID) -{ - // - // Return if something is ready - // - return ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_RXFE) == 0); -} Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -32,8 +32,14 @@ <library>rtl</library> <library>libcntpr</library> <group linkerset="ld"> + <linkerflag>-static</linkerflag> <linkerflag>-lgcc</linkerflag> - <linkerflag>-Wl,--image-base=0x80FFF000</linkerflag> + <if property="SARCH" value="omap3"> + <linkerflag>-Wl,--image-base=0x80FFF000</linkerflag> + </if> + <if property="SARCH" value="versatile"> + <linkerflag>-Wl,--image-base=0x007FF000</linkerflag> + </if> </group> </module> </if> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -73,11 +73,8 @@ <directory name="arm"> <if property="ARCH" value="arm"> <file first="true">boot.s</file> - <file>ferouart.c</file> <file>loader.c</file> <file>macharm.c</file> - <file>omapuart.c</file> - <file>versuart.c</file> </if> </directory> Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Tue Feb 2 18:21:19 2010 @@ -13,41 +13,8 @@ #include "../../reactos/registry.h" #endif -// -// Marvell Feroceon-based SoC: -// Buffalo Linkstation, KuroBox Pro, D-Link DS323 and others -// -#define MACH_TYPE_FEROCEON 526 - -// -// ARM Versatile PB: -// qemu-system-arm -M versatilepb, RealView Development Boards and others -// -#define MACH_TYPE_VERSATILE_PB 387 - -// -// TI Beagle Board, OMAP3530 SoC -// qemu-system-arm -M beagle, Beagle Board -// -#define MACH_TYPE_OMAP3_BEAGLE 1546 - -// -// Compatible boot-loaders should return us this information -// -#define ARM_BOARD_CONFIGURATION_MAJOR_VERSION 1 -#define ARM_BOARD_CONFIGURATION_MINOR_VERSION 1 -typedef struct _ARM_BOARD_CONFIGURATION_BLOCK -{ - ULONG MajorVersion; - ULONG MinorVersion; - ULONG BoardType; - ULONG ClockRate; - ULONG TimerRegisterBase; - ULONG UartRegisterBase; - ULONG MemoryMapEntryCount; - PBIOS_MEMORY_MAP MemoryMap; - CHAR CommandLine[256]; -} ARM_BOARD_CONFIGURATION_BLOCK, *PARM_BOARD_CONFIGURATION_BLOCK; +#include "../../../../../armllb/inc/osloader.h" +#include "../../../../../armllb/inc/machtype.h" // // Static heap for ARC Hardware Component Tree @@ -79,42 +46,6 @@ OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey ); -VOID -ArmFeroSerialInit(IN ULONG Baudrate); - -VOID -ArmFeroPutChar(IN INT Char); - -INT -ArmFeroGetCh(VOID); - -BOOLEAN -ArmFeroKbHit(VOID); - -VOID -ArmOmap3SerialInit(IN ULONG Baudrate); - -VOID -ArmOmap3PutChar(IN INT Char); - -INT -ArmOmap3GetCh(VOID); - -BOOLEAN -ArmOmap3KbHit(VOID); - -VOID -ArmVersaSerialInit(IN ULONG Baudrate); - -VOID -ArmVersaPutChar(IN INT Char); - -INT -ArmVersaGetCh(VOID); - -BOOLEAN -ArmVersaKbHit(VOID); - extern PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; #endif

14 years, 7 months

[tkreuzer] 45378: Update Doxyfile to version 1.6.2 with the following changes: - INHERIT_DOCS enabled - SEPARATE_MEMBER_PAGES enabled: will prevent incredible huge html files generated from large headers. - Add *.cc and *.hxx extensions - REFERENCED_BY_RELATION enabled - VERBATIM_HEADERS disabled - ENABLE_PREPROCESSING enabled, so we can see macros, too

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 2 01:23:59 2010 New Revision: 45378 URL: http://svn.reactos.org/svn/reactos?rev=45378&view=rev Log: Update Doxyfile to version 1.6.2 with the following changes: - INHERIT_DOCS enabled - SEPARATE_MEMBER_PAGES enabled: will prevent incredible huge html files generated from large headers. - Add *.cc and *.hxx extensions - REFERENCED_BY_RELATION enabled - VERBATIM_HEADERS disabled - ENABLE_PREPROCESSING enabled, so we can see macros, too Modified: trunk/reactos/Doxyfile Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=45378&r1=4537… ============================================================================== --- trunk/reactos/Doxyfile [iso-8859-1] (original) +++ trunk/reactos/Doxyfile [iso-8859-1] Tue Feb 2 01:23:59 2010 @@ -1,4 +1,4 @@ -# Doxyfile 1.5.8 +# Doxyfile 1.6.2 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -54,11 +54,11 @@ # information to generate all constant output in the proper language. # The default language is English, other supported languages are: # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, -# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, -# Spanish, Swedish, and Ukrainian. +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English @@ -124,7 +124,7 @@ # If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = . +STRIP_FROM_PATH = # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells @@ -169,13 +169,13 @@ # member inherits the documentation from any documented member that it # re-implements. -INHERIT_DOCS = NO +INHERIT_DOCS = YES # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce # a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. -SEPARATE_MEMBER_PAGES = NO +SEPARATE_MEMBER_PAGES = YES # The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. @@ -224,7 +224,8 @@ # the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, # Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat # .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C +# use: inc=Fortran f=C. Note that for custom extensions you also need to set +# FILE_PATTERNS otherwise the files are not read by doxygen. EXTENSION_MAPPING = @@ -396,6 +397,12 @@ SHOW_INCLUDE_FILES = YES +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. @@ -414,6 +421,16 @@ # declaration order. SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the # hierarchy of group names into alphabetical order. If set to NO (the default) @@ -591,11 +608,13 @@ # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = *.c \ + *.cc \ *.cxx \ *.cpp \ *.c++ \ *.h \ *.hh \ + *.hxx \ *.hpp \ *.idl @@ -644,7 +663,7 @@ # and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = * # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be # searched for input files to be used with the \include or \dontinclude @@ -710,7 +729,7 @@ # then for each documented function all documented # functions referencing it will be listed. -REFERENCED_BY_RELATION = NO +REFERENCED_BY_RELATION = YES # If the REFERENCES_RELATION tag is set to YES # then for each documented function all documented entities @@ -737,7 +756,7 @@ # will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. -VERBATIM_HEADERS = YES +VERBATIM_HEADERS = NO #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index @@ -803,6 +822,12 @@ # stylesheet in the HTML output directory as well, or it will be erased! HTML_STYLESHEET = + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = NO # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, # files or namespaces will be aligned in HTML using tables. If set to @@ -937,6 +962,23 @@ QHG_LOCATION = +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + # The DISABLE_INDEX tag can be used to turn on/off the condensed index at # top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. @@ -950,20 +992,18 @@ # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. -# If the tag value is set to FRAME, a side panel will be generated +# If the tag value is set to YES, a side panel will be generated # containing a tree-like index structure (just like the one that # is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. Other possible values -# for this tag are: HIERARCHIES, which will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list; -# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which -# disables this behavior completely. For backwards compatibility with previous -# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE -# respectively. - -GENERATE_TREEVIEW = NONE +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # used to set the initial width (in pixels) of the frame in which the tree @@ -979,6 +1019,26 @@ FORMULA_FONTSIZE = 10 +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = YES + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -995,7 +1055,10 @@ LATEX_OUTPUT = latex # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. LATEX_CMD_NAME = latex @@ -1054,6 +1117,13 @@ # in the output. LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output @@ -1206,14 +1276,14 @@ PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- # If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will # evaluate all C-preprocessor directives found in the sources and include # files. -ENABLE_PREPROCESSING = NO +ENABLE_PREPROCESSING = YES # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro # names in the source code. If set to NO (the default) only conditional @@ -1272,7 +1342,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- # The TAGFILES option can be used to specify one or more tagfiles. @@ -1315,7 +1385,7 @@ PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will @@ -1507,14 +1577,3 @@ # the various graphs. DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Options related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = YES - -SERVER_BASED_SEARCH = YES

14 years, 7 months

[evb] 45377: - More fixes - Plugin support for booting FreeLDR when used as initrd on QEMU command-line.

by evb＠svn.reactos.org

Author: evb Date: Tue Feb 2 01:14:14 2010 New Revision: 45377 URL: http://svn.reactos.org/svn/reactos?rev=45377&view=rev Log: - More fixes - Plugin support for booting FreeLDR when used as initrd on QEMU command-line. Modified: trunk/reactos/boot/armllb/hw/serial.c trunk/reactos/boot/armllb/hw/versatile/hwinfo.c trunk/reactos/boot/armllb/hw/versatile/hwinit.c trunk/reactos/boot/armllb/inc/hw.h trunk/reactos/boot/armllb/inc/osloader.h trunk/reactos/boot/armllb/main.c trunk/reactos/boot/armllb/os/loader.c Modified: trunk/reactos/boot/armllb/hw/serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/serial.c?re… ============================================================================== --- trunk/reactos/boot/armllb/hw/serial.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/hw/serial.c [iso-8859-1] Tue Feb 2 01:14:14 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/hwinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] Tue Feb 2 01:14:14 2010 @@ -19,7 +19,7 @@ NTAPI LlbHwGetPClk(VOID) { - return 0x24000000; + return 24000000; } ULONG @@ -36,4 +36,26 @@ return 0; } +VOID +NTAPI +LlbHwBuildMemoryMap(IN PBIOS_MEMORY_MAP MemoryMap) +{ + /* For now, hard-code 128MB of RAM starting at 0x00000000 */ + LlbAllocateMemoryEntry(BiosMemoryUsable, 0x00000000, 128 * 1024 * 1024); + + /* Mark MMIO space as reserved */ + LlbAllocateMemoryEntry(BiosMemoryReserved, 0x10000000, 128 * 1024 * 1024); +} + +// +// hwenv.c? or environment.c? or both? +// +PCHAR +NTAPI +LlbHwEnvRead(IN PCHAR Option) +{ + /* HACKFIX */ + return "RAMDISK"; +} + /* EOF */ Modified: trunk/reactos/boot/armllb/hw/versatile/hwinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwinit.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/hw/versatile/hwinit.c [iso-8859-1] Tue Feb 2 01:14:14 2010 @@ -19,4 +19,16 @@ LlbHwVersaUartInitialize(); } +// +// Should go to hwdev.c +// +POSLOADER_INIT +NTAPI +LlbHwLoadOsLoaderFromRam(VOID) +{ + /* The OS Loader should have already been loaded by QEMU at the right place */ + return (POSLOADER_INIT)0x800000; +} + + /* EOF */ Modified: trunk/reactos/boot/armllb/inc/hw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/hw.h?rev=4… ============================================================================== --- trunk/reactos/boot/armllb/inc/hw.h [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/inc/hw.h [iso-8859-1] Tue Feb 2 01:14:14 2010 @@ -80,6 +80,24 @@ VOID ); +VOID +NTAPI +LlbHwBuildMemoryMap( + IN PBIOS_MEMORY_MAP MemoryMap +); + +POSLOADER_INIT +NTAPI +LlbHwLoadOsLoaderFromRam( + VOID +); + +PCHAR +NTAPI +LlbHwEnvRead( + IN PCHAR Option +); + #ifdef _VERSATILE_ #include "versa.h" #elif _OMAP3_ Modified: trunk/reactos/boot/armllb/inc/osloader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/osloader.h… ============================================================================== --- trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] Tue Feb 2 01:14:14 2010 @@ -10,7 +10,7 @@ // OS Loader Main Routine // typedef -VOID (*OSLOADER_INIT)( +VOID (*POSLOADER_INIT)( IN PVOID BoardInit ); @@ -54,4 +54,42 @@ CHAR CommandLine[256]; } ARM_BOARD_CONFIGURATION_BLOCK, *PARM_BOARD_CONFIGURATION_BLOCK; +VOID +NTAPI +LlbAllocateMemoryEntry( + IN BIOS_MEMORY_TYPE Type, + IN ULONG BaseAddress, + IN ULONG Length +); + +VOID +NTAPI +LlbSetCommandLine( + IN PCHAR CommandLine +); + +VOID +NTAPI +LlbBuildArmBlock( + VOID +); + +VOID +NTAPI +LlbBuildMemoryMap( + VOID +); + +VOID +NTAPI +LlbLoadOsLoader( + VOID +); + +VOID +NTAPI +LlbBoot( + IN PCHAR CommandLine +); + /* EOF */ Modified: trunk/reactos/boot/armllb/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/main.c?rev=453… ============================================================================== --- trunk/reactos/boot/armllb/main.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/main.c [iso-8859-1] Tue Feb 2 01:14:14 2010 @@ -19,6 +19,9 @@ /* Print header */ printf("ReactOS ARM Low-Level Boot Loader [" __DATE__ " "__TIME__ "]\n"); + + /* Boot the OS Loader */ + LlbBoot(""); while (TRUE); } Modified: trunk/reactos/boot/armllb/os/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/os/loader.c?re… ============================================================================== --- trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] Tue Feb 2 01:14:14 2010 @@ -10,12 +10,13 @@ BIOS_MEMORY_MAP MemoryMap[32]; ARM_BOARD_CONFIGURATION_BLOCK ArmBlock; - +POSLOADER_INIT LoaderInit; + VOID NTAPI -AllocateMemoryEntry(IN BIOS_MEMORY_TYPE Type, - IN ULONG BaseAddress, - IN ULONG Length) +LlbAllocateMemoryEntry(IN BIOS_MEMORY_TYPE Type, + IN ULONG BaseAddress, + IN ULONG Length) { PBIOS_MEMORY_MAP Entry; @@ -37,6 +38,7 @@ LlbSetCommandLine(IN PCHAR CommandLine) { /* Copy the command line in the ARM block */ + printf("Command Line %s\n", CommandLine); strcpy(ArmBlock.CommandLine, CommandLine); } @@ -58,8 +60,76 @@ ArmBlock.TimerRegisterBase = LlbHwGetTmr0Base(); ArmBlock.UartRegisterBase = LlbHwGetUartBase(LlbHwGetSerialUart()); + /* Debug */ + printf("Machine Identifier: %lx\nPCLK: %d\nTIMER 0: %p\nSERIAL UART: %p\n", + ArmBlock.BoardType, + ArmBlock.ClockRate, + ArmBlock.TimerRegisterBase, + ArmBlock.UartRegisterBase); + /* Now load the memory map */ ArmBlock.MemoryMap = MemoryMap; } +VOID +NTAPI +LlbBuildMemoryMap(VOID) +{ + /* Zero out the memory map */ + memset(MemoryMap, 0, sizeof(MemoryMap)); + + /* Call the hardware-specific function */ + LlbHwBuildMemoryMap(MemoryMap); +} + +VOID +NTAPI +LlbLoadOsLoader(VOID) +{ + PCHAR BootDevice; + + /* Read the current boot device */ + BootDevice = LlbHwEnvRead("boot-device"); + printf("Loading OS Loader from: %s...\n", BootDevice); + if (!strcmp(BootDevice, "NAND")) + { + // todo + } + else if (!strcmp(BootDevice, "RAMDISK")) + { + /* Call the hardware-specific function */ + LoaderInit = LlbHwLoadOsLoaderFromRam(); + } + else if (!strcmp(BootDevice, "MMC") || + !strcmp(BootDevice, "SD")) + { + //todo + } + else if (!strcmp(BootDevice, "HDD")) + { + //todo + } + printf("OS Loader loaded at 0x%p...JUMP!\n", LoaderInit); +} + +VOID +NTAPI +LlbBoot(IN PCHAR CommandLine) +{ + /* Setup the ARM block */ + LlbBuildArmBlock(); + + /* Build the memory map */ + LlbBuildMemoryMap(); + + /* Set the command-line */ + LlbSetCommandLine(CommandLine); + + /* Load the OS loader */ + LlbLoadOsLoader(); + + /* Jump to the OS Loader (FreeLDR in this case) */ + LoaderInit(&ArmBlock); +} + /* EOF */

14 years, 7 months

[evb] 45376: - Forgot to change SARCH back to Versatile.

by evb＠svn.reactos.org

Author: evb Date: Mon Feb 1 22:07:03 2010 New Revision: 45376 URL: http://svn.reactos.org/svn/reactos?rev=45376&view=rev Log: - Forgot to change SARCH back to Versatile. Modified: trunk/reactos/config-arm.template.rbuild Modified: trunk/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild… ============================================================================== --- trunk/reactos/config-arm.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-arm.template.rbuild [iso-8859-1] Mon Feb 1 22:07:03 2010 @@ -18,7 +18,7 @@ kurobox versatile omap3 --> -<property name="SARCH" value="omap3" /> +<property name="SARCH" value="versatile" /> <!--

14 years, 7 months

[dgoette] 45375: acivate server based search for doxygen

by dgoette＠svn.reactos.org

Author: dgoette Date: Mon Feb 1 21:16:42 2010 New Revision: 45375 URL: http://svn.reactos.org/svn/reactos?rev=45375&view=rev Log: acivate server based search for doxygen Modified: trunk/reactos/Doxyfile Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=45375&r1=4537… ============================================================================== --- trunk/reactos/Doxyfile [iso-8859-1] (original) +++ trunk/reactos/Doxyfile [iso-8859-1] Mon Feb 1 21:16:42 2010 @@ -1516,3 +1516,5 @@ # used. If set to NO the values of all tags below this one will be ignored. SEARCHENGINE = YES + +SERVER_BASED_SEARCH = YES

14 years, 7 months

[ekohl] 45374: Reset a services thread and process ids when the service has been stopped. Fixes one more test.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 1 20:45:50 2010 New Revision: 45374 URL: http://svn.reactos.org/svn/reactos?rev=45374&view=rev Log: Reset a services thread and process ids when the service has been stopped. Fixes one more test. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Feb 1 20:45:50 2010 @@ -643,6 +643,14 @@ if ((dwError == ERROR_SUCCESS) && (pcbBytesNeeded)) dwError = ERROR_DEPENDENT_SERVICES_RUNNING; + + if (dwError == ERROR_SUCCESS && + dwControl == SERVICE_CONTROL_STOP && + lpServiceStatus->dwCurrentState == SERVICE_STOPPED) + { + lpService->ProcessId = 0; /* FIXME */ + lpService->ThreadId = 0; + } /* Return service status information */ RtlCopyMemory(lpServiceStatus,

14 years, 7 months

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

by evb＠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=… ============================================================================== --- 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?re… ============================================================================== --- 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/h… ============================================================================== --- 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… ============================================================================== --- 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=453… ============================================================================== --- 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); }

14 years, 7 months

[evb] 45372: - ARM LLB for OMAP3/Beagle (test with QEMU-Maemo) and Versatile (test with QEMU). - Boots to blue screen with white text to indicate checkpoint. - More cleanup/work needed. - Will post Wiki on testing info soon.

by evb＠svn.reactos.org

Author: evb Date: Mon Feb 1 19:33:24 2010 New Revision: 45372 URL: http://svn.reactos.org/svn/reactos?rev=45372&view=rev Log: - ARM LLB for OMAP3/Beagle (test with QEMU-Maemo) and Versatile (test with QEMU). - Boots to blue screen with white text to indicate checkpoint. - More cleanup/work needed. - Will post Wiki on testing info soon. Added: trunk/reactos/boot/armllb/ trunk/reactos/boot/armllb/armllb.rbuild (with props) trunk/reactos/boot/armllb/boot.s (with props) trunk/reactos/boot/armllb/crtsupp.c (with props) trunk/reactos/boot/armllb/hw/ trunk/reactos/boot/armllb/hw/omap3/ trunk/reactos/boot/armllb/hw/omap3/hwinfo.c (with props) trunk/reactos/boot/armllb/hw/omap3/hwinit.c (with props) trunk/reactos/boot/armllb/hw/serial.c (with props) trunk/reactos/boot/armllb/hw/versatile/ trunk/reactos/boot/armllb/hw/versatile/hwclcd.c (with props) trunk/reactos/boot/armllb/hw/versatile/hwinfo.c (with props) trunk/reactos/boot/armllb/hw/versatile/hwinit.c (with props) trunk/reactos/boot/armllb/hw/versatile/hwuart.c (with props) trunk/reactos/boot/armllb/hw/video.c (with props) trunk/reactos/boot/armllb/inc/ trunk/reactos/boot/armllb/inc/hw.h (with props) trunk/reactos/boot/armllb/inc/machtype.h (with props) trunk/reactos/boot/armllb/inc/osloader.h (with props) trunk/reactos/boot/armllb/inc/precomp.h (with props) trunk/reactos/boot/armllb/inc/serial.h (with props) trunk/reactos/boot/armllb/inc/versa.h (with props) trunk/reactos/boot/armllb/inc/video.h (with props) trunk/reactos/boot/armllb/main.c (with props) trunk/reactos/boot/armllb/os/ trunk/reactos/boot/armllb/os/loader.c (with props) Modified: trunk/reactos/boot/boot.rbuild Added: trunk/reactos/boot/armllb/armllb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/armllb.rbuild?… ============================================================================== --- trunk/reactos/boot/armllb/armllb.rbuild (added) +++ trunk/reactos/boot/armllb/armllb.rbuild [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,60 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="armllb" type="bootloader" installbase=".." installname="armllb.bin"> + <bootstrap installbase="loader" /> + <library>libcntpr</library> + <library>rtl</library> + <include base="armllb">./inc</include> + <if property="SARCH" value="omap3"> + <define name="_OMAP3_" /> + <group linkerset="ld"> + <linkerflag>-Wl,--image-base=0x401FEFF8</linkerflag> + </group> + </if> + <if property="SARCH" value="versatile"> + <define name="_VERSATILE_" /> + <group linkerset="ld"> + <linkerflag>-Wl,--image-base=0xF000</linkerflag> + </group> + </if> + <file first="true">boot.s</file> + <file>main.c</file> + <file>crtsupp.c</file> + <directory name="hw"> + <file>serial.c</file> + <file>video.c</file> + <if property="SARCH" value="omap3"> + <directory name="omap3"> + <file>hwdata.c</file> + <file>hwdss.c</file> + <file>hwuart.c</file> + <file>hwinfo.c</file> + <file<hwinit.c</file> + </directory> + </if> + <if property="SARCH" value="versatile"> + <directory name="versatile"> + <file>hwclcd.c</file> + <file>hwuart.c</file> + <file>hwinfo.c</file> + <file>hwinit.c</file> + </directory> + </if> + </directory> + <directory name="os"> + <file>loader.c</file> + </directory> + <group compilerset="gcc"> + <compilerflag>-fms-extensions</compilerflag> + <compilerflag>-ffreestanding</compilerflag> + <compilerflag>-fno-builtin</compilerflag> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <compilerflag>-Os</compilerflag> + </group> + <group linkerset="ld"> + <linkerflag>-lgcc</linkerflag> + </group> + </module> +</group> Propchange: trunk/reactos/boot/armllb/armllb.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/armllb/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/boot.s?rev=453… ============================================================================== --- trunk/reactos/boot/armllb/boot.s (added) +++ trunk/reactos/boot/armllb/boot.s [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,39 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/boot.s + * PURPOSE: Implements the entry point for ARM machines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + + .title "ARM LLB Entry Point" + .include "ntoskrnl/include/internal/arm/kxarm.h" + .include "ntoskrnl/include/internal/arm/ksarm.h" + + NESTED_ENTRY _start + PROLOG_END _start + +#ifdef _OMAP3_ + /* + * On OMAP3, the boot is directly from TI BootROM that reads NAND flash. + * First word is size of program to load. + * Second word is load address of program. Since DDR is not initialized, + * we load to SDRAM at 40200000h. Max 64K. + */ + .word 0x8000 + .word 0x40200000 +#endif + + /* Load C entrypoint and setup LLB stack */ + ldr lr, L_LlbStartup + ldr sp, L_BootStackEnd + bx lr + ENTRY_END _start + +L_BootStackEnd: + .long 0x2000000 + +L_LlbStartup: + .long LlbStartup + +/* EOF */ Propchange: trunk/reactos/boot/armllb/boot.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/armllb/crtsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/crtsupp.c?rev=… ============================================================================== --- trunk/reactos/boot/armllb/crtsupp.c (added) +++ trunk/reactos/boot/armllb/crtsupp.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,47 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/crtsupp.c + * PURPOSE: CRT Support Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +int +putchar(int c) +{ + /* Write to the serial port */ +// LlbSerialPutChar(c); + + /* Write to the screen too */ + LlbVideoPutChar(c); + return 0; +} + +int +puts(const char* string) +{ + while (*string) putchar(*string++); + return 0; +} + +int printf(const char *fmt, ...) +{ + va_list args; + unsigned int i; + char printbuffer[1024]; + + va_start (args, fmt); + + /* For this to work, printbuffer must be larger than + * anything we ever want to print. + */ + i = vsprintf (printbuffer, fmt, args); + va_end (args); + + /* Print the string */ + return puts(printbuffer); +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/crtsupp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/armllb/hw/omap3/hwinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/omap3/hwinf… ============================================================================== --- trunk/reactos/boot/armllb/hw/omap3/hwinfo.c (added) +++ trunk/reactos/boot/armllb/hw/omap3/hwinfo.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,78 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/omap3/hwinfo.c + * PURPOSE: LLB Hardware Info Routines for OMAP3 + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +ULONG +NTAPI +LlbHwGetScreenWidth(VOID) +{ + return 1280; +} + +ULONG +NTAPI +LlbHwGetScreenHeight(VOID) +{ + return 720; +} + +PVOID +NTAPI +LlbHwGetFrameBuffer(VOID) +{ + return (PVOID)0x80500000; +} + +ULONG +NTAPI +LlbHwGetBoardType(VOID) +{ + return MACH_TYPE_OMAP3_BEAGLE; +} + +ULONG +NTAPI +LlbHwGetPClk(VOID) +{ + return 48000000; +} + +ULONG +NTAPI +LlbHwGetTmr0Base(VOID) +{ + return 0x48318000; +} + +ULONG +NTAPI +LlbHwGetUartBase(IN ULONG Port) +{ + if (Port == 1) + { + return 0x4806A000; + } + else if (Port == 2) + { + return 0x4806C000; + } + else if (Port == 3) + { + return 0x49020000; + } +} + +ULONG +NTAPI +LlbHwGetSerialUart(VOID) +{ + return 3; +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/omap3/hwinfo.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/hw/omap3/hwinfo.c ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/hw/omap3/hwinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/omap3/hwini… ============================================================================== --- trunk/reactos/boot/armllb/hw/omap3/hwinit.c (added) +++ trunk/reactos/boot/armllb/hw/omap3/hwinit.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/omap3/hwinit.c + * PURPOSE: LLB Hardware Initialization Routines for OMAP3 + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +VOID +NTAPI +LlbHwInitialize(VOID) +{ + +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/omap3/hwinit.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/hw/omap3/hwinit.c ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/hw/serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/serial.c?re… ============================================================================== --- trunk/reactos/boot/armllb/hw/serial.c (added) +++ trunk/reactos/boot/armllb/hw/serial.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/serial.c + * PURPOSE: LLB Serial Port Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +VOID +NTAPI +LlbSerialPutChar(IN CHAR c) +{ + /* Properly support new-lines */ + if (c == '\n') LlbSerialPutChar('\r'); + + /* Wait for ready */ + while (!LlbHwUartTxReady()); + + /* Send character */ + LlbHwUartSendChar(c); +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/serial.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/hw/serial.c ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/hw/versatile/hwclcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwclcd.c (added) +++ trunk/reactos/boot/armllb/hw/versatile/hwclcd.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,77 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/versatile/hwclcd.c + * PURPOSE: LLB CLCD Routines for Versatile + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +#define LCDTIMING0_PPL(x) ((((x) / 16 - 1) & 0x3f) << 2) +#define LCDTIMING1_LPP(x) (((x) & 0x3ff) - 1) +#define LCDCONTROL_LCDPWR (1 << 11) +#define LCDCONTROL_LCDEN (1) +#define LCDCONTROL_LCDBPP(x) (((x) & 7) << 1) +#define LCDCONTROL_LCDTFT (1 << 5) + +#define PL110_LCDTIMING0 (PVOID)0x10120000 +#define PL110_LCDTIMING1 (PVOID)0x10120004 +#define PL110_LCDTIMING2 (PVOID)0x10120008 +#define PL110_LCDUPBASE (PVOID)0x10120010 +#define PL110_LCDLPBASE (PVOID)0x10120014 +#define PL110_LCDCONTROL (PVOID)0x10120018 + +PUSHORT LlbHwVideoBuffer; + +VOID +NTAPI +LlbHwVersaClcdInitialize(VOID) +{ + /* Set framebuffer address */ + WRITE_REGISTER_ULONG(PL110_LCDUPBASE, (ULONG)LlbHwGetFrameBuffer()); + WRITE_REGISTER_ULONG(PL110_LCDLPBASE, (ULONG)LlbHwGetFrameBuffer()); + + /* Initialize timings to 1024x720 */ + WRITE_REGISTER_ULONG(PL110_LCDTIMING0, LCDTIMING0_PPL(LlbHwGetScreenWidth())); + WRITE_REGISTER_ULONG(PL110_LCDTIMING1, LCDTIMING1_LPP(LlbHwGetScreenHeight())); + + /* Enable the TFT/LCD Display */ + WRITE_REGISTER_ULONG(PL110_LCDCONTROL, + LCDCONTROL_LCDEN | + LCDCONTROL_LCDTFT | + LCDCONTROL_LCDPWR | + LCDCONTROL_LCDBPP(4)); +} + +ULONG +NTAPI +LlbHwGetScreenWidth(VOID) +{ + return 640; +} + +ULONG +NTAPI +LlbHwGetScreenHeight(VOID) +{ + return 480; +} + +PVOID +NTAPI +LlbHwGetFrameBuffer(VOID) +{ + return (PVOID)0x1000000; +} + +ULONG +NTAPI +LlbHwVideoCreateColor(IN ULONG Red, + IN ULONG Green, + IN ULONG Blue) +{ + return (((Blue >> 3) << 11)| ((Green >> 2) << 5)| ((Red >> 3) << 0)); +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/versatile/hwclcd.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/hw/versatile/hwclcd.c ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/hw/versatile/hwinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwinfo.c (added) +++ trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,39 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/versatile/hwinfo.c + * PURPOSE: LLB Hardware Info Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +ULONG +NTAPI +LlbHwGetBoardType(VOID) +{ + return MACH_TYPE_VERSATILE_PB; +} + +ULONG +NTAPI +LlbHwGetPClk(VOID) +{ + return 0x24000000; +} + +ULONG +NTAPI +LlbHwGetTmr0Base(VOID) +{ + return 0x101E2000; +} + +ULONG +NTAPI +LlbHwGetSerialUart(VOID) +{ + return 0; +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/versatile/hwinfo.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/hw/versatile/hwinfo.c ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/hw/versatile/hwinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwinit.c (added) +++ trunk/reactos/boot/armllb/hw/versatile/hwinit.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,22 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/versatile/hwinit.c + * PURPOSE: LLB Hardware Initialization Routines for Versatile + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +VOID +NTAPI +LlbHwInitialize(VOID) +{ + /* Setup the CLCD (PL110) */ + LlbHwVersaClcdInitialize(); + + /* Setup the UART (PL011) */ + LlbHwVersaUartInitialize(); +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/versatile/hwinit.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/hw/versatile/hwinit.c ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/hw/versatile/hwuart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwuart.c (added) +++ trunk/reactos/boot/armllb/hw/versatile/hwuart.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,114 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/versatile/hwuart.c + * PURPOSE: LLB UART Initialization Routines for Versatile + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +// +// UART Registers +// +#define UART_PL01x_DR (LlbHwVersaUartBase + 0x00) +#define UART_PL01x_RSR (LlbHwVersaUartBase + 0x04) +#define UART_PL01x_ECR (LlbHwVersaUartBase + 0x04) +#define UART_PL01x_FR (LlbHwVersaUartBase + 0x18) +#define UART_PL011_IBRD (LlbHwVersaUartBase + 0x24) +#define UART_PL011_FBRD (LlbHwVersaUartBase + 0x28) +#define UART_PL011_LCRH (LlbHwVersaUartBase + 0x2C) +#define UART_PL011_CR (LlbHwVersaUartBase + 0x30) +#define UART_PL011_IMSC (LlbHwVersaUartBase + 0x38) + +// +// LCR Values +// +#define UART_PL011_LCRH_WLEN_8 0x60 +#define UART_PL011_LCRH_FEN 0x10 + +// +// FCR Values +// +#define UART_PL011_CR_UARTEN 0x01 +#define UART_PL011_CR_TXE 0x100 +#define UART_PL011_CR_RXE 0x200 + +// +// LSR Values +// +#define UART_PL01x_FR_RXFE 0x10 +#define UART_PL01x_FR_TXFF 0x20 + +static const ULONG LlbHwVersaUartBase = 0x101F1000; + +/* FUNCTIONS ******************************************************************/ + +VOID +LlbHwVersaUartInitialize(VOID) +{ + ULONG Divider, Remainder, Fraction, ClockRate, Baudrate; + + /* Query peripheral rate, hardcore baudrate */ + ClockRate = LlbHwGetPClk(); + Baudrate = 115200; + + /* Calculate baudrate clock divider and remainder */ + Divider = ClockRate / (16 * Baudrate); + Remainder = ClockRate % (16 * Baudrate); + + /* Calculate the fractional part */ + Fraction = (8 * Remainder / Baudrate) >> 1; + Fraction += (8 * Remainder / Baudrate) & 1; + + /* Disable interrupts */ + WRITE_REGISTER_ULONG(UART_PL011_CR, 0); + + /* Set the baud rate to 115200 bps */ + WRITE_REGISTER_ULONG(UART_PL011_IBRD, Divider); + WRITE_REGISTER_ULONG(UART_PL011_FBRD, Fraction); + + /* Set 8 bits for data, 1 stop bit, no parity, FIFO enabled */ + WRITE_REGISTER_ULONG(UART_PL011_LCRH, + UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN); + + /* Clear and enable FIFO */ + WRITE_REGISTER_ULONG(UART_PL011_CR, + UART_PL011_CR_UARTEN | + UART_PL011_CR_TXE | + UART_PL011_CR_RXE); +} + +VOID +NTAPI +LlbHwUartSendChar(IN CHAR Char) +{ + /* Send the character */ + WRITE_REGISTER_ULONG(UART_PL01x_DR, Char); +} + +BOOLEAN +NTAPI +LlbHwUartTxReady(VOID) +{ + /* TX output buffer is ready? */ + return (READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF); +} + +ULONG +NTAPI +LlbHwGetUartBase(IN ULONG Port) +{ + if (Port == 0) + { + return 0x101F1000; + } + else if (Port == 1) + { + return 0x101F2000; + } + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/versatile/hwuart.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/hw/versatile/hwuart.c ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/hw/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/video.c?rev… ============================================================================== --- trunk/reactos/boot/armllb/hw/video.c (added) +++ trunk/reactos/boot/armllb/hw/video.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,370 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/hw/video.c + * PURPOSE: LLB Video Output Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +CHAR LlbHwBootFont[] = +{ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x7e,0x81,0xa5,0x81,0xbd,0x99,0x81,0x7e, + 0x7e,0xff,0xdb,0xff,0xc3,0xe7,0xff,0x7e, + 0x6c,0xfe,0xfe,0xfe,0x7c,0x38,0x10,0x00, + 0x10,0x38,0x7c,0xfe,0x7c,0x38,0x10,0x00, + 0x38,0x7c,0x38,0xfe,0xfe,0x7c,0x38,0x7c, + 0x10,0x10,0x38,0x7c,0xfe,0x7c,0x38,0x7c, + 0x00,0x00,0x18,0x3c,0x3c,0x18,0x00,0x00, + 0xff,0xff,0xe7,0xc3,0xc3,0xe7,0xff,0xff, + 0x00,0x3c,0x66,0x42,0x42,0x66,0x3c,0x00, + 0xff,0xc3,0x99,0xbd,0xbd,0x99,0xc3,0xff, + 0x0f,0x07,0x0f,0x7d,0xcc,0xcc,0xcc,0x78, + 0x3c,0x66,0x66,0x66,0x3c,0x18,0x7e,0x18, + 0x3f,0x33,0x3f,0x30,0x30,0x70,0xf0,0xe0, + 0x7f,0x63,0x7f,0x63,0x63,0x67,0xe6,0xc0, + 0x99,0x5a,0x3c,0xe7,0xe7,0x3c,0x5a,0x99, + 0x80,0xe0,0xf8,0xfe,0xf8,0xe0,0x80,0x00, + 0x02,0x0e,0x3e,0xfe,0x3e,0x0e,0x02,0x00, + 0x18,0x3c,0x7e,0x18,0x18,0x7e,0x3c,0x18, + 0x66,0x66,0x66,0x66,0x66,0x00,0x66,0x00, + 0x7f,0xdb,0xdb,0x7b,0x1b,0x1b,0x1b,0x00, + 0x3e,0x63,0x38,0x6c,0x6c,0x38,0xcc,0x78, + 0x00,0x00,0x00,0x00,0x7e,0x7e,0x7e,0x00, + 0x18,0x3c,0x7e,0x18,0x7e,0x3c,0x18,0xff, + 0x18,0x3c,0x7e,0x18,0x18,0x18,0x18,0x00, + 0x18,0x18,0x18,0x18,0x7e,0x3c,0x18,0x00, + 0x00,0x18,0x0c,0xfe,0x0c,0x18,0x00,0x00, + 0x00,0x30,0x60,0xfe,0x60,0x30,0x00,0x00, + 0x00,0x00,0xc0,0xc0,0xc0,0xfe,0x00,0x00, + 0x00,0x24,0x66,0xff,0x66,0x24,0x00,0x00, + 0x00,0x18,0x3c,0x7e,0xff,0xff,0x00,0x00, + 0x00,0xff,0xff,0x7e,0x3c,0x18,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x30,0x78,0x78,0x30,0x30,0x00,0x30,0x00, + 0x6c,0x6c,0x6c,0x00,0x00,0x00,0x00,0x00, + 0x6c,0x6c,0xfe,0x6c,0xfe,0x6c,0x6c,0x00, + 0x30,0x7c,0xc0,0x78,0x0c,0xf8,0x30,0x00, + 0x00,0xc6,0xcc,0x18,0x30,0x66,0xc6,0x00, + 0x38,0x6c,0x38,0x76,0xdc,0xcc,0x76,0x00, + 0x60,0x60,0xc0,0x00,0x00,0x00,0x00,0x00, + 0x18,0x30,0x60,0x60,0x60,0x30,0x18,0x00, + 0x60,0x30,0x18,0x18,0x18,0x30,0x60,0x00, + 0x00,0x66,0x3c,0xff,0x3c,0x66,0x00,0x00, + 0x00,0x30,0x30,0xfc,0x30,0x30,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x60, + 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00, + 0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00, + 0x7c,0xc6,0xce,0xde,0xf6,0xe6,0x7c,0x00, + 0x30,0x70,0x30,0x30,0x30,0x30,0xfc,0x00, + 0x78,0xcc,0x0c,0x38,0x60,0xcc,0xfc,0x00, + 0x78,0xcc,0x0c,0x38,0x0c,0xcc,0x78,0x00, + 0x1c,0x3c,0x6c,0xcc,0xfe,0x0c,0x1e,0x00, + 0xfc,0xc0,0xf8,0x0c,0x0c,0xcc,0x78,0x00, + 0x38,0x60,0xc0,0xf8,0xcc,0xcc,0x78,0x00, + 0xfc,0xcc,0x0c,0x18,0x30,0x30,0x30,0x00, + 0x78,0xcc,0xcc,0x78,0xcc,0xcc,0x78,0x00, + 0x78,0xcc,0xcc,0x7c,0x0c,0x18,0x70,0x00, + 0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x00, + 0x00,0x30,0x30,0x00,0x00,0x30,0x30,0x60, + 0x18,0x30,0x60,0xc0,0x60,0x30,0x18,0x00, + 0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00, + 0x60,0x30,0x18,0x0c,0x18,0x30,0x60,0x00, + 0x78,0xcc,0x0c,0x18,0x30,0x00,0x30,0x00, + 0x7c,0xc6,0xde,0xde,0xde,0xc0,0x78,0x00, + 0x30,0x78,0xcc,0xcc,0xfc,0xcc,0xcc,0x00, + 0xfc,0x66,0x66,0x7c,0x66,0x66,0xfc,0x00, + 0x3c,0x66,0xc0,0xc0,0xc0,0x66,0x3c,0x00, + 0xf8,0x6c,0x66,0x66,0x66,0x6c,0xf8,0x00, + 0xfe,0x62,0x68,0x78,0x68,0x62,0xfe,0x00, + 0xfe,0x62,0x68,0x78,0x68,0x60,0xf0,0x00, + 0x3c,0x66,0xc0,0xc0,0xce,0x66,0x3e,0x00, + 0xcc,0xcc,0xcc,0xfc,0xcc,0xcc,0xcc,0x00, + 0x78,0x30,0x30,0x30,0x30,0x30,0x78,0x00, + 0x1e,0x0c,0x0c,0x0c,0xcc,0xcc,0x78,0x00, + 0xe6,0x66,0x6c,0x78,0x6c,0x66,0xe6,0x00, + 0xf0,0x60,0x60,0x60,0x62,0x66,0xfe,0x00, + 0xc6,0xee,0xfe,0xfe,0xd6,0xc6,0xc6,0x00, + 0xc6,0xe6,0xf6,0xde,0xce,0xc6,0xc6,0x00, + 0x38,0x6c,0xc6,0xc6,0xc6,0x6c,0x38,0x00, + 0xfc,0x66,0x66,0x7c,0x60,0x60,0xf0,0x00, + 0x78,0xcc,0xcc,0xcc,0xdc,0x78,0x1c,0x00, + 0xfc,0x66,0x66,0x7c,0x6c,0x66,0xe6,0x00, + 0x78,0xcc,0xe0,0x70,0x1c,0xcc,0x78,0x00, + 0xfc,0xb4,0x30,0x30,0x30,0x30,0x78,0x00, + 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xfc,0x00, + 0xcc,0xcc,0xcc,0xcc,0xcc,0x78,0x30,0x00, + 0xc6,0xc6,0xc6,0xd6,0xfe,0xee,0xc6,0x00, + 0xc6,0xc6,0x6c,0x38,0x38,0x6c,0xc6,0x00, + 0xcc,0xcc,0xcc,0x78,0x30,0x30,0x78,0x00, + 0xfe,0xc6,0x8c,0x18,0x32,0x66,0xfe,0x00, + 0x78,0x60,0x60,0x60,0x60,0x60,0x78,0x00, + 0xc0,0x60,0x30,0x18,0x0c,0x06,0x02,0x00, + 0x78,0x18,0x18,0x18,0x18,0x18,0x78,0x00, + 0x10,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff, + 0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x78,0x0c,0x7c,0xcc,0x76,0x00, + 0xe0,0x60,0x60,0x7c,0x66,0x66,0xdc,0x00, + 0x00,0x00,0x78,0xcc,0xc0,0xcc,0x78,0x00, + 0x1c,0x0c,0x0c,0x7c,0xcc,0xcc,0x76,0x00, + 0x00,0x00,0x78,0xcc,0xfc,0xc0,0x78,0x00, + 0x38,0x6c,0x60,0xf0,0x60,0x60,0xf0,0x00, + 0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0xf8, + 0xe0,0x60,0x6c,0x76,0x66,0x66,0xe6,0x00, + 0x30,0x00,0x70,0x30,0x30,0x30,0x78,0x00, + 0x0c,0x00,0x0c,0x0c,0x0c,0xcc,0xcc,0x78, + 0xe0,0x60,0x66,0x6c,0x78,0x6c,0xe6,0x00, + 0x70,0x30,0x30,0x30,0x30,0x30,0x78,0x00, + 0x00,0x00,0xcc,0xfe,0xfe,0xd6,0xc6,0x00, + 0x00,0x00,0xf8,0xcc,0xcc,0xcc,0xcc,0x00, + 0x00,0x00,0x78,0xcc,0xcc,0xcc,0x78,0x00, + 0x00,0x00,0xdc,0x66,0x66,0x7c,0x60,0xf0, + 0x00,0x00,0x76,0xcc,0xcc,0x7c,0x0c,0x1e, + 0x00,0x00,0xdc,0x76,0x66,0x60,0xf0,0x00, + 0x00,0x00,0x7c,0xc0,0x78,0x0c,0xf8,0x00, + 0x10,0x30,0x7c,0x30,0x30,0x34,0x18,0x00, + 0x00,0x00,0xcc,0xcc,0xcc,0xcc,0x76,0x00, + 0x00,0x00,0xcc,0xcc,0xcc,0x78,0x30,0x00, + 0x00,0x00,0xc6,0xd6,0xfe,0xfe,0x6c,0x00, + 0x00,0x00,0xc6,0x6c,0x38,0x6c,0xc6,0x00, + 0x00,0x00,0xcc,0xcc,0xcc,0x7c,0x0c,0xf8, + 0x00,0x00,0xfc,0x98,0x30,0x64,0xfc,0x00, + 0x1c,0x30,0x30,0xe0,0x30,0x30,0x1c,0x00, + 0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x00, + 0xe0,0x30,0x30,0x1c,0x30,0x30,0xe0,0x00, + 0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0x00, + 0x78,0xcc,0xc0,0xcc,0x78,0x18,0x0c,0x78, + 0x00,0xcc,0x00,0xcc,0xcc,0xcc,0x7e,0x00, + 0x1c,0x00,0x78,0xcc,0xfc,0xc0,0x78,0x00, + 0x7e,0xc3,0x3c,0x06,0x3e,0x66,0x3f,0x00, + 0xcc,0x00,0x78,0x0c,0x7c,0xcc,0x7e,0x00, + 0xe0,0x00,0x78,0x0c,0x7c,0xcc,0x7e,0x00, + 0x30,0x30,0x78,0x0c,0x7c,0xcc,0x7e,0x00, + 0x00,0x00,0x78,0xc0,0xc0,0x78,0x0c,0x38, + 0x7e,0xc3,0x3c,0x66,0x7e,0x60,0x3c,0x00, + 0xcc,0x00,0x78,0xcc,0xfc,0xc0,0x78,0x00, + 0xe0,0x00,0x78,0xcc,0xfc,0xc0,0x78,0x00, + 0xcc,0x00,0x70,0x30,0x30,0x30,0x78,0x00, + 0x7c,0xc6,0x38,0x18,0x18,0x18,0x3c,0x00, + 0xe0,0x00,0x70,0x30,0x30,0x30,0x78,0x00, + 0xc6,0x38,0x6c,0xc6,0xfe,0xc6,0xc6,0x00, + 0x30,0x30,0x00,0x78,0xcc,0xfc,0xcc,0x00, + 0x1c,0x00,0xfc,0x60,0x78,0x60,0xfc,0x00, + 0x00,0x00,0x7f,0x0c,0x7f,0xcc,0x7f,0x00, + 0x3e,0x6c,0xcc,0xfe,0xcc,0xcc,0xce,0x00, + 0x78,0xcc,0x00,0x78,0xcc,0xcc,0x78,0x00, + 0x00,0xcc,0x00,0x78,0xcc,0xcc,0x78,0x00, + 0x00,0xe0,0x00,0x78,0xcc,0xcc,0x78,0x00, + 0x78,0xcc,0x00,0xcc,0xcc,0xcc,0x7e,0x00, + 0x00,0xe0,0x00,0xcc,0xcc,0xcc,0x7e,0x00, + 0x00,0xcc,0x00,0xcc,0xcc,0x7c,0x0c,0xf8, + 0xc3,0x18,0x3c,0x66,0x66,0x3c,0x18,0x00, + 0xcc,0x00,0xcc,0xcc,0xcc,0xcc,0x78,0x00, + 0x18,0x18,0x7e,0xc0,0xc0,0x7e,0x18,0x18, + 0x38,0x6c,0x64,0xf0,0x60,0xe6,0xfc,0x00, + 0xcc,0xcc,0x78,0xfc,0x30,0xfc,0x30,0x30, + 0xf8,0xcc,0xcc,0xfa,0xc6,0xcf,0xc6,0xc7, + 0x0e,0x1b,0x18,0x3c,0x18,0x18,0xd8,0x70, + 0x1c,0x00,0x78,0x0c,0x7c,0xcc,0x7e,0x00, + 0x38,0x00,0x70,0x30,0x30,0x30,0x78,0x00, + 0x00,0x1c,0x00,0x78,0xcc,0xcc,0x78,0x00, + 0x00,0x1c,0x00,0xcc,0xcc,0xcc,0x7e,0x00, + 0x00,0xf8,0x00,0xf8,0xcc,0xcc,0xcc,0x00, + 0xfc,0x00,0xcc,0xec,0xfc,0xdc,0xcc,0x00, + 0x3c,0x6c,0x6c,0x3e,0x00,0x7e,0x00,0x00, + 0x38,0x6c,0x6c,0x38,0x00,0x7c,0x00,0x00, + 0x30,0x00,0x30,0x60,0xc0,0xcc,0x78,0x00, + 0x00,0x00,0x00,0xfc,0xc0,0xc0,0x00,0x00, + 0x00,0x00,0x00,0xfc,0x0c,0x0c,0x00,0x00, + 0xc3,0xc6,0xcc,0xde,0x33,0x66,0xcc,0x0f, + 0xc3,0xc6,0xcc,0xdb,0x37,0x6f,0xcf,0x03, + 0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x00, + 0x00,0x33,0x66,0xcc,0x66,0x33,0x00,0x00, + 0x00,0xcc,0x66,0x33,0x66,0xcc,0x00,0x00, + 0x22,0x88,0x22,0x88,0x22,0x88,0x22,0x88, + 0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa, + 0xdb,0x77,0xdb,0xee,0xdb,0x77,0xdb,0xee, + 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, + 0x18,0x18,0x18,0x18,0xf8,0x18,0x18,0x18, + 0x18,0x18,0xf8,0x18,0xf8,0x18,0x18,0x18, + 0x36,0x36,0x36,0x36,0xf6,0x36,0x36,0x36, + 0x00,0x00,0x00,0x00,0xfe,0x36,0x36,0x36, + 0x00,0x00,0xf8,0x18,0xf8,0x18,0x18,0x18, + 0x36,0x36,0xf6,0x06,0xf6,0x36,0x36,0x36, + 0x36,0x36,0x36,0x36,0x36,0x36,0x36,0x36, + 0x00,0x00,0xfe,0x06,0xf6,0x36,0x36,0x36, + 0x36,0x36,0xf6,0x06,0xfe,0x00,0x00,0x00, + 0x36,0x36,0x36,0x36,0xfe,0x00,0x00,0x00, + 0x18,0x18,0xf8,0x18,0xf8,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0xf8,0x18,0x18,0x18, + 0x18,0x18,0x18,0x18,0x1f,0x00,0x00,0x00, + 0x18,0x18,0x18,0x18,0xff,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0xff,0x18,0x18,0x18, + 0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18, + 0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00, + 0x18,0x18,0x18,0x18,0xff,0x18,0x18,0x18, + 0x18,0x18,0x1f,0x18,0x1f,0x18,0x18,0x18, + 0x36,0x36,0x36,0x36,0x37,0x36,0x36,0x36, + 0x36,0x36,0x37,0x30,0x3f,0x00,0x00,0x00, + 0x00,0x00,0x3f,0x30,0x37,0x36,0x36,0x36, + 0x36,0x36,0xf7,0x00,0xff,0x00,0x00,0x00, + 0x00,0x00,0xff,0x00,0xf7,0x36,0x36,0x36, + 0x36,0x36,0x37,0x30,0x37,0x36,0x36,0x36, + 0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00, + 0x36,0x36,0xf7,0x00,0xf7,0x36,0x36,0x36, + 0x18,0x18,0xff,0x00,0xff,0x00,0x00,0x00, + 0x36,0x36,0x36,0x36,0xff,0x00,0x00,0x00, + 0x00,0x00,0xff,0x00,0xff,0x18,0x18,0x18, + 0x00,0x00,0x00,0x00,0xff,0x36,0x36,0x36, + 0x36,0x36,0x36,0x36,0x3f,0x00,0x00,0x00, + 0x18,0x18,0x1f,0x18,0x1f,0x00,0x00,0x00, + 0x00,0x00,0x1f,0x18,0x1f,0x18,0x18,0x18, + 0x00,0x00,0x00,0x00,0x3f,0x36,0x36,0x36, + 0x36,0x36,0x36,0x36,0xff,0x36,0x36,0x36, + 0x18,0x18,0xff,0x18,0xff,0x18,0x18,0x18, + 0x18,0x18,0x18,0x18,0xf8,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x1f,0x18,0x18,0x18, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, + 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff, + 0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0, + 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f, + 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00, + 0x00,0x00,0x76,0xdc,0xc8,0xdc,0x76,0x00, + 0x00,0x78,0xcc,0xf8,0xcc,0xf8,0xc0,0xc0, + 0x00,0xfc,0xcc,0xc0,0xc0,0xc0,0xc0,0x00, + 0x00,0xfe,0x6c,0x6c,0x6c,0x6c,0x6c,0x00, + 0xfc,0xcc,0x60,0x30,0x60,0xcc,0xfc,0x00, + 0x00,0x00,0x7e,0xd8,0xd8,0xd8,0x70,0x00, + 0x00,0x66,0x66,0x66,0x66,0x7c,0x60,0xc0, + 0x00,0x76,0xdc,0x18,0x18,0x18,0x18,0x00, + 0xfc,0x30,0x78,0xcc,0xcc,0x78,0x30,0xfc, + 0x38,0x6c,0xc6,0xfe,0xc6,0x6c,0x38,0x00, + 0x38,0x6c,0xc6,0xc6,0x6c,0x6c,0xee,0x00, + 0x1c,0x30,0x18,0x7c,0xcc,0xcc,0x78,0x00, + 0x00,0x00,0x7e,0xdb,0xdb,0x7e,0x00,0x00, + 0x06,0x0c,0x7e,0xdb,0xdb,0x7e,0x60,0xc0, + 0x38,0x60,0xc0,0xf8,0xc0,0x60,0x38,0x00, + 0x78,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00, + 0x00,0xfc,0x00,0xfc,0x00,0xfc,0x00,0x00, + 0x30,0x30,0xfc,0x30,0x30,0x00,0xfc,0x00, + 0x60,0x30,0x18,0x30,0x60,0x00,0xfc,0x00, + 0x18,0x30,0x60,0x30,0x18,0x00,0xfc,0x00, + 0x0e,0x1b,0x1b,0x18,0x18,0x18,0x18,0x18, + 0x18,0x18,0x18,0x18,0x18,0xd8,0xd8,0x70, + 0x30,0x30,0x00,0xfc,0x00,0x30,0x30,0x00, + 0x00,0x76,0xdc,0x00,0x76,0xdc,0x00,0x00, + 0x38,0x6c,0x6c,0x38,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00, + 0x0f,0x0c,0x0c,0x0c,0xec,0x6c,0x3c,0x1c, + 0x78,0x6c,0x6c,0x6c,0x6c,0x00,0x00,0x00, + 0x70,0x18,0x30,0x60,0x78,0x00,0x00,0x00, + 0x00,0x00,0x3c,0x3c,0x3c,0x3c,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +}; + +ULONG ScreenCursor; + +VOID +NTAPI +LlbVideoDrawChar(IN CHAR c, + IN ULONG cx, + IN ULONG cy, + IN USHORT Color, + IN USHORT BackColor) +{ + PUSHORT Buffer; + PCHAR Pixels; + CHAR Line; + ULONG x, y, ScreenWidth; + PUSHORT VideoBuffer; + + /* Get screen width and frame buffer */ + ScreenWidth = LlbHwGetScreenWidth(); + VideoBuffer = LlbHwGetFrameBuffer(); + + /* Compute starting address on-screen and in the character-array */ + buffer = VideoBuffer + ScreenWidth * cy + cx; + pixels = LlbHwBootFont + c * 8; + + /* Loop y pixels */ + for (y = 0; y < 8; y++) + { + /* Loop x pixels */ + Line = *Pixels++; + for (x = 7; x >= 0; x--) + { + /* Draw either a character or background pixel */ + Buffer[x] = (Line & 1) ? Color : BackColor; + Line >>= 1; + } + + /* Next line */ + Buffer += ScreenWidth; + } +} + +VOID +NTAPI +LlbVideoClearScreen(VOID) +{ + ULONG ScreenSize, p; + ULONG BackColor; + PUSHORT VideoBuffer; + + /* Get frame buffer and reset cursor position */ + VideoBuffer = LlbHwGetFrameBuffer(); + ScreenCursor = 0; + + /* Backcolor on this machine */ + BackColor = LlbHwVideoCreateColor(14, 0, 82); + BackColor = (BackColor << 16) | BackColor; + + /* Screen size on this machine */ + ScreenSize = LlbHwGetScreenWidth() * LlbHwGetScreenHeight(); + + /* Clear the screen with the given color */ + for (p = 0; p < ScreenSize * 2; p += 4) + { + *(PULONG)((PCHAR)VideoBuffer + p) = BackColor; + } +} + +VOID +NTAPI +LlbVideoPutChar(IN CHAR c) +{ + ULONG cx, cy, CharsPerLine, BackColor; + + /* Forecolor on this machine */ + BackColor = LlbHwVideoCreateColor(14, 0, 82); + + /* Amount of characters in a line */ + CharsPerLine = LlbHwGetScreenWidth() / 8; + + /* Handle new line and scrolling */ + if (c == '\n') + { + /* Move a line down */ + ScreenCursor += CharsPerLine - (ScreenCursor % CharsPerLine); + + /* FIXME: Scrolling */ + } + else + { + /* Calculate character position from pixel position */ + cy = (ScreenCursor / CharsPerLine) * 8; + cx = (ScreenCursor % CharsPerLine) * 8; + + /* Draw the character and increment the cursor */ + LlbVideoDrawChar(c, cx, cy, 0xFFFF, BackColor); + ScreenCursor++; + } +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/hw/video.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/armllb/inc/hw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/hw.h?rev=4… ============================================================================== --- trunk/reactos/boot/armllb/inc/hw.h (added) +++ trunk/reactos/boot/armllb/inc/hw.h [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,89 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/inc/hw.h + * PURPOSE: LLB Hardware Functions + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +VOID +NTAPI +LlbHwInitialize( + VOID +); + +ULONG +NTAPI +LlbHwGetScreenWidth( + VOID +); + +ULONG +NTAPI +LlbHwGetScreenHeight( + VOID +); + +ULONG +NTAPI +LlbHwVideoCreateColor( + IN ULONG Red, + IN ULONG Green, + IN ULONG Blue +); + +PVOID +NTAPI +LlbHwGetFrameBuffer( + VOID +); + +ULONG +NTAPI +LlbHwGetBoardType( + VOID +); + +ULONG +NTAPI +LlbHwGetPClk( + VOID +); + +ULONG +NTAPI +LlbHwGetTmr0Base( + VOID +); + +ULONG +NTAPI +LlbHwGetUartBase( + IN ULONG Port +); + +ULONG +NTAPI +LlbHwGetSerialUart( + VOID +); + +VOID +NTAPI +LlbHwUartSendChar( + IN CHAR Char +); + +BOOLEAN +NTAPI +LlbHwUartTxReady( + VOID +); + +#ifdef _VERSATILE_ +#include "versa.h" +#elif _OMAP3_ +#include "omap3.h" +#endif + +/* EOF */ Propchange: trunk/reactos/boot/armllb/inc/hw.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/inc/hw.h ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/inc/machtype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/machtype.h… ============================================================================== --- trunk/reactos/boot/armllb/inc/machtype.h (added) +++ trunk/reactos/boot/armllb/inc/machtype.h [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,27 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/inc/machtype.h + * PURPOSE: Standard machine type definitions defined by Linux/U-boot + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +// +// Marvell Feroceon-based SoC: +// Buffalo Linkstation, KuroBox Pro, D-Link DS323 and others +// +#define MACH_TYPE_FEROCEON 526 + +// +// ARM Versatile PB: +// qemu-system-arm -M versatilepb, RealView Development Boards and others +// +#define MACH_TYPE_VERSATILE_PB 387 + +// +// TI Beagle Board, OMAP3530 SoC +// qemu-system-arm -M beagle, Beagle Board +// +#define MACH_TYPE_OMAP3_BEAGLE 1546 + +/* EOF */ Propchange: trunk/reactos/boot/armllb/inc/machtype.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/armllb/inc/osloader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/osloader.h… ============================================================================== --- trunk/reactos/boot/armllb/inc/osloader.h (added) +++ trunk/reactos/boot/armllb/inc/osloader.h [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,57 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/inc/osloader.h + * PURPOSE: Shared header between LLB and OS Loader + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +// +// OS Loader Main Routine +// +typedef +VOID (*OSLOADER_INIT)( + IN PVOID BoardInit +); + +// +// Type of memory detected by LLB +// +typedef enum +{ + BiosMemoryUsable = 1, + BiosMemoryBootLoader, + BiosMemoryBootStrap, + BiosMemoryReserved +} BIOS_MEMORY_TYPE; + +// +// Firmware Memory Map +// +typedef struct +{ + LONGLONG BaseAddress; + LONGLONG Length; + ULONG Type; + ULONG Reserved; +} BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; + +// +// Information sent from LLB to OS Loader +// +#define ARM_BOARD_CONFIGURATION_MAJOR_VERSION 1 +#define ARM_BOARD_CONFIGURATION_MINOR_VERSION 1 +typedef struct _ARM_BOARD_CONFIGURATION_BLOCK +{ + ULONG MajorVersion; + ULONG MinorVersion; + ULONG BoardType; + ULONG ClockRate; + ULONG TimerRegisterBase; + ULONG UartRegisterBase; + ULONG MemoryMapEntryCount; + PBIOS_MEMORY_MAP MemoryMap; + CHAR CommandLine[256]; +} ARM_BOARD_CONFIGURATION_BLOCK, *PARM_BOARD_CONFIGURATION_BLOCK; + +/* EOF */ Propchange: trunk/reactos/boot/armllb/inc/osloader.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/armllb/inc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/precomp.h?… ============================================================================== --- trunk/reactos/boot/armllb/inc/precomp.h (added) +++ trunk/reactos/boot/armllb/inc/precomp.h [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/inc/precomp.h + * PURPOSE: Precompiled header for LLB + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "ntdef.h" +#include "stdio.h" +#include "ioaccess.h" +#include "machtype.h" +#include "osloader.h" +#include "hw.h" +#include "serial.h" +#include "video.h" + +/* EOF */ Propchange: trunk/reactos/boot/armllb/inc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/inc/precomp.h ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/inc/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/serial.h?r… ============================================================================== --- trunk/reactos/boot/armllb/inc/serial.h (added) +++ trunk/reactos/boot/armllb/inc/serial.h [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,15 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/inc/serial.h + * PURPOSE: LLB Serial Port Functions + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +VOID +NTAPI +LlbSerialPutChar( + IN CHAR c +); + +/* EOF */ Propchange: trunk/reactos/boot/armllb/inc/serial.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/inc/serial.h ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/inc/versa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/versa.h?re… ============================================================================== --- trunk/reactos/boot/armllb/inc/versa.h (added) +++ trunk/reactos/boot/armllb/inc/versa.h [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/inc/versa.h + * PURPOSE: LLB Board-Specific Hardware Functions for Versatile + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +VOID +NTAPI +LlbHwVersaUartInitialize( + VOID +); + +VOID +NTAPI +LlbHwVersaClcdInitialize( + VOID +); + +/* EOF */ Propchange: trunk/reactos/boot/armllb/inc/versa.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/inc/versa.h ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/inc/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/inc/video.h?re… ============================================================================== --- trunk/reactos/boot/armllb/inc/video.h (added) +++ trunk/reactos/boot/armllb/inc/video.h [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/inc/video.h + * PURPOSE: LLB Videl Output Functions + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +VOID +NTAPI +LlbVideoClearScreen( + VOID +); + +VOID +NTAPI +LlbVideoPutChar( + IN CHAR c +); + +/* EOF */ Propchange: trunk/reactos/boot/armllb/inc/video.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/inc/video.h ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/main.c?rev=453… ============================================================================== --- trunk/reactos/boot/armllb/main.c (added) +++ trunk/reactos/boot/armllb/main.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/main.c + * PURPOSE: Main LLB Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +VOID +LlbStartup(VOID) +{ + /* Initialize hardware components */ + LlbHwInitialize(); + + /* Clean up the screen */ + LlbVideoClearScreen(); + + /* Print header */ + printf("ReactOS ARM Low-Level Boot Loader [" __DATE__ " "__TIME__ "]\n\n"); + while (TRUE); +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/main.c ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/boot/armllb/os/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/os/loader.c?re… ============================================================================== --- trunk/reactos/boot/armllb/os/loader.c (added) +++ trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -1,0 +1,65 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/armllb/os/loader.c + * PURPOSE: OS Loader Code for LLB + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#include "precomp.h" + +BIOS_MEMORY_MAP MemoryMap[32]; +ARM_BOARD_CONFIGURATION_BLOCK ArmBlock; + +VOID +NTAPI +AllocateMemoryEntry(IN BIOS_MEMORY_TYPE Type, + IN ULONG BaseAddress, + IN ULONG Length) +{ + PBIOS_MEMORY_MAP Entry; + + /* Get the next memory entry */ + Entry = MemoryMap; + while (Entry->Length) Entry++; + + /* Fill it out */ + Entry->Length = Length; + Entry->BaseAddress = BaseAddress; + Entry->Type = Type; + + /* Block count */ + ArmBlock.MemoryMapEntryCount++; +} + +VOID +NTAPI +LlbSetCommandLine(IN PCHAR CommandLine) +{ + /* Copy the command line in the ARM block */ + strcpy(ArmBlock.CommandLine, CommandLine); +} + +VOID +NTAPI +LlbBuildArmBlock(VOID) +{ + /* Write version number */ + ArmBlock.MajorVersion = ARM_BOARD_CONFIGURATION_MAJOR_VERSION; + ArmBlock.MinorVersion = ARM_BOARD_CONFIGURATION_MINOR_VERSION; + + /* Get arch type */ + ArmBlock.BoardType = LlbHwGetBoardType(); + + /* Get peripheral clock rate */ + ArmBlock.ClockRate = LlbHwGetPClk(); + + /* Get timer and serial port base addresses */ + ArmBlock.TimerRegisterBase = LlbHwGetTmr0Base(); + ArmBlock.UartRegisterBase = LlbHwGetUartBase(LlbHwGetSerialUart()); + + /* Now load the memory map */ + ArmBlock.MemoryMap = MemoryMap; +} + +/* EOF */ Propchange: trunk/reactos/boot/armllb/os/loader.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/armllb/os/loader.c ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/reactos/boot/boot.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/boot.rbuild?rev=45372… ============================================================================== --- trunk/reactos/boot/boot.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/boot.rbuild [iso-8859-1] Mon Feb 1 19:33:24 2010 @@ -4,6 +4,11 @@ <directory name="freeldr"> <xi:include href="freeldr/freeldr.rbuild" /> </directory> + <if property="ARCH" value="arm"> + <directory name="armllb"> + <xi:include href="armllb/armllb.rbuild" /> + </directory> + </if> <directory name="bootdata"> <xi:include href="bootdata/bootdata.rbuild" /> </directory>

14 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2010