Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[sir_richard] 49738: [ARMLLB]: Add the MACHINE_TYPE code for the ZOOM2, based on the standard machtype definitions maintained by the various boot loader communities.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:44:59 2010 New Revision: 49738 URL: http://svn.reactos.org/svn/reactos?rev=49738&view=rev Log: [ARMLLB]: Add the MACHINE_TYPE code for the ZOOM2, based on the standard machtype definitions maintained by the various boot loader communities. Modified: trunk/reactos/boot/armllb/inc/machtype.h Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/inc/machtype.h [iso-8859-1] Tue Nov 23 16:44:59 2010 @@ -24,4 +24,9 @@ // #define MACH_TYPE_OMAP3_BEAGLE 1546 +// +// LogicPD ZOOM-II MDK Board, OMAP3530 SoC +// +#define MACH_TYPE_OMAP_ZOOM2 1967 + /* EOF */

13 years, 10 months

[sir_richard] 49737: [ARMLLB]: Initialize hardware before parsing environment variables. This makes more sense, and also allows debug output from the environment scanning code.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:44:19 2010 New Revision: 49737 URL: http://svn.reactos.org/svn/reactos?rev=49737&view=rev Log: [ARMLLB]: Initialize hardware before parsing environment variables. This makes more sense, and also allows debug output from the environment scanning code. Modified: trunk/reactos/boot/armllb/main.c Modified: trunk/reactos/boot/armllb/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/main.c?rev=497… ============================================================================== --- trunk/reactos/boot/armllb/main.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/main.c [iso-8859-1] Tue Nov 23 16:44:19 2010 @@ -16,17 +16,17 @@ /* Make sure we are booting on the correct kind of machine */ if (BoardInfo != LlbHwGetBoardType()) while (TRUE); + /* Initialize hardware components */ + LlbHwInitialize(); + /* Either QEMU or U-Boot itself should send this information */ LlbEnvParseArguments(Arguments); - /* Initialize hardware components */ - LlbHwInitialize(); - /* Clean up the screen */ LlbVideoClearScreen(FALSE); /* Print header */ - printf("ReactOS ARM Low-Level Boot Loader [" __DATE__ " "__TIME__ "]\n"); + printf("\nReactOS ARM Low-Level Boot Loader [" __DATE__ " "__TIME__ "]\n"); /* Boot the OS Loader */ LlbBoot();

13 years, 10 months

[sir_richard] 49736: [ARMLLB]: Add uImage header which uBoot expects on the images it can load nicely (using "go" will not give us ATAGs, "bootm" requires this header). It's a static header instead...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:43:32 2010 New Revision: 49736 URL: http://svn.reactos.org/svn/reactos?rev=49736&view=rev Log: [ARMLLB]: Add uImage header which uBoot expects on the images it can load nicely (using "go" will not give us ATAGs, "bootm" requires this header). It's a static header instead of requiring the mkImage tool, since we can disable data checksums in uBoot. We basically fake being a Linux kernel and the LLB handles the ATAGs. [ARMLLB]: Add boot stack for Zoom2. Modified: trunk/reactos/boot/armllb/boot.s Modified: trunk/reactos/boot/armllb/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/boot.s?rev=497… ============================================================================== --- trunk/reactos/boot/armllb/boot.s [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/boot.s [iso-8859-1] Tue Nov 23 16:43:32 2010 @@ -13,15 +13,47 @@ NESTED_ENTRY _start PROLOG_END _start -#ifdef _OMAP3_ +#ifdef _BEAGLE_ // This is only used for TI BootROM on Beagle/Emulator for now /* - * On OMAP3, the boot is directly from TI BootROM that reads NAND flash. + * On Beagle, 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 +#elif _ZOOM2_ + /* + * On ZOOM2, we currently load from u-boot to make bring-up easier. + * + * In order to get ATAG and all that goodness, we have to fool u-boot into + * thinking we are a Linux ARM kernel. + * + * So this is a 'fake' uImage-format header, which will make u-boot grok our + * image and correctly execute it. + * + * Note that a data checksum is in the header, but thankfully we can disable + * the check. + * + * There's also a header checksum, but as long as there's no need to modify + * this header, we can leave it static. + * + * Finally, note that the "Image String" is sized as a 32-byte array in the + * uImage header format. The string chosen below is not only accurate, but + * also happens to fit exactly in 32 bytes, meaning we don't need to pad. + */ + .word 0x56190527 // Header Magic + .word 0x5E4B8444 // Checksum + .word 0x483BE54C // Timestamp + .word 0x0CA10000 // Image size (64K) + .word 0x00000081 // Load address + .word 0x40000081 // Entrypoint + .word 0x90873DD8 // Data Checksum ('setenv verify n' must be set!) + .byte 5 // Linux OS + .byte 2 // ARM + .byte 2 // Kernel + .byte 0 // No compression + .ascii "ReactOS ARM Low-Level Bootloader" #endif /* Load C entrypoint and setup LLB stack */ @@ -31,8 +63,14 @@ ENTRY_END _start L_BootStackEnd: +#ifdef _BEAGLE_ // This is only used for TI BootROM on Beagle/Emulator for now .long 0x00010000 - +#elif _ZOOM2_ // On ZOOM2 RAM starts at 0x80000000, not 0 + .long 0x81014000 +#else +#error Stack Address Not Defined +#endif + L_LlbStartup: .long LlbStartup

13 years, 10 months

[sir_richard] 49735: [ARMLLB]: Add support for ATAG_REVISION. [ARMLLB]: Fix support of ATAG_MEM: there can be multiple tags, one per DRAM bank. [ARMLLB]: Fix the default case not to "return": it sh...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:42:00 2010 New Revision: 49735 URL: http://svn.reactos.org/svn/reactos?rev=49735&view=rev Log: [ARMLLB]: Add support for ATAG_REVISION. [ARMLLB]: Fix support of ATAG_MEM: there can be multiple tags, one per DRAM bank. [ARMLLB]: Fix the default case not to "return": it should "Break" instead. [ARMLLB]: Only apply the RAMDisk hack on Beagle for now. Modified: trunk/reactos/boot/armllb/envir.c Modified: trunk/reactos/boot/armllb/envir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/envir.c?rev=49… ============================================================================== --- trunk/reactos/boot/armllb/envir.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/envir.c [iso-8859-1] Tue Nov 23 16:42:00 2010 @@ -9,10 +9,11 @@ #include "precomp.h" ULONG LlbEnvHwPageSize; -ULONG LlbEnvHwMemStart; -ULONG LlbEnvHwMemSize; -ULONG LlbEnvRamDiskStart; -ULONG LlbEnvRamDiskSize; +ULONG LlbEnvHwMemStart = 0; +ULONG LlbEnvHwMemSize = 0; +ULONG LlbEnvRamDiskStart = 0; +ULONG LlbEnvRamDiskSize = 0; +ULONG LlbEnvHwRevision; CHAR LlbEnvCmdLine[256]; CHAR LlbValueData[32]; @@ -35,11 +36,17 @@ LlbEnvHwPageSize = Atag->u.Core.PageSize; break; + case ATAG_REVISION: + + /* Save page size */ + LlbEnvHwRevision = Atag->u.Revision.Rev; + break; + case ATAG_MEM: /* Save RAM start and size */ - LlbEnvHwMemStart = Atag->u.Mem.Start; - LlbEnvHwMemSize = Atag->u.Mem.Size; + if (!LlbEnvHwMemStart) LlbEnvHwMemStart = Atag->u.Mem.Start; + LlbEnvHwMemSize += Atag->u.Mem.Size; break; case ATAG_INITRD2: @@ -48,6 +55,7 @@ LlbEnvRamDiskStart = Atag->u.InitRd2.Start; LlbEnvRamDiskSize = Atag->u.InitRd2.Size; +#ifdef _BEAGLE_ /* Make sure it's 16MB-aligned */ LlbEnvRamDiskSize = (LlbEnvRamDiskSize + (16 * 1024 * 1024) - 1) &~ ((16 * 1024 * 1024) - 1); @@ -55,6 +63,7 @@ /* The RAMDISK actually starts 16MB later */ LlbEnvRamDiskStart += 16 * 1024 * 1024; LlbEnvRamDiskSize -= 16 * 1024 * 1024; +#endif break; case ATAG_CMDLINE: @@ -68,7 +77,7 @@ /* Nothing left to handle */ case ATAG_NONE: default: - return; + break; } /* Next tag */ @@ -76,8 +85,11 @@ } /* For debugging */ - DbgPrint("[BOOTROM] PageSize: %dKB RAM: %dMB CMDLINE: %s\n", - LlbEnvHwPageSize / 1024, LlbEnvHwMemSize / 1024 / 1024, LlbEnvCmdLine); + DbgPrint("[BOOTROM] Board Revision: %lx PageSize: %dKB RAM: %dMB CMDLINE: %s\n" + "[RAMDISK] Base: %lx Size: %dMB\n", + LlbEnvHwRevision, + LlbEnvHwPageSize / 1024, LlbEnvHwMemSize / 1024 / 1024, LlbEnvCmdLine, + LlbEnvRamDiskStart, LlbEnvRamDiskSize / 1024 / 1024); } VOID

13 years, 10 months

[sir_richard] 49734: [ARMLLB]: Make DbgPrint compatible so we can use debug.h.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:40:10 2010 New Revision: 49734 URL: http://svn.reactos.org/svn/reactos?rev=49734&view=rev Log: [ARMLLB]: Make DbgPrint compatible so we can use debug.h. Modified: trunk/reactos/boot/armllb/crtsupp.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] Tue Nov 23 16:40:10 2010 @@ -40,7 +40,7 @@ return puts(printbuffer); } -VOID +ULONG DbgPrint(const char *fmt, ...) { va_list args; @@ -52,6 +52,7 @@ va_end(args); for (j = 0; j < i; j++) LlbSerialPutChar(Buffer[j]); + return 0; } /* EOF */

13 years, 10 months

[sir_richard] 49733: [HAL]: Make directory/buildfiles for OMAP3-specific HAL. Shared between ZOOM2 and Beagle for now.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:39:14 2010 New Revision: 49733 URL: http://svn.reactos.org/svn/reactos?rev=49733&view=rev Log: [HAL]: Make directory/buildfiles for OMAP3-specific HAL. Shared between ZOOM2 and Beagle for now. Added: trunk/reactos/hal/halarm/omap3/ trunk/reactos/hal/halarm/omap3/halinit_up.c (with props) trunk/reactos/hal/halarm/omap3/halup.rbuild (with props) trunk/reactos/hal/halarm/omap3/halup.rc (with props) Modified: trunk/reactos/hal/halarm/directory.rbuild Modified: trunk/reactos/hal/halarm/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halarm/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/directory.rbuild [iso-8859-1] Tue Nov 23 16:39:14 2010 @@ -8,4 +8,11 @@ <xi:include href="versa/halup.rbuild" /> </if> + <if property="SARCH" value="omap3-beagle"> + <xi:include href="omap3/halup.rbuild" /> + </if> + + <if property="SARCH" value="omap3-zoom2"> + <xi:include href="omap3/halup.rbuild" /> + </if> </group> Added: trunk/reactos/hal/halarm/omap3/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/omap3/halinit_u… ============================================================================== --- trunk/reactos/hal/halarm/omap3/halinit_up.c (added) +++ trunk/reactos/hal/halarm/omap3/halinit_up.c [iso-8859-1] Tue Nov 23 16:39:14 2010 @@ -1,0 +1,31 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: hal/halarm/omap3/halinit_up.c + * PURPOSE: OMAP3 Board-Specific HAL Initialization + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + +} + +VOID +HalpInitPhase1(VOID) +{ + +} + +/* EOF */ Propchange: trunk/reactos/hal/halarm/omap3/halinit_up.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halarm/omap3/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/omap3/halup.rbu… ============================================================================== --- trunk/reactos/hal/halarm/omap3/halup.rbuild (added) +++ trunk/reactos/hal/halarm/omap3/halup.rbuild [iso-8859-1] Tue Nov 23 16:39:14 2010 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="../hal.pspec" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include base="hal">include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>ntoskrnl</library> + <library>kdcom</library> + <directory name="omap3"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> +</module> Propchange: trunk/reactos/hal/halarm/omap3/halup.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halarm/omap3/halup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/omap3/halup.rc?… ============================================================================== --- trunk/reactos/hal/halarm/omap3/halup.rc (added) +++ trunk/reactos/hal/halarm/omap3/halup.rc [iso-8859-1] Tue Nov 23 16:39:14 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "X86 Uniprocessor Hardware Abstraction Layer\0" +#define REACTOS_STR_INTERNAL_NAME "halup\0" +#define REACTOS_STR_ORIGINAL_FILENAME "halup.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/hal/halarm/omap3/halup.rc ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 10 months

[sir_richard] 49732: [CRT]: _assert should use DbgRaiseAssertionFailure which is (a) correct and (b) portable, instead of __debugbreak.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:36:54 2010 New Revision: 49732 URL: http://svn.reactos.org/svn/reactos?rev=49732&view=rev Log: [CRT]: _assert should use DbgRaiseAssertionFailure which is (a) correct and (b) portable, instead of __debugbreak. Modified: trunk/reactos/lib/sdk/crt/misc/assert.c Modified: trunk/reactos/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/assert.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/assert.c [iso-8859-1] Tue Nov 23 16:36:54 2010 @@ -67,6 +67,6 @@ /* Does the user want to debug? */ if (iResult == IDRETRY) { - __debugbreak(); + DbgRaiseAssertionFailure(); } }

13 years, 10 months

[sir_richard] 49731: [PSDK]: Add missing DbgRaiseAssertionFailure inline to winnt.h header.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:36:24 2010 New Revision: 49731 URL: http://svn.reactos.org/svn/reactos?rev=49731&view=rev Log: [PSDK]: Add missing DbgRaiseAssertionFailure inline to winnt.h header. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Nov 23 16:36:24 2010 @@ -5265,12 +5265,24 @@ #endif #if defined(_M_IX86) + #ifdef _MSC_VER +#pragma intrinsic(__int2c) #pragma intrinsic(_mm_pause) #define YieldProcessor _mm_pause #else #define YieldProcessor() __asm__ __volatile__("pause"); -#endif +#define __int2c() __asm__ __volatile__("int $0x2c"); +#endif + + +FORCEINLINE +VOID +DbgRaiseAssertionFailure(VOID) +{ + __int2c(); +} + #elif defined (_M_AMD64) #ifdef _MSC_VER #pragma intrinsic(_mm_pause)

13 years, 10 months

[sir_richard] 49730: [WINE]: Fix non-x86 versions of Wine's push/pop exception frame macro.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:35:48 2010 New Revision: 49730 URL: http://svn.reactos.org/svn/reactos?rev=49730&view=rev Log: [WINE]: Fix non-x86 versions of Wine's push/pop exception frame macro. Modified: trunk/reactos/include/reactos/wine/exception.h Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] Tue Nov 23 16:35:48 2010 @@ -83,7 +83,7 @@ #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); frame->Prev = teb->ExceptionList; - teb->ExceptionList = frame; + teb->ExceptionList = (PVOID)frame; return frame->Prev; #endif } @@ -96,7 +96,7 @@ #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); frame->Prev = teb->ExceptionList; - teb->ExceptionList = frame; + teb->ExceptionList = (PVOID)frame; return frame->Prev; #endif }

13 years, 10 months

[sir_richard] 49729: [CRT]: Define JBLEN and JBTYPE for ARM, based on the Windows ARM CRT source code (public).

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Nov 23 16:35:13 2010 New Revision: 49729 URL: http://svn.reactos.org/svn/reactos?rev=49729&view=rev Log: [CRT]: Define JBLEN and JBTYPE for ARM, based on the Windows ARM CRT source code (public). Modified: trunk/reactos/include/crt/setjmp.h Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Tue Nov 23 16:35:13 2010 @@ -129,6 +129,15 @@ SETJMP_FLOAT128 Xmm15; } _JUMP_BUFFER; +#elif defined(_M_ARM) + +#define _JBLEN 11 +#define _JBTYPE int + +#else + +#error Define Setjmp for this architecture! + #endif #ifndef _JMP_BUF_DEFINED

13 years, 10 months

← Newer
1
...
12
13
14
15
16
17
18
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010