Author: tkreuzer Date: Sun May 10 19:33:56 2015 New Revision: 67630
URL: http://svn.reactos.org/svn/reactos?rev=67630&view=rev Log: [NDK] - Remove unused HYPERSPACE_BASE (which was broken for x86, too) - Add PAE values for HYPER_SPACE and HYPER_SPACE_END on x86 - Add missing MM_HAL_VA_START and MM_HAL_VA_END for ARM
Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h
Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.h... ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Sun May 10 19:33:56 2015 @@ -253,7 +253,6 @@ // HAL Variables // #define INITIAL_STALL_COUNT 100 -#define HYPERSPACE_BASE 0xfffff70000000000ULL #define MM_HAL_VA_START 0xFFFFFFFFFFC00000ULL /* This is Vista+ */ #define MM_HAL_VA_END 0xFFFFFFFFFFFFFFFFULL #define APIC_BASE 0xFFFFFFFFFFFE0000ULL
Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?r... ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Sun May 10 19:33:56 2015 @@ -142,6 +142,8 @@ // HAL Variables // #define INITIAL_STALL_COUNT 100 +#define MM_HAL_VA_START 0xFFC00000 +#define MM_HAL_VA_END 0xFFFFFFFF
// // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual)
Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h?... ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Sun May 10 19:33:56 2015 @@ -166,11 +166,6 @@ // HAL Variables // #define INITIAL_STALL_COUNT 100 -#ifdef PAE -#define HYPERSPACE_BASE 0xc0400000 -#else -#define HYPERSPACE_BASE 0xc0800000 -#endif #define MM_HAL_VA_START 0xFFC00000 #define MM_HAL_VA_END 0xFFFFFFFF #define APIC_BASE 0xFFFE0000
Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Sun May 10 19:33:56 2015 @@ -12,8 +12,13 @@ /* Memory layout base addresses */ #define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 +#ifndef PAE #define HYPER_SPACE 0xC0400000 #define HYPER_SPACE_END 0xC07FFFFF +#else +#define HYPER_SPACE 0xC0800000 +#define HYPER_SPACE_END 0xC0BFFFFF +#endif #define MI_SYSTEM_CACHE_WS_START (PVOID)0xC0C00000 #define MI_PAGED_POOL_START (PVOID)0xE1000000 #define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000