Ros-diffs

ros-diffs@reactos.org

81390 discussions

[evb] 45373: - Fix bugs. - Enable serial output.
by evb＠svn.reactos.org 01 Feb '10

01 Feb '10

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

1 0

[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 01 Feb '10

01 Feb '10

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>

1 0

[evb] 45371: - NANDFlash tool for building OMAP3 FLASH Images for DevBoard and QEMU-Maemo.
by evb＠svn.reactos.org 01 Feb '10

01 Feb '10

Author: evb Date: Mon Feb 1 19:29:19 2010 New Revision: 45371 URL: http://svn.reactos.org/svn/reactos?rev=45371&view=rev Log: - NANDFlash tool for building OMAP3 FLASH Images for DevBoard and QEMU-Maemo. Added: trunk/reactos/tools/nandflash/ trunk/reactos/tools/nandflash/main.c (with props) trunk/reactos/tools/nandflash/nandflash.h (with props) trunk/reactos/tools/nandflash/nandflash.rbuild (with props) Modified: trunk/reactos/tools/tools.rbuild Added: trunk/reactos/tools/nandflash/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nandflash/main.c?rev… ============================================================================== --- trunk/reactos/tools/nandflash/main.c (added) +++ trunk/reactos/tools/nandflash/main.c [iso-8859-1] Mon Feb 1 19:29:19 2010 @@ -1,0 +1,154 @@ +/* + * PROJECT: OMAP3 NAND Flashing Utility + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: tools/nandflash/main.c + * PURPOSE: Flashes OmapLDR, FreeLDR and a Root FS into a NAND image + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include "nandflash.h" + +/* GLOBALS ********************************************************************/ + +/* File Names */ +PCHAR NandImageName = "reactos.bin"; +PCHAR LlbImageName = "./output-arm/boot/armllb/armllb.bin"; +PCHAR BootLdrImageName = "./output-arm/boot/freeldr/freeldr.sys"; +PCHAR FsImageName = "ReactOS.img"; + +/* NAND On-Disk Memory Map */ +ULONG LlbStart = 0x00000000, LlbEnd = 0x00080000; +ULONG BootLdrStart = 0x00280000, BootLdrEnd = 0x00680000; +ULONG FsStart = 0x00300000, FsEnd = 0x10000000; + +/* FUNCTIONS ******************************************************************/ + +ULONG +NTAPI +CreateFlashFile(VOID) +{ + ULONG FileDescriptor, i; + CHAR Buffer[NAND_PAGE_SIZE + NAND_OOB_SIZE]; + + /* Try open NAND image */ + FileDescriptor = open(NandImageName, O_RDWR); + if (!FileDescriptor) + { + /* Create NAND image */ + FileDescriptor = open(NandImageName, O_RDWR | O_CREAT); + if (!FileDescriptor) return (-1); + + /* Create zero buffer */ + memset(Buffer, 0xff, sizeof(Buffer)); + + /* Write zero buffer */ + for (i = 0; i < NAND_PAGES; i++) write(FileDescriptor, Buffer, sizeof(Buffer)); + } + + /* Return NAND descriptor */ + return FileDescriptor; +} + +VOID +NTAPI +WriteToFlash(IN ULONG NandImageFile, + IN ULONG ImageFile, + IN ULONG ImageStart, + IN ULONG ImageEnd) +{ + CHAR Data[NAND_PAGE_SIZE], Oob[NAND_OOB_SIZE]; + ULONG StartPage, EndPage, i; + BOOLEAN KeepGoing = TRUE; + + /* Offset to NAND Page convert */ + StartPage = ImageStart / NAND_PAGE_SIZE; + EndPage = ImageEnd / NAND_PAGE_SIZE; + + /* Jump to NAND offset */ + lseek(NandImageFile, StartPage * (NAND_PAGE_SIZE + NAND_OOB_SIZE), SEEK_SET); + + /* Set input image offset */ + lseek(ImageFile, 0, SEEK_SET); + + /* Create zero buffer */ + memset(Data, 0xff, NAND_PAGE_SIZE); + memset(Oob, 0xff, NAND_OOB_SIZE); + + /* Parse NAND Pages */ + for (i = StartPage; i < EndPage; i++) + { + /* Read NAND page from input image */ + if (read(ImageFile, Data, NAND_PAGE_SIZE) < NAND_PAGE_SIZE) + { + /* Do last write and quit after */ + KeepGoing = FALSE; + } + + /* Write OOB and NAND Data */ + write(NandImageFile, Data, NAND_PAGE_SIZE); + write(NandImageFile, Oob, NAND_OOB_SIZE); + + /* Next page if data continues */ + if (!KeepGoing) break; + } +} + +VOID +NTAPI +WriteLlb(IN ULONG NandImageFile) +{ + ULONG FileDescriptor; + + /* Open LLB and write it */ + FileDescriptor = open(LlbImageName, O_RDWR); + WriteToFlash(NandImageFile, FileDescriptor, LlbStart, LlbEnd); + close(FileDescriptor); +} + +VOID +NTAPI +WriteBootLdr(IN ULONG NandImageFile) +{ + ULONG FileDescriptor; + + /* Open FreeLDR and write it */ + FileDescriptor = open(BootLdrImageName, O_RDWR); + WriteToFlash(NandImageFile, FileDescriptor, BootLdrStart, BootLdrEnd); + close(FileDescriptor); +} + +VOID +NTAPI +WriteFileSystem(IN ULONG NandImageFile) +{ + ULONG FileDescriptor; + + /* Open FS image and write it */ + FileDescriptor = open(FsImageName, O_RDWR); + WriteToFlash(NandImageFile, FileDescriptor, FsStart, FsEnd); + close(FileDescriptor); +} + +int +main(ULONG argc, + char **argv) +{ + ULONG NandImageFile; + + /* Open or create NAND Image File */ + NandImageFile = CreateFlashFile(); + if (!NandImageFile) exit(-1); + + /* Write components */ + WriteLlb(NandImageFile); + WriteBootLdr(NandImageFile); + WriteFileSystem(NandImageFile); + + /* Close and return */ + close(NandImageFile); + return 0; +} + +/* EOF */ Propchange: trunk/reactos/tools/nandflash/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/nandflash/nandflash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nandflash/nandflash.… ============================================================================== --- trunk/reactos/tools/nandflash/nandflash.h (added) +++ trunk/reactos/tools/nandflash/nandflash.h [iso-8859-1] Mon Feb 1 19:29:19 2010 @@ -1,0 +1,21 @@ +/* + * PROJECT: OMAP3 NAND Flashing Utility + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: tools/nandflash/nandflash.h + * PURPOSE: Flashes OmapLDR, FreeLDR and a Root FS into a NAND image + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <string.h> +#include <stdio.h> +#include <fcntl.h> +#include <host/typedefs.h> + +/* NAND Image Sizes */ +#define NAND_PAGE_SIZE (2 * 1024) // 2 KB +#define NAND_OOB_SIZE 64 // 64 bytes +#define NAND_PAGES ((256 * 1024 * 1024) / NAND_PAGE_SIZE) // 256 MB + +/* EOF */ Propchange: trunk/reactos/tools/nandflash/nandflash.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/nandflash/nandflash.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nandflash/nandflash.… ============================================================================== --- trunk/reactos/tools/nandflash/nandflash.rbuild (added) +++ trunk/reactos/tools/nandflash/nandflash.rbuild [iso-8859-1] Mon Feb 1 19:29:19 2010 @@ -1,0 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="nandflash" type="buildtool"> + <file>main.c</file> +</module> Propchange: trunk/reactos/tools/nandflash/nandflash.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?rev=453… ============================================================================== --- trunk/reactos/tools/tools.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/tools.rbuild [iso-8859-1] Mon Feb 1 19:29:19 2010 @@ -9,6 +9,9 @@ </directory> <directory name="kbdtool"> <xi:include href="kbdtool/kbdtool.rbuild" /> +</directory> +<directory name="nandflash"> + <xi:include href="nandflash/nandflash.rbuild" /> </directory> <directory name="mkhive"> <xi:include href="mkhive/mkhive.rbuild" />

1 0

[jimtabor] 45370: [Gdi32] - Miscellaneous implementations and forwards.
by jimtabor＠svn.reactos.org 01 Feb '10

01 Feb '10

Author: jimtabor Date: Mon Feb 1 16:13:35 2010 New Revision: 45370 URL: http://svn.reactos.org/svn/reactos?rev=45370&view=rev Log: [Gdi32] - Miscellaneous implementations and forwards. Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.spec… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Mon Feb 1 16:13:35 2010 @@ -605,7 +605,7 @@ @ stdcall XFORMOBJ_iGetXform(ptr ptr) NtGdiXFORMOBJ_iGetXform @ stdcall XLATEOBJ_cGetPalette(ptr long long ptr) NtGdiXLATEOBJ_cGetPalette @ stdcall XLATEOBJ_hGetColorTransform(ptr) NtGdiXLATEOBJ_hGetColorTransform -@ stdcall XLATEOBJ_iXlate(ptr long) +@ stdcall XLATEOBJ_iXlate(ptr long) NtGdiXLATEOBJ_iXlate @ stdcall XLATEOBJ_piVector(ptr) @ stdcall bInitSystemAndFontsDirectoriesW(wstr wstr) @ stdcall bMakePathNameW(wstr wstr wstr long) Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Feb 1 16:13:35 2010 @@ -809,15 +809,16 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI GdiCleanCacheDC(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if (GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_DC_TYPE) + return TRUE; + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; } /* @@ -860,7 +861,7 @@ */ BOOL WINAPI -GdiDrawStream(HDC dc, ULONG l, VOID *v) +GdiDrawStream(HDC dc, ULONG l, VOID *v) // See Bug 4784 { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -934,15 +935,25 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI GdiValidateHandle(HGDIOBJ hobj) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hobj); + if ( (Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0 && + ( (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK ) == + GDI_HANDLE_GET_TYPE(hobj) ) + { + HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); + if(pid == NULL || pid == CurrentProcessId) + { + return TRUE; + } + } + return FALSE; + } /* @@ -1531,18 +1542,6 @@ /* * @unimplemented */ -ULONG WINAPI -XLATEOBJ_iXlate(XLATEOBJ *XlateObj, - ULONG Color) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ ULONG * WINAPI XLATEOBJ_piVector(XLATEOBJ *XlateObj) @@ -1566,8 +1565,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - - /* * @unimplemented @@ -1608,7 +1605,6 @@ /* FIXME some part need be done in user mode */ return NtGdiGradientFill(hdc, pVertex, nVertex, pMesh, nMesh, ulMode); } - /* * @implemented

1 0

[jcatena] 45369: merge from trunk 45368
by jcatena＠svn.reactos.org 01 Feb '10

01 Feb '10

Author: jcatena Date: Mon Feb 1 14:19:51 2010 New Revision: 45369 URL: http://svn.reactos.org/svn/reactos?rev=45369&view=rev Log: merge from trunk 45368 Added: branches/jcatena-branch/drivers/base/kddll/kdcom.vcproj (with props) branches/jcatena-branch/drivers/base/kddll/kdcom_bld.h (with props) branches/jcatena-branch/lib/cpu/ (with props) branches/jcatena-branch/lib/cpu/i386/ (with props) branches/jcatena-branch/lib/cpu/i386/RegSave.c (with props) branches/jcatena-branch/lib/cpu/i386/cpu.vcproj (with props) branches/jcatena-branch/lib/cpu/i386/cpu_bld.h (with props) branches/jcatena-branch/lib/drivers/csq/csq.vcproj (with props) branches/jcatena-branch/lib/drivers/oskittcp/include/osenv.h - copied unchanged from r45368, trunk/reactos/lib/drivers/oskittcp/include/osenv.h branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/osenv.c - copied unchanged from r45368, trunk/reactos/lib/drivers/oskittcp/oskittcp/osenv.c branches/jcatena-branch/lib/rtl/rtl_bld.h (with props) branches/jcatena-branch/lib/sdk/crt2/ (with props) branches/jcatena-branch/lib/sdk/crt2/crtnt.vcproj (with props) branches/jcatena-branch/lib/sdk/crt2/crtnt_bld.h (with props) branches/jcatena-branch/lib/sdk/crt2/excpt/ (with props) branches/jcatena-branch/lib/sdk/crt2/excpt/i32/ (with props) branches/jcatena-branch/lib/sdk/crt2/excpt/i32/alloca.s (with props) branches/jcatena-branch/lib/sdk/crt2/excpt/i32/chkstk.s (with props) branches/jcatena-branch/lib/sdk/crt2/excpt/i32/chkstk0.s (with props) branches/jcatena-branch/lib/sdk/crt2/excpt/i32/globals.c (with props) branches/jcatena-branch/lib/sdk/crt2/excpt/i32/seh.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/ (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIacos.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIasin.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIatan.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIatan2.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIcos.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIcosh.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIexp.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIfmod.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIlog.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIlog10.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIpow.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIsin.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIsinh.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CIsqrt.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CItan.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/CItanh.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/ci.c (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/ (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/alldiv.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/alldvrm.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/allmul.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/allrem.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/allshl.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/allshr.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/aulldiv.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/aulldvrm.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/aullrem.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/aullshr.s (with props) branches/jcatena-branch/lib/sdk/crt2/math/i32/ftol2.obj (with props) branches/jcatena-branch/lib/sdk/crt2/math/rand.c (with props) branches/jcatena-branch/lib/sdk/crt2/mem/ (with props) branches/jcatena-branch/lib/sdk/crt2/mem/memchr.c (with props) branches/jcatena-branch/lib/sdk/crt2/mem/memcpy.c (with props) branches/jcatena-branch/lib/sdk/crt2/mem/memicmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/mem/memmove.c (with props) branches/jcatena-branch/lib/sdk/crt2/mem/memset.c (with props) branches/jcatena-branch/lib/sdk/crt2/stdlib/ (with props) branches/jcatena-branch/lib/sdk/crt2/stdlib/qsort.c (with props) branches/jcatena-branch/lib/sdk/crt2/stdlib/qsort1.c (with props) branches/jcatena-branch/lib/sdk/crt2/stdlib/vsnprintf.c (with props) branches/jcatena-branch/lib/sdk/crt2/stdlib/vsnwprintf.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/ (with props) branches/jcatena-branch/lib/sdk/crt2/string/atoi.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/atoi64.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/atol.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/ctype.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/i64toa.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/i64tow.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/itoa.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/itow.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/ltoa.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/ltow.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/mbstowcs.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/mbtowc.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strcat.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strchr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strcmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strcmpi.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strcpy.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/stricmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strlen.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strlwr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strncat.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strncmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strncpy.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strnicmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strnset.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strrchr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strrev.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strset.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strspn.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strstr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strtoul.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/strupr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/tcscat.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/tcschr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/tcscmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/tcscpy.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/ui64toa.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/ui64tow.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/ultoa.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/ultow.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcscat.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcschr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcscmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcscpy.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcscspn.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsicmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcslen.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcslwr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsncat.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsncmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsncpy.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsnicmp.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsnset.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsrchr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsrev.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsspn.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsstr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcstombs.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wcsupr.c (with props) branches/jcatena-branch/lib/sdk/crt2/string/wctomb.c (with props) branches/jcatena-branch/ntoskrnl/cc/cc.vcproj (with props) branches/jcatena-branch/ntoskrnl/config/cm.vcproj (with props) branches/jcatena-branch/ntoskrnl/dbgp/ (with props) branches/jcatena-branch/ntoskrnl/dbgp/DbgDumpCpu.c (with props) branches/jcatena-branch/ntoskrnl/dbgp/DbgDumpMem.c (with props) branches/jcatena-branch/ntoskrnl/dbgp/DbgPrint.c (with props) branches/jcatena-branch/ntoskrnl/dbgp/DbgQueryDebugFilterState.c (with props) branches/jcatena-branch/ntoskrnl/dbgp/DbgSetDebugFilterState.c (with props) branches/jcatena-branch/ntoskrnl/dbgp/dbgp.vcproj (with props) branches/jcatena-branch/ntoskrnl/dbgp/dbgp.vcproj.F20-JOSE.admin.user branches/jcatena-branch/ntoskrnl/dbgp/dbgp_bld.h (with props) branches/jcatena-branch/ntoskrnl/dbgp/ser1.c (with props) branches/jcatena-branch/ntoskrnl/ex/ex.vcproj (with props) branches/jcatena-branch/ntoskrnl/fsrtl/fs.vcproj (with props) branches/jcatena-branch/ntoskrnl/include/ntoskrnl_bld.h (with props) branches/jcatena-branch/ntoskrnl/io/iomgr/io.vcproj (with props) branches/jcatena-branch/ntoskrnl/io/pnpmgr/pnp.vcproj (with props) branches/jcatena-branch/ntoskrnl/kd64/kd.vcproj (with props) branches/jcatena-branch/ntoskrnl/ke/ke.vcproj (with props) branches/jcatena-branch/ntoskrnl/mm/ARM3/arm3.vcproj (with props) branches/jcatena-branch/ntoskrnl/mm/mm.vcproj (with props) branches/jcatena-branch/ntoskrnl/ntoskrnl.sln (with props) branches/jcatena-branch/ntoskrnl/ntoskrnl.vcproj (with props) branches/jcatena-branch/ntoskrnl/ntoskrnl.vsprops (with props) branches/jcatena-branch/ntoskrnl/ob/ob.vcproj (with props) branches/jcatena-branch/ntoskrnl/ps/ps.vcproj (with props) branches/jcatena-branch/ntoskrnl/rtl/rt.vcproj (with props) branches/jcatena-branch/ntoskrnl/se/se.vcproj (with props) branches/jcatena-branch/root.vsprops branches/jcatena-branch/tools/pipetools/pipetools.mak - copied unchanged from r45368, trunk/reactos/tools/pipetools/pipetools.mak Removed: branches/jcatena-branch/hal/halx86/generic/irq.S branches/jcatena-branch/hal/halx86/generic/v86.s Modified: branches/jcatena-branch/ (props changed) branches/jcatena-branch/ReactOS-arm.rbuild branches/jcatena-branch/base/services/umpnpmgr/umpnpmgr.c branches/jcatena-branch/base/setup/usetup/lang/uk-UA.h branches/jcatena-branch/base/system/lsass/lsass.c branches/jcatena-branch/base/system/services/rpcserver.c branches/jcatena-branch/boot/bootdata/hivedef_i386.inf branches/jcatena-branch/boot/freeldr/freeldr/arch/arm/loader.c branches/jcatena-branch/dll/cpl/sysdm/general.c branches/jcatena-branch/dll/cpl/sysdm/lang/de-DE.rc branches/jcatena-branch/dll/cpl/sysdm/lang/en-US.rc branches/jcatena-branch/dll/cpl/sysdm/resource.h branches/jcatena-branch/dll/directx/d3d8/d3d8.spec (props changed) branches/jcatena-branch/dll/directx/dsound_new/classfactory.c (props changed) branches/jcatena-branch/dll/directx/dsound_new/dsound.spec (props changed) branches/jcatena-branch/dll/directx/dsound_new/regsvr.c (props changed) branches/jcatena-branch/dll/shellext/devcpux/devcpux.spec (props changed) branches/jcatena-branch/dll/shellext/slayer/slayer.spec (props changed) branches/jcatena-branch/dll/win32/advapi32/service/scm.c branches/jcatena-branch/dll/win32/gdi32/misc/misc.c branches/jcatena-branch/dll/win32/user32/include/ntwrapper.h branches/jcatena-branch/dll/win32/user32/user32.pspec branches/jcatena-branch/dll/win32/user32/windows/icon.c branches/jcatena-branch/dll/win32/user32/windows/paint.c branches/jcatena-branch/dll/win32/wshtcpip/wshtcpip.c branches/jcatena-branch/drivers/base/bootvid/i386/bootvid.c branches/jcatena-branch/drivers/wdm/audio/backpln/portcls/irpstream.cpp branches/jcatena-branch/hal/halarm/generic/hal.c branches/jcatena-branch/hal/halx86/generic/bios.c branches/jcatena-branch/hal/halx86/generic/dma.c branches/jcatena-branch/hal/halx86/generic/misc.c branches/jcatena-branch/hal/halx86/generic/pic.c branches/jcatena-branch/hal/halx86/generic/systimer.S branches/jcatena-branch/hal/halx86/generic/timer.c branches/jcatena-branch/hal/halx86/hal_generic.rbuild branches/jcatena-branch/hal/halx86/hal_generic_up.rbuild branches/jcatena-branch/hal/halx86/include/halp.h branches/jcatena-branch/hal/halx86/mp/mpsirql.c branches/jcatena-branch/include/ddk/winddk.h branches/jcatena-branch/include/ndk/amd64/ (props changed) branches/jcatena-branch/include/ndk/amd64/asmmacro.S (props changed) branches/jcatena-branch/include/ndk/arm/ketypes.h branches/jcatena-branch/include/ndk/halfuncs.h branches/jcatena-branch/include/ndk/i386/ketypes.h branches/jcatena-branch/include/ndk/kefuncs.h branches/jcatena-branch/include/reactos/win32k/ntuser.h branches/jcatena-branch/lib/drivers/ip/transport/tcp/event.c branches/jcatena-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h branches/jcatena-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h branches/jcatena-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h branches/jcatena-branch/lib/drivers/oskittcp/include/oskitfreebsd.h branches/jcatena-branch/lib/drivers/oskittcp/oskittcp.rbuild branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/interface.c branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/ip_output.c branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/sleep.c branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/tcp_output.c branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/tcp_subr.c branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c branches/jcatena-branch/lib/drivers/sound/mmebuddy/wave/header.c branches/jcatena-branch/lib/drivers/sound/mmebuddy/wave/streaming.c branches/jcatena-branch/lib/sdk/crt/time/ (props changed) branches/jcatena-branch/ntoskrnl/config/ntapi.c branches/jcatena-branch/ntoskrnl/inbv/inbv.c branches/jcatena-branch/ntoskrnl/include/internal/arm/ke.h branches/jcatena-branch/ntoskrnl/include/internal/i386/asmmacro.S branches/jcatena-branch/ntoskrnl/include/internal/i386/ke.h branches/jcatena-branch/ntoskrnl/include/internal/ke.h branches/jcatena-branch/ntoskrnl/kdbg/ (props changed) branches/jcatena-branch/ntoskrnl/kdbg/kdb_cli.c branches/jcatena-branch/ntoskrnl/ke/arm/kiinit.c branches/jcatena-branch/ntoskrnl/ke/arm/stubs_asm.s branches/jcatena-branch/ntoskrnl/ke/arm/trap.s branches/jcatena-branch/ntoskrnl/ke/except.c branches/jcatena-branch/ntoskrnl/ke/i386/cpu.c branches/jcatena-branch/ntoskrnl/ke/i386/ctxswitch.S branches/jcatena-branch/ntoskrnl/ke/i386/irqobj.c branches/jcatena-branch/ntoskrnl/ke/i386/kiinit.c branches/jcatena-branch/ntoskrnl/ke/i386/trap.s branches/jcatena-branch/ntoskrnl/ke/i386/traphdlr.c branches/jcatena-branch/ntoskrnl/ke/i386/usercall_asm.S branches/jcatena-branch/ntoskrnl/ke/i386/v86vdm.c branches/jcatena-branch/ntoskrnl/ke/time.c branches/jcatena-branch/ntoskrnl/mm/ARM3/arm/init.c branches/jcatena-branch/ntoskrnl/ntoskrnl.pspec branches/jcatena-branch/ntoskrnl/ps/process.c branches/jcatena-branch/ntoskrnl/vdm/vdmexec.c branches/jcatena-branch/ntoskrnl/vdm/vdmmain.c branches/jcatena-branch/subsystems/win32/csrss/win32csr/guiconsole.c branches/jcatena-branch/subsystems/win32/win32k/eng/engwindow.c branches/jcatena-branch/subsystems/win32/win32k/include/dce.h branches/jcatena-branch/subsystems/win32/win32k/include/engobjects.h (props changed) branches/jcatena-branch/subsystems/win32/win32k/include/window.h branches/jcatena-branch/subsystems/win32/win32k/main/dllmain.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/cursoricon.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/monitor.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/ntstubs.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/painting.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/simplecall.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/vis.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/windc.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/window.c branches/jcatena-branch/subsystems/win32/win32k/ntuser/winpos.c branches/jcatena-branch/subsystems/win32/win32k/objects/gdiobj.c branches/jcatena-branch/tools/pipetools/piperead.cpp branches/jcatena-branch/tools/rbuild/backend/mingw/compilers/gcc.mak branches/jcatena-branch/tools/rsym/log2lines.c (contents, props changed) branches/jcatena-branch/tools/rsym/log2lines.mak (props changed) branches/jcatena-branch/tools/rsym/rsym.c (props changed) branches/jcatena-branch/tools/rsym/rsym.h (props changed) branches/jcatena-branch/tools/rsym/rsym.mak (props changed) branches/jcatena-branch/tools/rsym/rsym_common.c (props changed) branches/jcatena-branch/tools/tools.mak [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/jcatena-branch/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ReactOS-arm.rbui… Modified: branches/jcatena-branch/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/services/um… Modified: branches/jcatena-branch/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/setup/usetu… Modified: branches/jcatena-branch/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/system/lsas… Modified: branches/jcatena-branch/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/base/system/serv… Modified: branches/jcatena-branch/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/boot/bootdata/hi… Modified: branches/jcatena-branch/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/boot/freeldr/fre… Modified: branches/jcatena-branch/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/cpl/sysdm/ge… Modified: branches/jcatena-branch/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/cpl/sysdm/la… Modified: branches/jcatena-branch/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/cpl/sysdm/la… Modified: branches/jcatena-branch/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/cpl/sysdm/re… Modified: branches/jcatena-branch/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/advapi… Modified: branches/jcatena-branch/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/gdi32/… Modified: branches/jcatena-branch/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/user32… Modified: branches/jcatena-branch/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/dll/win32/wshtcp… Modified: branches/jcatena-branch/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/base/boo… Added: branches/jcatena-branch/drivers/base/kddll/kdcom.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/base/kdd… Added: branches/jcatena-branch/drivers/base/kddll/kdcom_bld.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/base/kdd… Modified: branches/jcatena-branch/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/drivers/wdm/audi… Modified: branches/jcatena-branch/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halarm/gener… Modified: branches/jcatena-branch/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Removed: branches/jcatena-branch/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/pic.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Removed: branches/jcatena-branch/hal/halx86/generic/v86.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/gener… Modified: branches/jcatena-branch/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/hal_g… Modified: branches/jcatena-branch/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/hal_g… Modified: branches/jcatena-branch/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/inclu… Modified: branches/jcatena-branch/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/hal/halx86/mp/mp… Modified: branches/jcatena-branch/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ddk/wind… Modified: branches/jcatena-branch/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ndk/arm/… Modified: branches/jcatena-branch/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ndk/half… Modified: branches/jcatena-branch/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ndk/i386… Modified: branches/jcatena-branch/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/ndk/kefu… Modified: branches/jcatena-branch/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/include/reactos/… Added: branches/jcatena-branch/lib/cpu/i386/RegSave.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/cpu/i386/Reg… Added: branches/jcatena-branch/lib/cpu/i386/cpu.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/cpu/i386/cpu… Added: branches/jcatena-branch/lib/cpu/i386/cpu_bld.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/cpu/i386/cpu… Added: branches/jcatena-branch/lib/drivers/csq/csq.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/csq/… Modified: branches/jcatena-branch/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/ip/t… Modified: branches/jcatena-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/include/oskitfreebsd.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/sleep.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/tcp_output.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/tcp_subr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/oski… Modified: branches/jcatena-branch/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/soun… Modified: branches/jcatena-branch/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/drivers/soun… Added: branches/jcatena-branch/lib/rtl/rtl_bld.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/rtl/rtl_bld.… Added: branches/jcatena-branch/lib/sdk/crt2/crtnt.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/crt… Added: branches/jcatena-branch/lib/sdk/crt2/crtnt_bld.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/crt… Added: branches/jcatena-branch/lib/sdk/crt2/excpt/i32/alloca.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/exc… Added: branches/jcatena-branch/lib/sdk/crt2/excpt/i32/chkstk.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/exc… Added: branches/jcatena-branch/lib/sdk/crt2/excpt/i32/chkstk0.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/exc… Added: branches/jcatena-branch/lib/sdk/crt2/excpt/i32/globals.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/exc… Added: branches/jcatena-branch/lib/sdk/crt2/excpt/i32/seh.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/exc… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIacos.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIasin.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIatan.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIatan2.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIcos.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIcosh.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIexp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIfmod.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIlog.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIlog10.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIpow.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIsin.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIsinh.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CIsqrt.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CItan.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/CItanh.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/ci.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/alldiv.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/alldvrm.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/allmul.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/allrem.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/allshl.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/allshr.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/aulldiv.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/aulldvrm.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/aullrem.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/aullshr.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/i32/ftol2.obj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/math/rand.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mat… Added: branches/jcatena-branch/lib/sdk/crt2/mem/memchr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mem… Added: branches/jcatena-branch/lib/sdk/crt2/mem/memcpy.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mem… Added: branches/jcatena-branch/lib/sdk/crt2/mem/memicmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mem… Added: branches/jcatena-branch/lib/sdk/crt2/mem/memmove.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mem… Added: branches/jcatena-branch/lib/sdk/crt2/mem/memset.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/mem… Added: branches/jcatena-branch/lib/sdk/crt2/stdlib/qsort.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/std… Added: branches/jcatena-branch/lib/sdk/crt2/stdlib/qsort1.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/std… Added: branches/jcatena-branch/lib/sdk/crt2/stdlib/vsnprintf.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/std… Added: branches/jcatena-branch/lib/sdk/crt2/stdlib/vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/std… Added: branches/jcatena-branch/lib/sdk/crt2/string/atoi.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/atoi64.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/atol.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/ctype.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/i64toa.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/i64tow.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/itoa.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/itow.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/ltoa.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/ltow.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/mbtowc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strcat.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strchr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strcmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strcmpi.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strcpy.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/stricmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strlen.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strlwr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strncat.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strncmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strncpy.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strnicmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strnset.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strrchr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strrev.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strset.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strspn.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strstr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/strupr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/tcscat.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/tcschr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/tcscmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/tcscpy.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/ui64toa.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/ui64tow.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/ultoa.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/ultow.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcscat.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcschr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcscmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcscpy.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcscspn.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsicmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcslen.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcslwr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsncat.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsncmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsncpy.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsnicmp.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsnset.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsrchr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsrev.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsspn.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsstr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcstombs.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wcsupr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/lib/sdk/crt2/string/wctomb.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/lib/sdk/crt2/str… Added: branches/jcatena-branch/ntoskrnl/cc/cc.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/cc/cc.v… Added: branches/jcatena-branch/ntoskrnl/config/cm.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/config/… Modified: branches/jcatena-branch/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/config/… Added: branches/jcatena-branch/ntoskrnl/dbgp/DbgDumpCpu.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/Db… Added: branches/jcatena-branch/ntoskrnl/dbgp/DbgDumpMem.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/Db… Added: branches/jcatena-branch/ntoskrnl/dbgp/DbgPrint.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/Db… Added: branches/jcatena-branch/ntoskrnl/dbgp/DbgQueryDebugFilterState.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/Db… Added: branches/jcatena-branch/ntoskrnl/dbgp/DbgSetDebugFilterState.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/Db… Added: branches/jcatena-branch/ntoskrnl/dbgp/dbgp.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/db… Added: branches/jcatena-branch/ntoskrnl/dbgp/dbgp.vcproj.F20-JOSE.admin.user URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/db… Added: branches/jcatena-branch/ntoskrnl/dbgp/dbgp_bld.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/db… Added: branches/jcatena-branch/ntoskrnl/dbgp/ser1.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/dbgp/se… Added: branches/jcatena-branch/ntoskrnl/ex/ex.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/ex.v… Added: branches/jcatena-branch/ntoskrnl/fsrtl/fs.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/fsrtl/f… Modified: branches/jcatena-branch/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/inbv/in… Modified: branches/jcatena-branch/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Modified: branches/jcatena-branch/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Added: branches/jcatena-branch/ntoskrnl/include/ntoskrnl_bld.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… Added: branches/jcatena-branch/ntoskrnl/io/iomgr/io.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/io/iomg… Added: branches/jcatena-branch/ntoskrnl/io/pnpmgr/pnp.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/io/pnpm… Added: branches/jcatena-branch/ntoskrnl/kd64/kd.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/kd64/kd… Modified: branches/jcatena-branch/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/kdbg/kd… Modified: branches/jcatena-branch/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/arm/… Modified: branches/jcatena-branch/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/arm/… Modified: branches/jcatena-branch/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/arm/… Modified: branches/jcatena-branch/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/exce… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Modified: branches/jcatena-branch/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… Added: branches/jcatena-branch/ntoskrnl/ke/ke.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/ke.v… Modified: branches/jcatena-branch/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/time… Modified: branches/jcatena-branch/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/mm/ARM3… Added: branches/jcatena-branch/ntoskrnl/mm/ARM3/arm3.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/mm/ARM3… Added: branches/jcatena-branch/ntoskrnl/mm/mm.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/mm/mm.v… Modified: branches/jcatena-branch/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ntoskrn… Added: branches/jcatena-branch/ntoskrnl/ntoskrnl.sln URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ntoskrn… Added: branches/jcatena-branch/ntoskrnl/ntoskrnl.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ntoskrn… Added: branches/jcatena-branch/ntoskrnl/ntoskrnl.vsprops URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ntoskrn… Added: branches/jcatena-branch/ntoskrnl/ob/ob.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ob/ob.v… Modified: branches/jcatena-branch/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ps/proc… Added: branches/jcatena-branch/ntoskrnl/ps/ps.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ps/ps.v… Added: branches/jcatena-branch/ntoskrnl/rtl/rt.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/rtl/rt.… Added: branches/jcatena-branch/ntoskrnl/se/se.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/se/se.v… Modified: branches/jcatena-branch/ntoskrnl/vdm/vdmexec.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/vdm/vdm… Modified: branches/jcatena-branch/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/vdm/vdm… Added: branches/jcatena-branch/root.vsprops URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/root.vsprops?rev… Modified: branches/jcatena-branch/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/subsystems/win32… Modified: branches/jcatena-branch/tools/pipetools/piperead.cpp URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/tools/pipetools/… Modified: branches/jcatena-branch/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/tools/rbuild/bac… Modified: branches/jcatena-branch/tools/rsym/log2lines.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/tools/rsym/log2l… Modified: branches/jcatena-branch/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/tools/tools.mak?…

1 0

[sir_richard] 45368: [ARM]: Fix the ARM build, hopefully without breaking the x86 build in the process. Sorry buds!
by sir_richard＠svn.reactos.org 01 Feb '10

01 Feb '10

Author: sir_richard Date: Mon Feb 1 04:51:45 2010 New Revision: 45368 URL: http://svn.reactos.org/svn/reactos?rev=45368&view=rev Log: [ARM]: Fix the ARM build, hopefully without breaking the x86 build in the process. Sorry buds! Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/except.c trunk/reactos/ntoskrnl/ke/time.c trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=453… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -111,17 +111,7 @@ <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> </directory> <directory name="hal"> - <directory name="halarm"> - <directory name="generic"> - <xi:include href="hal/halarm/generic/generic.rbuild" /> - </directory> - <directory name="up"> - <xi:include href="hal/halarm/up/halup.rbuild" /> - </directory> - </directory> - <directory name="hal"> - <xi:include href="hal/hal/hal.rbuild" /> - </directory> + <xi:include href="hal/hal.rbuild" /> </directory> <directory name="boot"> <xi:include href="boot/boot.rbuild" /> 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] Mon Feb 1 04:51:45 2010 @@ -1016,7 +1016,7 @@ // // Jump to Kernel // - (*KernelEntryPoint)(Magic, (PVOID)((ULONG_PTR)ArmLoaderBlock | KSEG0_BASE)); + (*KernelEntryPoint)((PVOID)((ULONG_PTR)ArmLoaderBlock | KSEG0_BASE)); } VOID Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -23,6 +23,14 @@ #define READ_REGISTER_ULONG(r) (*((volatile ULONG * const)(r))) #define WRITE_REGISTER_ULONG(r, v) (*((volatile ULONG *)(r)) = (v)) + +VOID +FASTCALL +KeUpdateSystemTime( + IN PKTRAP_FRAME TrapFrame, + IN ULONG Increment, + IN KIRQL OldIrql +); /* DATA **********************************************************************/ @@ -256,9 +264,9 @@ BOOLEAN NTAPI -HalBeginSystemInterrupt (KIRQL Irql, - ULONG Vector, - PKIRQL OldIrql) +HalBeginSystemInterrupt(IN KIRQL Irql, + IN UCHAR Vector, + OUT PKIRQL OldIrql) { UNIMPLEMENTED; @@ -278,8 +286,8 @@ VOID NTAPI -HalDisableSystemInterrupt(ULONG Vector, - KIRQL Irql) +HalDisableSystemInterrupt(IN UCHAR Vector, + IN KIRQL Irql) { UNIMPLEMENTED; } @@ -330,10 +338,9 @@ BOOLEAN NTAPI -HalEnableSystemInterrupt( - ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode) +HalEnableSystemInterrupt(IN UCHAR Vector, + IN KIRQL Irql, + IN KINTERRUPT_MODE InterruptMode) { UNIMPLEMENTED; @@ -343,9 +350,8 @@ VOID NTAPI -HalEndSystemInterrupt( - KIRQL Irql, - ULONG Unknown2) +HalEndSystemInterrupt(IN KIRQL OldIrql, + IN PKTRAP_FRAME TrapFrame) { UNIMPLEMENTED; } Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -343,6 +343,7 @@ ULONG KeDcacheFlushCount; ULONG KeExceptionDispatchCount; ULONG KeFirstLevelTbFills; + ULONG KeFloatingEmulationCount; ULONG KeIcacheFlushCount; ULONG KeSecondLevelTbFills; ULONG KeSystemCalls; Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -891,12 +891,7 @@ if (KeGetPreviousMode() == UserMode) return ZwInitializeRegistry(Flag); /* Enough of the system has booted by now */ - BootCyclesEnd = __rdtsc(); - DPRINT1("Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); - DPRINT1("Interrupts: %d System Calls: %d Context Switches: %d\n", - KeGetCurrentPrcb()->InterruptCount, - KeGetCurrentPrcb()->KeSystemCalls, - KeGetContextSwitches(KeGetCurrentPrcb())); + Ki386PerfEnd(); /* Validate flag */ if (Flag > CM_BOOT_FLAG_MAX) return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -2,6 +2,8 @@ #define __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H #include "intrin_i.h" + +#define KiServiceExit2 KiExceptionExit // //Lockdown TLB entries @@ -91,8 +93,12 @@ VOID KiPassiveRelease( VOID +); -); +VOID +KiSystemService(IN PKTHREAD Thread, + IN PKTRAP_FRAME TrapFrame, + IN ULONG Instruction); VOID KiApcInterrupt( @@ -113,7 +119,11 @@ VOID ); -#define KiSystemStartupReal KiSystemStartup +#define Ki386PerfEnd() +#define KiEndInterrupt(x,y) + +#define KiGetLinkedTrapFrame(x) \ + (PKTRAP_FRAME)((x)->PreviousTrapFrame) #define KiGetPreviousMode(tf) \ ((tf->Spsr & CPSR_MODES) == CPSR_USER_MODE) ? UserMode: KernelMode Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -33,6 +33,9 @@ #define KeGetTrapFramePc(TrapFrame) \ ((TrapFrame)->Eip) +#define KiGetLinkedTrapFrame(x) \ + (PKTRAP_FRAME)((x)->Edx) + #define KeGetContextReturnRegister(Context) \ ((Context)->Eax) @@ -451,7 +454,6 @@ extern VOID __cdecl KiTrap02(VOID); extern VOID __cdecl KiTrap08(VOID); extern VOID __cdecl KiTrap13(VOID); -extern VOID __cdecl KiInterruptTemplate(VOID); extern VOID __cdecl KiFastCallEntry(VOID); extern VOID NTAPI ExpInterlockedPopEntrySListFault(VOID); extern VOID __cdecl CopyParams(VOID); @@ -740,5 +742,38 @@ ); } +// +// Normally this is done by the HAL, but on x86 as an optimization, the kernel +// initiates the end by calling back into the HAL and exiting the trap here. +// +VOID +FORCEINLINE +KiEndInterrupt(IN KIRQL Irql, + IN PKTRAP_FRAME TrapFrame) +{ + /* Disable interrupts and end the interrupt */ + _disable(); + HalEndSystemInterrupt(Irql, TrapFrame); + + /* Exit the interrupt */ + KiEoiHelper(TrapFrame); +} + +// +// PERF Code +// +VOID +FORCEINLINE +Ki386PerfEnd(VOID) +{ + extern ULONGLONG BootCyclesEnd, BootCycles; + BootCyclesEnd = __rdtsc(); + DbgPrint("Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); + DbgPrint("Interrupts: %d System Calls: %d Context Switches: %d\n", + KeGetCurrentPrcb()->InterruptCount, + KeGetCurrentPrcb()->KeSystemCalls, + KeGetContextSwitches(KeGetCurrentPrcb())); +} + #endif #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H */ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -140,6 +140,7 @@ extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch; extern ULONGLONG BootCycles, BootCyclesEnd; extern ULONG ProcessCount; +extern VOID __cdecl KiInterruptTemplate(VOID); /* MACROS *************************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -18,6 +18,7 @@ BOOLEAN KeIsArmV6; ULONG KeNumberProcessIds; ULONG KeNumberTbEntries; +ULONG ProcessCount; // PERF extern PVOID KiArmVectorTable; #define __ARMV6__ KeIsArmV6 @@ -114,7 +115,7 @@ // // Copy the template code // - KxUnexpectedInterrupt.DispatchCode[i] = KiInterruptTemplate[i]; + KxUnexpectedInterrupt.DispatchCode[i] = ((PULONG)KiInterruptTemplate)[i]; } // Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -15,7 +15,6 @@ GENERATE_ARM_STUB DbgBreakPointWithStatus GENERATE_ARM_STUB KeRaiseUserException GENERATE_ARM_STUB KdpGdbStubInit -GENERATE_ARM_STUB NtRaiseException // // Driver ISRs @@ -37,4 +36,3 @@ GENERATE_ARM_STUB KeUserModeCallback GENERATE_ARM_STUB KiCallUserMode GENERATE_ARM_STUB NtCallbackReturn -GENERATE_ARM_STUB NtContinue Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -127,7 +127,6 @@ TRAP_EPILOG 0 // NotFromSystemCall ENTRY_END KiExceptionExit - NESTED_ENTRY KiServiceExit PROLOG_END KiServiceExit // Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -180,10 +180,12 @@ /* Get trap frame and link previous one*/ Thread = KeGetCurrentThread(); TrapFrame = Thread->TrapFrame; - Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; + Thread->TrapFrame = KiGetLinkedTrapFrame(TrapFrame); /* Set exception list */ +#ifdef _M_IX86 KeGetPcr()->Tib.ExceptionList = TrapFrame->ExceptionList; +#endif /* Raise the exception */ Status = KiRaiseException(ExceptionRecord, @@ -218,7 +220,7 @@ /* Get trap frame and link previous one*/ Thread = KeGetCurrentThread(); TrapFrame = Thread->TrapFrame; - Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; + Thread->TrapFrame = KiGetLinkedTrapFrame(TrapFrame); /* Continue from this point on */ Status = KiContinue(Context, NULL, TrapFrame); Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=453… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -113,11 +113,7 @@ } /* Disable interrupts and end the interrupt */ - _disable(); - HalEndSystemInterrupt(Irql, TrapFrame); - - /* Exit the interrupt */ - KiEoiHelper(TrapFrame); + KiEndInterrupt(Irql, TrapFrame); } VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -57,6 +57,7 @@ PVOID MmSystemCacheStart; PVOID MmSystemCacheEnd; MMSUPPORT MmSystemCacheWs; +PVOID MmHyperSpaceEnd; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Mon Feb 1 04:51:45 2010 @@ -845,16 +845,7 @@ PspRunCreateProcessNotifyRoutines(Process, TRUE); /* If 12 processes have been created, enough of user-mode is ready */ - if (++ProcessCount == 12) - { - /* Enough of the system has booted by now */ - BootCyclesEnd = __rdtsc(); - DPRINT1("User Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); - DPRINT1("Interrupts: %d System Calls: %d Context Switches: %d\n", - KeGetCurrentPrcb()->InterruptCount, - KeGetCurrentPrcb()->KeSystemCalls, - KeGetContextSwitches(KeGetCurrentPrcb())); - } + if (++ProcessCount == 12) Ki386PerfEnd(); CleanupWithRef: /*

1 0

[sir_richard] 45367: [NTOS]: Try to fix KiEnterInterrupt once and for all. Only set segments for V8086 or user traps. [NTOS]: Rework the way traps with possibly dirty DS/ES segments are handled. The FAST V86 hack is gone. Intead, created a "safe" version of IsTrapV86 and IsTrapUser that does an SS segment dereference (known good). The condition is then based on this, and the segments are saved and loaded safely. Note that for GCC 4.5 the ASM can be improved to directly branch or not to a label,
by sir_richard＠svn.reactos.org 01 Feb '10

01 Feb '10

Author: sir_richard Date: Mon Feb 1 04:47:42 2010 New Revision: 45367 URL: http://svn.reactos.org/svn/reactos?rev=45367&view=rev Log: [NTOS]: Try to fix KiEnterInterrupt once and for all. Only set segments for V8086 or user traps. [NTOS]: Rework the way traps with possibly dirty DS/ES segments are handled. The FAST V86 hack is gone. Intead, created a "safe" version of IsTrapV86 and IsTrapUser that does an SS segment dereference (known good). The condition is then based on this, and the segments are saved and loaded safely. Note that for GCC 4.5 the ASM can be improved to directly branch or not to a label, instead of returning a boolean that is then further compared before branching. This will fix certain exceptions that were seen in KeUpdateSystemTime, and might fix the sneaking HalpTrap0D while not in V86 mode (no promises). Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c 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] Mon Feb 1 04:47:42 2010 @@ -406,6 +406,68 @@ asm volatile(".byte 0xC4\n.byte 0xC4\n"); } +// +// Returns whether or not this is a V86 trap by checking the EFLAGS field. +// +// FIXME: GCC 4.5 Can Improve this with "goto labels" +// +BOOLEAN +FORCEINLINE +KiIsV8086TrapSafe(IN PKTRAP_FRAME TrapFrame) +{ + BOOLEAN Result; + + /* + * The check MUST be done this way, as we guarantee that no DS/ES/FS segment + * is used (since it might be garbage). + * + * Instead, we use the SS segment which is guaranteed to be correct. Because + * operate in 32-bit flat mode, this works just fine. + */ + asm volatile + ( + "testl $%c[f], %%ss:%1\n" + "setnz %0\n" + : "=a"(Result) + : "m"(TrapFrame->EFlags), + [f] "i"(EFLAGS_V86_MASK) + ); + + /* If V86 flag was set */ + return Result; +} + +// +// Returns whether or not this is a user-mode trap by checking the SegCs field. +// +// FIXME: GCC 4.5 Can Improve this with "goto labels" +// +BOOLEAN +FORCEINLINE +KiIsUserTrapSafe(IN PKTRAP_FRAME TrapFrame) +{ + BOOLEAN Result; + + /* + * The check MUST be done this way, as we guarantee that no DS/ES/FS segment + * is used (since it might be garbage). + * + * Instead, we use the SS segment which is guaranteed to be correct. Because + * operate in 32-bit flat mode, this works just fine. + */ + asm volatile + ( + "cmp $%c[f], %%ss:%1\n" + "setnz %0\n" + : "=a"(Result) + : "m"(TrapFrame->SegCs), + [f] "i"(KGDT_R0_CODE) + ); + + /* If V86 flag was set */ + return Result; +} + VOID FORCEINLINE KiUserSystemCall(IN PKTRAP_FRAME TrapFrame) @@ -638,28 +700,39 @@ FORCEINLINE KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) { + ULONG Ds, Es; + /* Check for V86 mode, otherwise check for ring 3 code */ - if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) - { + if (__builtin_expect(KiIsV8086TrapSafe(TrapFrame), 0)) + { + /* Set correct segments */ + Ke386SetDs(KGDT_R3_DATA | RPL_MASK); + Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + Ke386SetFs(KGDT_R0_PCR); + /* Restore V8086 segments into Protected Mode segments */ TrapFrame->SegFs = TrapFrame->V86Fs; TrapFrame->SegGs = TrapFrame->V86Gs; TrapFrame->SegDs = TrapFrame->V86Ds; TrapFrame->SegEs = TrapFrame->V86Es; } - else if (__builtin_expect(TrapFrame->SegCs != KGDT_R0_CODE, 1)) /* Ring 3 is more common */ - { - /* Save segments and then switch to correct ones */ + 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); + + /* Save FS/GS */ TrapFrame->SegFs = Ke386GetFs(); TrapFrame->SegGs = Ke386GetGs(); - TrapFrame->SegDs = Ke386GetDs(); - TrapFrame->SegEs = Ke386GetEs(); - } - - /* Set correct segments */ - Ke386SetFs(KGDT_R0_PCR); - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + + /* Set correct FS */ + Ke386SetFs(KGDT_R0_PCR); + } /* Save exception list and terminate it */ TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; @@ -743,7 +816,7 @@ // Generates a Trap Prolog Stub for the given name // #define KI_PUSH_FAKE_ERROR_CODE 0x1 -#define KI_FAST_V86_TRAP 0x2 +#define KI_UNUSED 0x2 #define KI_NONVOLATILES_ONLY 0x4 #define KI_FAST_SYSTEM_CALL 0x8 #define KI_SOFTWARE_TRAP 0x10 @@ -836,20 +909,13 @@ /* Now go ahead and make space for this frame */ __asm__ __volatile__ ("subl $%c[e],%%esp\n":: [e] "i"(FrameSize) : "%esp"); __asm__ __volatile__ ("subl $%c[e],%%ecx\n":: [e] "i"(FrameSize) : "%ecx"); - - /* For Fast-V86 traps, set parameter 2 (EDX) to hold EFlags */ - if (Flags & KI_FAST_V86_TRAP) __asm__ __volatile__ - ( - "movl %c[f](%%esp), %%edx\n" - : - : [f] "i"(FIELD_OFFSET(KTRAP_FRAME, EFlags)) - ); - else if (Flags & KI_HARDWARE_INT) __asm__ __volatile__ - ( - /* - * For hardware interrupts, set parameter 2 (EDX) to hold KINTERRUPT. - * This code will be dynamically patched when an interrupt is registered! - */ + + /* + * For hardware interrupts, set parameter 2 (EDX) to hold KINTERRUPT. + * This code will be dynamically patched when an interrupt is registered! + */ + if (Flags & KI_HARDWARE_INT) __asm__ __volatile__ + ( ".globl _KiInterruptTemplate2ndDispatch\n_KiInterruptTemplate2ndDispatch:\n" "movl $0, %%edx\n" ".globl _KiInterruptTemplateObject\n_KiInterruptTemplateObject:\n" Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon Feb 1 04:47:42 2010 @@ -533,15 +533,14 @@ VOID FASTCALL DECLSPEC_NORETURN -KiTrap06Handler(IN PKTRAP_FRAME TrapFrame, - IN ULONG EFlags) +KiTrap06Handler(IN PKTRAP_FRAME TrapFrame) { PUCHAR Instruction; ULONG i; KIRQL OldIrql; /* Check for V86 GPF */ - if (__builtin_expect(EFlags & EFLAGS_V86_MASK, 1)) + if (__builtin_expect(KiIsV8086TrapSafe(TrapFrame), 1)) { /* Enter V86 trap */ KiEnterV86Trap(TrapFrame); @@ -792,8 +791,7 @@ VOID FASTCALL DECLSPEC_NORETURN -KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame, - IN ULONG EFlags) +KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame) { ULONG i, j, Iopl; BOOLEAN Privileged = FALSE; @@ -802,7 +800,7 @@ KIRQL OldIrql; /* Check for V86 GPF */ - if (__builtin_expect(EFlags & EFLAGS_V86_MASK, 1)) + if (__builtin_expect(KiIsV8086TrapSafe(TrapFrame), 1)) { /* Enter V86 trap */ KiEnterV86Trap(TrapFrame); @@ -1581,14 +1579,14 @@ KiTrap(KiTrap03, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap04, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap05, KI_PUSH_FAKE_ERROR_CODE); -KiTrap(KiTrap06, KI_PUSH_FAKE_ERROR_CODE | KI_FAST_V86_TRAP); +KiTrap(KiTrap06, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap07, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap08, 0); KiTrap(KiTrap09, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap0A, 0); KiTrap(KiTrap0B, 0); KiTrap(KiTrap0C, 0); -KiTrap(KiTrap0D, KI_FAST_V86_TRAP); +KiTrap(KiTrap0D, 0); KiTrap(KiTrap0E, 0); KiTrap(KiTrap0F, KI_PUSH_FAKE_ERROR_CODE); KiTrap(KiTrap10, KI_PUSH_FAKE_ERROR_CODE);

1 0

[ekohl] 45366: GetServiceDisplayNameA/W and GetServiceKeyNameA/W must return an empty String if the given Buffer is too small. This fixes 6 tests.
by ekohl＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: ekohl Date: Sun Jan 31 23:22:50 2010 New Revision: 45366 URL: http://svn.reactos.org/svn/reactos?rev=45366&view=rev Log: GetServiceDisplayNameA/W and GetServiceKeyNameA/W must return an empty String if the given Buffer is too small. This fixes 6 tests. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Jan 31 23:22:50 2010 @@ -1289,6 +1289,8 @@ LPDWORD lpcchBuffer) { DWORD dwError; + LPSTR lpNameBuffer; + CHAR szEmptyName[] = ""; TRACE("GetServiceDisplayNameA() called\n"); TRACE("%p %s %p %p\n", hSCManager, @@ -1300,14 +1302,21 @@ return FALSE; } - if (!lpDisplayName) - *lpcchBuffer = 0; + if (!lpDisplayName || *lpcchBuffer < sizeof(CHAR)) + { + lpNameBuffer = szEmptyName; + *lpcchBuffer = sizeof(CHAR); + } + else + { + lpNameBuffer = lpDisplayName; + } RpcTryExcept { dwError = RGetServiceDisplayNameA((SC_RPC_HANDLE)hSCManager, lpServiceName, - lpDisplayName, + lpNameBuffer, lpcchBuffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -1315,8 +1324,6 @@ /* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */ dwError = ScmRpcStatusToWinError(RpcExceptionCode()); } - - RpcEndExcept; if (dwError != ERROR_SUCCESS) @@ -1342,6 +1349,8 @@ LPDWORD lpcchBuffer) { DWORD dwError; + LPWSTR lpNameBuffer; + WCHAR szEmptyName[] = L""; TRACE("GetServiceDisplayNameW() called\n"); @@ -1351,14 +1360,21 @@ return FALSE; } - if (!lpDisplayName) - *lpcchBuffer = 0; + if (!lpDisplayName || *lpcchBuffer < sizeof(WCHAR)) + { + lpNameBuffer = szEmptyName; + *lpcchBuffer = sizeof(WCHAR); + } + else + { + lpNameBuffer = lpDisplayName; + } RpcTryExcept { dwError = RGetServiceDisplayNameW((SC_RPC_HANDLE)hSCManager, lpServiceName, - lpDisplayName, + lpNameBuffer, lpcchBuffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -1390,6 +1406,8 @@ LPDWORD lpcchBuffer) { DWORD dwError; + LPSTR lpNameBuffer; + CHAR szEmptyName[] = ""; TRACE("GetServiceKeyNameA() called\n"); @@ -1399,23 +1417,21 @@ return FALSE; } - if (!lpDisplayName) - { - SetLastError(ERROR_INVALID_ADDRESS); - - if (!lpServiceName) - *lpcchBuffer = 1; - return FALSE; - } - - if (!lpServiceName) - *lpcchBuffer = 0; + if (!lpServiceName || *lpcchBuffer < sizeof(CHAR)) + { + lpNameBuffer = szEmptyName; + *lpcchBuffer = sizeof(CHAR); + } + else + { + lpNameBuffer = lpServiceName; + } RpcTryExcept { dwError = RGetServiceKeyNameA((SC_RPC_HANDLE)hSCManager, lpDisplayName, - lpServiceName, + lpNameBuffer, lpcchBuffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -1447,6 +1463,8 @@ LPDWORD lpcchBuffer) { DWORD dwError; + LPWSTR lpNameBuffer; + WCHAR szEmptyName[] = L""; TRACE("GetServiceKeyNameW() called\n"); @@ -1456,23 +1474,21 @@ return FALSE; } - if (!lpDisplayName) - { - SetLastError(ERROR_INVALID_ADDRESS); - - if (!lpServiceName) - *lpcchBuffer = 1; - return FALSE; - } - - if (!lpServiceName) - *lpcchBuffer = 0; + if (!lpServiceName || *lpcchBuffer < sizeof(WCHAR)) + { + lpNameBuffer = szEmptyName; + *lpcchBuffer = sizeof(WCHAR); + } + else + { + lpNameBuffer = lpServiceName; + } RpcTryExcept { dwError = RGetServiceKeyNameW((SC_RPC_HANDLE)hSCManager, lpDisplayName, - lpServiceName, + lpNameBuffer, lpcchBuffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER)

1 0

[cfinck] 45365: - Change version to 1.5-RC2. - Clear up the information in SVN-Readme.txt.
by cfinck＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: cfinck Date: Sun Jan 31 22:07:24 2010 New Revision: 45365 URL: http://svn.reactos.org/svn/reactos?rev=45365&view=rev Log: - Change version to 1.5-RC2. - Clear up the information in SVN-Readme.txt. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] Sun Jan 31 22:07:24 2010 @@ -1,5 +1,5 @@ ReactOS Build Environment - Version 1.5 for Unix-based operating systems + Version 1.5-RC2 for Unix-based operating systems Base package and i386 build tools by Colin Finck (colin(a)reactos.org) Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Sun Jan 31 22:07:24 2010 @@ -21,8 +21,8 @@ # RosBE-Unix Constants DEFAULT_INSTALL_DIR="/usr/local/RosBE" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5-RC1" -ROSBE_VERSION="1.5" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5-RC2" +ROSBE_VERSION="1.5-RC2" TARGET_ARCH="i386" source "$rs_scriptdir/scripts/rosbelibrary.sh" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt [iso-8859-1] Sun Jan 31 22:07:24 2010 @@ -1,25 +1,35 @@ -Put the following files into this directory: +Put the following files from the appropriate subdirectory of http://svn.reactos.org/RosBE-Sources into this directory. +The arrows tell you what these files contain (if you want to package them yourself). - binutils.tar.bz2 - --> containing the binutils source tree in a subdirectory "binutils" - Source is available here: http://www.gnu.org/software/binutils/ + --> Contains the Binutils source tree in a subdirectory "binutils". + Source is available here: http://www.gnu.org/software/binutils - gcc.tar.bz2 - --> containing the gcc source tree for C and C++ compilation in a subdirectory "gcc" - Source is available here: http://gcc.gnu.org/svn.html + --> Contains the GCC source tree (core and g++) in a subdirectory "gcc". + Source is available here: http://gcc.gnu.org + +- gmp.tar.bz2 + --> Contains the GMP source tree in a subdirectory "gmp". + Source is available here: http://gmplib.org - make.tar.bz2 - --> containing the make source tree in a subdirectory "make" + --> Contains the GNU Make source tree in a subdirectory "make". Source is available here: http://savannah.gnu.org/cvs/?group=make -- mingw-runtime.tar.bz2 - --> containing the "include" and "lib" subdirectories of the mingw-runtime package - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 +- mingw_runtime_dev.tar.bz2 + --> Created by RosBE-Windows' "buildtoolchain.sh" script from its mingw_runtime.tar.bz2 package. + That mingw_runtime.tar.bz2 package contains the MinGW Runtime source tree in a subdirectory "mingw_runtime". + Its source is available here: http://sourceforge.net/projects/mingw + +- mpfr.tar.bz2 + --> Contains the MPFR source tree in a subdirectory "mpfr". + Source is available here: http://mpfr.org - nasm.tar.bz2 - --> containing the nasm source tree in a subdirectory "nasm" - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=6208 + --> Contains the NASM source tree in a subdirectory "nasm". + Source is available here: http://sourceforge.net/projects/nasm/files - w32api.tar.bz2 - --> containing the "include" and "lib" subdirectories of the w32api package - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 + --> Contains the "include" and "lib" subdirectories of the w32api package. + Source is available here: http://sourceforge.net/projects/mingw/files

1 0

[ekohl] 45364: [FORMATTING] - Fix indentation. No code changes.
by ekohl＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: ekohl Date: Sun Jan 31 22:00:45 2010 New Revision: 45364 URL: http://svn.reactos.org/svn/reactos?rev=45364&view=rev Log: [FORMATTING] - Fix indentation. No code changes. Modified: trunk/reactos/base/system/lsass/lsass.c Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Sun Jan 31 22:00:45 2010 @@ -37,43 +37,42 @@ #include <debug.h> INT WINAPI -wWinMain( - IN HINSTANCE hInstance, - IN HINSTANCE hPrevInstance, - IN LPWSTR lpCmdLine, - IN INT nShowCmd) +wWinMain(IN HINSTANCE hInstance, + IN HINSTANCE hPrevInstance, + IN LPWSTR lpCmdLine, + IN INT nShowCmd) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("Local Security Authority Subsystem\n"); - DPRINT(" Initializing...\n"); + DPRINT("Local Security Authority Subsystem\n"); + DPRINT(" Initializing...\n"); - /* Initialize the LSA server DLL. */ - Status = LsapInitLsa(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("LsapInitLsa() failed (Status 0x%08lX)\n", Status); - goto ByeBye; - } + /* Initialize the LSA server DLL. */ + Status = LsapInitLsa(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsapInitLsa() failed (Status 0x%08lX)\n", Status); + goto ByeBye; + } #if 0 - /* Initialize the SAM server DLL. */ - Status = SamIInitialize(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); - goto ByeBye; - } + /* Initialize the SAM server DLL. */ + Status = SamIInitialize(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); + goto ByeBye; + } #endif - /* FIXME: More initialization */ + /* FIXME: More initialization */ - DPRINT(" Done...\n"); + DPRINT(" Done...\n"); ByeBye: - NtTerminateThread(NtCurrentThread(), Status); + NtTerminateThread(NtCurrentThread(), Status); - return 0; + return 0; } /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs