[ros-diffs] [ros-arm-bringup] 41979: - Use the new portable flag definitions.

ros-arm-bringup at svn.reactos.org ros-arm-bringup at svn.reactos.org
Wed Jul 15 19:53:46 CEST 2009


Author: ros-arm-bringup
Date: Wed Jul 15 19:53:45 2009
New Revision: 41979

URL: http://svn.reactos.org/svn/reactos?rev=41979&view=rev
Log:
- Use the new portable flag definitions.

Modified:
    trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c
    trunk/reactos/ntoskrnl/mm/ARM3/iosup.c
    trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c
    trunk/reactos/ntoskrnl/mm/ARM3/ncache.c
    trunk/reactos/ntoskrnl/mm/ARM3/procsup.c
    trunk/reactos/ntoskrnl/mm/ARM3/syspte.c

Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c?rev=41979&r1=41978&r2=41979&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Wed Jul 15 19:53:45 2009
@@ -46,7 +46,7 @@
     //
     TempPte = HyperTemplatePte;
     TempPte.u.Hard.PageFrameNumber = Page;
-    TempPte.u.Hard.Global = 0; // Hyperspace is local!
+    MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local!
 
     //
     // Pick the first hyperspace PTE
@@ -157,7 +157,7 @@
     //
     PointerPte += (Offset + 1);
     TempPte = HyperTemplatePte;
-    TempPte.u.Hard.Global = FALSE; // Hyperspace is local!
+    MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local!
     do
     {
         //

Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?rev=41979&r1=41978&r2=41979&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Wed Jul 15 19:53:45 2009
@@ -115,8 +115,8 @@
             //
             // Disable the cache
             //
-            TempPte.u.Hard.CacheDisable = 1;
-            TempPte.u.Hard.WriteThrough = 1;
+            MI_PAGE_DISABLE_CACHE(&TempPte);
+            MI_PAGE_WRITE_THROUGH(&TempPte);
             break;
             
         case MiCached:

Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?rev=41979&r1=41978&r2=41979&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Wed Jul 15 19:53:45 2009
@@ -369,8 +369,8 @@
                 //
                 // Disable caching
                 //
-                TempPte.u.Hard.CacheDisable = 1;
-                TempPte.u.Hard.WriteThrough = 1;
+                MI_PAGE_DISABLE_CACHE(&TempPte);
+                MI_PAGE_WRITE_THROUGH(&TempPte);
                 break;
                 
             case MiWriteCombined:
@@ -378,8 +378,8 @@
                 //
                 // Enable write combining
                 //
-                TempPte.u.Hard.CacheDisable = 1;
-                TempPte.u.Hard.WriteThrough = 0;
+                MI_PAGE_DISABLE_CACHE(&TempPte);
+                MI_PAGE_WRITE_COMBINED(&TempPte);
                 break;
                 
             default:
@@ -856,12 +856,12 @@
             //
             // Check if the PTE is not writable
             //
-            if (!PointerPte->u.Hard.Write)
+            if (MI_IS_PAGE_WRITEABLE(PointerPte) == FALSE)
             {
                 //
                 // Check if it's copy on write
                 //
-                if (PointerPte->u.Hard.CopyOnWrite)
+                if (MI_IS_PAGE_COPY_ON_WRITE(PointerPte))
                 {
                     //
                     // Get the base address and allow a change for user-mode

Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?rev=41979&r1=41978&r2=41979&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Wed Jul 15 19:53:45 2009
@@ -120,8 +120,8 @@
             //
             // Disable caching
             //
-            TempPte.u.Hard.CacheDisable = 1;
-            TempPte.u.Hard.WriteThrough = 1;
+            MI_PAGE_DISABLE_CACHE(&TempPte);
+            MI_PAGE_WRITE_THROUGH(&TempPte);
             break;
             
         case MiWriteCombined:
@@ -129,8 +129,8 @@
             //
             // Enable write combining
             //
-            TempPte.u.Hard.CacheDisable = 1;
-            TempPte.u.Hard.WriteThrough = 0;
+            MI_PAGE_DISABLE_CACHE(&TempPte);
+            MI_PAGE_WRITE_COMBINED(&TempPte);
             break;
             
         default:

Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c?rev=41979&r1=41978&r2=41979&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Jul 15 19:53:45 2009
@@ -128,9 +128,9 @@
     // Setup the template stack PTE
     //
     TempPte = HyperTemplatePte;
-    TempPte.u.Hard.Global = FALSE;
+    MI_MAKE_LOCAL_PAGE(&TempPte);
+    MI_MAKE_DIRTY_PAGE(&TempPte);
     TempPte.u.Hard.PageFrameNumber = 0;
-    TempPte.u.Hard.Dirty = TRUE;
     
     //
     // Acquire the PFN DB lock
@@ -225,9 +225,9 @@
     // Setup the template stack PTE
     //
     TempPte = HyperTemplatePte;
-    TempPte.u.Hard.Global = FALSE;
+    MI_MAKE_LOCAL_PAGE(&TempPte);
+    MI_MAKE_DIRTY_PAGE(&TempPte);
     TempPte.u.Hard.PageFrameNumber = 0;
-    TempPte.u.Hard.Dirty = TRUE;
     
     //
     // Acquire the PFN DB lock

Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?rev=41979&r1=41978&r2=41979&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Wed Jul 15 19:53:45 2009
@@ -364,7 +364,7 @@
     //
     // Set the starting and ending PTE addresses for this space
     //
-    MmSystemPteBase = (PVOID)PAGETABLE_MAP;
+    MmSystemPteBase = (PVOID)PTE_BASE;
     MmSystemPtesStart[PoolType] = StartingPte;
     MmSystemPtesEnd[PoolType] = StartingPte + NumberOfPtes - 1;
     DPRINT("System PTE space for %d starting at: %p and ending at: %p\n",



More information about the Ros-diffs mailing list