Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 41919: More properly neuter PSEH2 on ARM
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:42:04 2009 New Revision: 41919 URL: http://svn.reactos.org/svn/reactos?rev=41919&view=rev Log: More properly neuter PSEH2 on ARM Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Jul 12 14:42:04 2009 @@ -425,7 +425,7 @@ #define _SEH2_TRY { #define _SEH2_FINALLY } { -#define _SEH2_EXCEPT(...) } if (0 && __VA_ARGS__) { +#define _SEH2_EXCEPT(...) } if (0) { #define _SEH2_END } #define _SEH2_GetExceptionInformation()

1 0

[ros-arm-bringup] 41918: Define the base addresses as ULONG_PTR since pointer math on void* is illegal
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:41:50 2009 New Revision: 41918 URL: http://svn.reactos.org/svn/reactos?rev=41918&view=rev Log: Define the base addresses as ULONG_PTR since pointer math on void* is illegal Modified: trunk/reactos/include/reactos/arm/peripherals/pl011.h trunk/reactos/include/reactos/arm/peripherals/pl190.h trunk/reactos/include/reactos/arm/peripherals/sp804.h Modified: trunk/reactos/include/reactos/arm/peripherals/pl011.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] Sun Jul 12 14:41:50 2009 @@ -11,7 +11,7 @@ // // UART Registers // -#define UART_BASE (PVOID)0xE00F1000 /* HACK: freeldr mapped it here */ +#define UART_BASE (ULONG_PTR)0xE00F1000 /* HACK: freeldr mapped it here */ #define UART_PL01x_DR (UART_BASE + 0x00) #define UART_PL01x_RSR (UART_BASE + 0x04) Modified: trunk/reactos/include/reactos/arm/peripherals/pl190.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/pl190.h [iso-8859-1] Sun Jul 12 14:41:50 2009 @@ -11,7 +11,7 @@ // // VIC Registers // -#define VIC_BASE (PVOID)0xE0040000 /* HACK: freeldr mapped it here */ +#define VIC_BASE (ULONG_PTR)0xE0040000 /* HACK: freeldr mapped it here */ #define VIC_INT_STATUS (VIC_BASE + 0x00) #define VIC_INT_ENABLE (VIC_BASE + 0x10) Modified: trunk/reactos/include/reactos/arm/peripherals/sp804.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/sp804.h [iso-8859-1] Sun Jul 12 14:41:50 2009 @@ -11,7 +11,7 @@ // // Timer Registers // -#define TIMER_BASE(x) (PVOID)(0xE00E2000 + (x * 0x1000)) /* HACK: freeldr mapped it here */ +#define TIMER_BASE(x) (ULONG_PTR)(0xE00E2000 + (x * 0x1000)) /* HACK: freeldr mapped it here */ #define TIMER0_LOAD TIMER_BASE(0) + 0x00 #define TIMER0_VALUE TIMER_BASE(0) + 0x04 #define TIMER0_CONTROL TIMER_BASE(0) + 0x08

1 0

[ros-arm-bringup] 41917: Do not build some floating point math functions on ARM right now, since they seem to call x86 inline assembly Investigate this later...
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:41:23 2009 New Revision: 41917 URL: http://svn.reactos.org/svn/reactos?rev=41917&view=rev Log: Do not build some floating point math functions on ARM right now, since they seem to call x86 inline assembly Investigate this later... Modified: trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sun Jul 12 14:41:23 2009 @@ -116,9 +116,6 @@ <file>frexp.c</file> <file>huge_val.c</file> <file>hypot.c</file> - <file>j0_y0.c</file> - <file>j1_y1.c</file> - <file>jn_yn.c</file> <file>ldiv.c</file> <file>modf.c</file> <file>rand.c</file> @@ -158,6 +155,9 @@ <file>fmod.c</file> <file>ldexp.c</file> </directory> + <file>j0_y0.c</file> + <file>j1_y1.c</file> + <file>jn_yn.c</file> </if> <if property="ARCH" value="amd64"> <directory name="i386"> @@ -166,6 +166,9 @@ <file>fmod.c</file> <file>ldexp.c</file> </directory> + <file>j0_y0.c</file> + <file>j1_y1.c</file> + <file>jn_yn.c</file> </if> <ifnot property="ARCH" value="i386"> <file>stubs.c</file>

1 0

[ros-arm-bringup] 41916: Revert the change to tcsrchr, it should be a XINT not a TCHAR
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:40:39 2009 New Revision: 41916 URL: http://svn.reactos.org/svn/reactos?rev=41916&view=rev Log: Revert the change to tcsrchr, it should be a XINT not a TCHAR Modified: trunk/reactos/lib/sdk/crt/string/tcsrchr.h Modified: trunk/reactos/lib/sdk/crt/string/tcsrchr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcsrchr… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcsrchr.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcsrchr.h [iso-8859-1] Sun Jul 12 14:40:39 2009 @@ -3,7 +3,7 @@ #include <tchar.h> -_TCHAR * _tcsrchr(const _TCHAR * s, _TCHAR c) +_TCHAR * _tcsrchr(const _TCHAR * s, _XINT c) { _TCHAR cc = c; const _TCHAR * sp = (_TCHAR *)0;

1 0

[ros-arm-bringup] 41915: KEBUGCHECK was deprecated, so use KeBugCheck
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:40:16 2009 New Revision: 41915 URL: http://svn.reactos.org/svn/reactos?rev=41915&view=rev Log: KEBUGCHECK was deprecated, so use KeBugCheck Modified: trunk/reactos/hal/halarm/generic/hal.c 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] Sun Jul 12 14:40:16 2009 @@ -21,8 +21,8 @@ #undef KeRaiseIrql #undef KeReleaseSpinLock -#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) -#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) +#define READ_REGISTER_ULONG(r) (*((volatile ULONG * const)(r))) +#define WRITE_REGISTER_ULONG(r, v) (*((volatile ULONG *)(r)) = (v)) /* DATA **********************************************************************/ @@ -120,7 +120,7 @@ NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KEBUGCHECK(0); + KeBugCheck(0); return; } @@ -131,7 +131,7 @@ NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KEBUGCHECK(0); + KeBugCheck(0); return; } @@ -142,7 +142,7 @@ NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - KEBUGCHECK(0); + KeBugCheck(0); return Interval; }

1 0

[ros-arm-bringup] 41914: Don't export the HAL drive letter assignment functions on ARM The fast mutex functions are in the HAL on non-x86 builds, so don't forward them back to ntos
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:39:58 2009 New Revision: 41914 URL: http://svn.reactos.org/svn/reactos?rev=41914&view=rev Log: Don't export the HAL drive letter assignment functions on ARM The fast mutex functions are in the HAL on non-x86 builds, so don't forward them back to ntos Modified: trunk/reactos/hal/hal/hal.pspec Modified: trunk/reactos/hal/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.pspec?rev=4191… ============================================================================== --- trunk/reactos/hal/hal/hal.pspec [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.pspec [iso-8859-1] Sun Jul 12 14:39:58 2009 @@ -1,7 +1,12 @@ #include "include/reactos/msvctarget.h" +#ifdef _M_ARM +@ fastcall ExAcquireFastMutex(ptr) +@ fastcall ExReleaseFastMutex(ptr) +#else @ fastcall ExAcquireFastMutex(ptr) ExiAcquireFastMutex @ fastcall ExReleaseFastMutex(ptr) ExiReleaseFastMutex +#endif @ fastcall ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex @ fastcall HalClearSoftwareInterrupt(long) @ fastcall HalRequestSoftwareInterrupt(long) @@ -69,14 +74,16 @@ @ fastcall HalSweepDcache() #endif @ stdcall HalTranslateBusAddress(long long long long ptr ptr) -@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters @ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long) @ stdcall IoFreeAdapterChannel(ptr) @ stdcall IoFreeMapRegisters(ptr ptr long) @ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long) +#ifndef _M_ARM +@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters @ stdcall IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable @ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation @ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable +#endif @ stdcall KeAcquireSpinLock(ptr ptr) @ extern KdComPortInUse @ stdcall KeFlushWriteBuffer()

1 0

[ros-arm-bringup] 41913: The Halp* drive assignment stuff doesn't exist on ARM, AFAIK
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:39:04 2009 New Revision: 41913 URL: http://svn.reactos.org/svn/reactos?rev=41913&view=rev Log: The Halp* drive assignment stuff doesn't exist on ARM, AFAIK Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=41913&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.c [iso-8859-1] Sun Jul 12 14:39:04 2009 @@ -610,7 +610,7 @@ return TRUE; } - +#ifndef _M_ARM VOID NTAPI HalpAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, @@ -668,7 +668,7 @@ PartitionNumber, PartitionType); } - +#endif BOOLEAN NTAPI

1 0

[ros-arm-bringup] 41912: Use the pspec, there's no hal_arm.def anymore
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:38:26 2009 New Revision: 41912 URL: http://svn.reactos.org/svn/reactos?rev=41912&view=rev Log: Use the pspec, there's no hal_arm.def anymore Modified: trunk/reactos/hal/hal/hal.rbuild Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=419… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sun Jul 12 14:38:26 2009 @@ -3,7 +3,7 @@ <group> <if property="ARCH" value="arm"> <module name="hal" type="kernelmodedll"> - <importlibrary definition="hal_arm.def" /> + <importlibrary definition="hal.pspec" /> <include base="ntoskrnl">include</include> <library>ntoskrnl</library> <define name="_NTHAL_" />

1 0

[ros-arm-bringup] 41911: Only build winsetupldr for x86, since there's no NT for ARM
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:38:05 2009 New Revision: 41911 URL: http://svn.reactos.org/svn/reactos?rev=41911&view=rev Log: Only build winsetupldr for x86, since there's no NT for ARM Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Sun Jul 12 14:38:05 2009 @@ -19,7 +19,9 @@ <directory name="reactos"> <file>setupldr.c</file> </directory> - <directory name="windows"> - <file>setupldr2.c</file> - </directory> + <if property="ARCH" value="i386"> + <directory name="windows"> + <file>setupldr2.c</file> + </directory> + </if> </module>

1 0

[ros-arm-bringup] 41910: Only call WinLDR for x86 since there is no NT for ARM
by ros-arm-bringup＠svn.reactos.org 12 Jul '09

12 Jul '09

Author: ros-arm-bringup Date: Sun Jul 12 14:37:38 2009 New Revision: 41910 URL: http://svn.reactos.org/svn/reactos?rev=41910&view=rev Log: Only call WinLDR for x86 since there is no NT for ARM Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Jul 12 14:37:38 2009 @@ -122,11 +122,13 @@ // to have different install methods, etc. LoadReactOSSetup(); } +#ifdef __i386__ else if (_stricmp(SettingValue, "ReactOSSetup2") == 0) { // WinLdr-style boot LoadReactOSSetup2(); } +#endif #endif #ifdef __i386__ else if (_stricmp(SettingValue, "WindowsNT40") == 0)

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