[ros-diffs] [tkreuzer] 67469: [NDK] - Move _MMPTE definition to arch specific files - Fix _MMPTE_HARDWARE on arm (struct, not union!)

Author: tkreuzer
Date: Tue Apr 28 21:26:15 2015
New Revision: 67469

URL: http://svn.reactos.org/svn/reactos?rev=67469&view=rev
Log:
[NDK]
- Move _MMPTE definition to arch specific files
- Fix _MMPTE_HARDWARE on arm (struct, not union!)

Modified:
    trunk/reactos/include/ndk/amd64/mmtypes.h
    trunk/reactos/include/ndk/arm/mmtypes.h
    trunk/reactos/include/ndk/i386/mmtypes.h
    trunk/reactos/include/ndk/mmtypes.h

Modified: trunk/reactos/include/ndk/amd64/mmtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/mmtypes.…
==============================================================================
--- trunk/reactos/include/ndk/amd64/mmtypes.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/amd64/mmtypes.h	[iso-8859-1] Tue Apr 28 21:26:15 2015
@@ -208,6 +208,24 @@
 #endif
 } MMPTE_HARDWARE_LARGEPAGE, *PMMPTE_HARDWARE_LARGEPAGE;
 
+typedef struct _MMPTE
+{
+    union
+    {
+        ULONG_PTR Long;
+        HARDWARE_PTE Flush;
+        MMPTE_HARDWARE Hard;
+        MMPTE_PROTOTYPE Proto;
+        MMPTE_SOFTWARE Soft;
+        MMPTE_TRANSITION Trans;
+        MMPTE_SUBSECTION Subsect;
+        MMPTE_LIST List;
+    } u;
+} MMPTE, *PMMPTE,
+  MMPDE, *PMMPDE,
+  MMPPE, *PMMPPE,
+  MMPXE, *PMMPXE;
+
 #ifdef __cplusplus
 }; // extern "C"
 #endif

Modified: trunk/reactos/include/ndk/arm/mmtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?…
==============================================================================
--- trunk/reactos/include/ndk/arm/mmtypes.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/arm/mmtypes.h	[iso-8859-1] Tue Apr 28 21:26:15 2015
@@ -164,7 +164,7 @@
     ULONG Prototype:1;
 } MMPTE_LIST;
 
-typedef union _MMPTE_HARDWARE
+typedef struct _MMPTE_HARDWARE
 {
     ULONG NoExecute:1;
     ULONG Valid:1;
@@ -178,6 +178,28 @@
     ULONG NonGlobal:1;
     ULONG PageFrameNumber:20;
 } MMPTE_HARDWARE, *PMMPTE_HARDWARE;
+
+
+//
+// Use the right PTE structure
+//
+#define HARDWARE_PTE        HARDWARE_PTE_ARMV6
+#define PHARDWARE_PTE       PHARDWARE_PTE_ARMV6
+
+typedef struct _MMPTE
+{
+    union
+    {
+        ULONG_PTR Long;
+        HARDWARE_PTE Flush;
+        MMPTE_HARDWARE Hard;
+        MMPTE_PROTOTYPE Proto;
+        MMPTE_SOFTWARE Soft;
+        MMPTE_TRANSITION Trans;
+        MMPTE_SUBSECTION Subsect;
+        MMPTE_LIST List;
+    } u;
+} MMPTE, *PMMPTE;
 
 typedef union _MMPDE_HARDWARE
 {
@@ -200,12 +222,6 @@
     } u;
 } MMPDE, *PMMPDE;
 
-//
-// Use the right PTE structure
-//
-#define HARDWARE_PTE        HARDWARE_PTE_ARMV6
-#define PHARDWARE_PTE       PHARDWARE_PTE_ARMV6
-
 #ifdef __cplusplus
 }; // extern "C"
 #endif

Modified: trunk/reactos/include/ndk/i386/mmtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h…
==============================================================================
--- trunk/reactos/include/ndk/i386/mmtypes.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/i386/mmtypes.h	[iso-8859-1] Tue Apr 28 21:26:15 2015
@@ -181,6 +181,22 @@
 #define HARDWARE_PTE        HARDWARE_PTE_X86
 #define PHARDWARE_PTE       PHARDWARE_PTE_X86
 
+typedef struct _MMPTE
+{
+    union
+    {
+        ULONG_PTR Long;
+        HARDWARE_PTE Flush;
+        MMPTE_HARDWARE Hard;
+        MMPTE_PROTOTYPE Proto;
+        MMPTE_SOFTWARE Soft;
+        MMPTE_TRANSITION Trans;
+        MMPTE_SUBSECTION Subsect;
+        MMPTE_LIST List;
+    } u;
+} MMPTE, *PMMPTE,
+  MMPDE, *PMMPDE;
+
 #ifdef __cplusplus
 }; // extern "C"
 #endif

Modified: trunk/reactos/include/ndk/mmtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/mmtypes.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/mmtypes.h	[iso-8859-1] Tue Apr 28 21:26:15 2015
@@ -375,24 +375,6 @@
 } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION;
 
 #ifndef NTOS_MODE_USER
-
-//
-// PTE Structures
-//
-typedef struct _MMPTE
-{
-    union
-    {
-        ULONG_PTR Long;
-        HARDWARE_PTE Flush;
-        MMPTE_HARDWARE Hard;
-        MMPTE_PROTOTYPE Proto;
-        MMPTE_SOFTWARE Soft;
-        MMPTE_TRANSITION Trans;
-        MMPTE_SUBSECTION Subsect;
-        MMPTE_LIST List;
-    } u;
-} MMPTE, *PMMPTE;
 
 //
 // Section Extension Information