[ros-diffs] [ion] 24317: - Re-remove intrinics from winddk.h - Fix a typo in LOADER_PARAMETER_BLOCK

ion at svn.reactos.org ion at svn.reactos.org
Sat Sep 30 16:57:30 CEST 2006


Author: ion
Date: Sat Sep 30 18:57:30 2006
New Revision: 24317

URL: http://svn.reactos.org/svn/reactos?rev=24317&view=rev
Log:
- Re-remove intrinics from winddk.h
- Fix a typo in LOADER_PARAMETER_BLOCK

Modified:
    trunk/reactos/include/ddk/winddk.h
    trunk/reactos/include/reactos/arc/arc.h

Modified: trunk/reactos/include/ddk/winddk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=24317&r1=24316&r2=24317&view=diff
==============================================================================
--- trunk/reactos/include/ddk/winddk.h (original)
+++ trunk/reactos/include/ddk/winddk.h Sat Sep 30 18:57:30 2006
@@ -31,28 +31,7 @@
 extern "C" {
 #endif
 
-#ifdef __GNUC__
-/* Available as intrinsics on MSVC */
-static __inline void _disable(void) {__asm__ __volatile__("cli\n");}
-static __inline void _enable(void)  {__asm__ __volatile__("sti\n");}
-
-
-static __inline ULONG64 __readcr3(void)
-{
-    ULONG_PTR Ret;
-    __asm__ __volatile__("movl %%cr3, %0;\n"
-        :"=r"(Ret));
-    return (ULONG64)Ret;
-}
-
-static __inline ULONG64 __readcr4(void)
-{
-    ULONG_PTR Ret;
-    __asm__ __volatile__("movl %%cr4, %0; \n"
-        :"=r"(Ret));
-    return (ULONG64)Ret;
-}
-#endif
+#include "intrin.h"
 
 /*
 ** Definitions specific to this Device Driver Kit

Modified: trunk/reactos/include/reactos/arc/arc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?rev=24317&r1=24316&r2=24317&view=diff
==============================================================================
--- trunk/reactos/include/reactos/arc/arc.h (original)
+++ trunk/reactos/include/reactos/arc/arc.h Sat Sep 30 18:57:30 2006
@@ -251,7 +251,7 @@
     LPSTR NtBootPathName;
     LPSTR NtHalPathName;
     LPSTR LoadOptions;
-    PNLS_DATA_BLOCK NlsData;
+    NLS_DATA_BLOCK NlsData;
     PARC_DISK_INFORMATION ArcDiskInformation;
     PVOID OemFontFile;
     struct _SETUP_LOADER_BLOCK *SetupLdrBlock;




More information about the Ros-diffs mailing list