[ros-diffs] [tkreuzer] 56369: [NDK] - Fix name of ETHREAD::KeyedWaitSemaphore - Reorder some amd64 msr constants

Author: tkreuzer
Date: Fri Apr 20 19:01:15 2012
New Revision: 56369

URL: http://svn.reactos.org/svn/reactos?rev=56369&view=rev
Log:
[NDK]
- Fix name of ETHREAD::KeyedWaitSemaphore
- Reorder some amd64 msr constants

Modified:
    trunk/reactos/include/ndk/amd64/ketypes.h
    trunk/reactos/include/ndk/pstypes.h

Modified: trunk/reactos/include/ndk/amd64/ketypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.…
==============================================================================
--- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Fri Apr 20 19:01:15 2012
@@ -107,30 +107,30 @@
 //
 // Machine Specific Registers
 //
-#define MSR_EFER         0xC0000080
-#define MSR_STAR         0xC0000081
-#define MSR_LSTAR        0xC0000082
-#define MSR_CSTAR        0xC0000083
-#define MSR_SYSCALL_MASK 0xC0000084
-#define MSR_FS_BASE      0xC0000100
-#define MSR_GS_BASE      0xC0000101
-#define MSR_GS_SWAP      0xC0000102
-#define MSR_MCG_STATUS   0x017A
-#define MSR_AMD_ACCESS   0x9C5A203A
-
-//
-// Flags in MSR_EFER
-//
-#define MSR_LMA                 0x0400
-#define MSR_LME                 0x0100
-#define MSR_SCE                 0x0001
-#define MSR_NXE                 0x0800
-#define MSR_PAT                 0x0277
+#define MSR_MCG_STATUS          0x017A
 #define MSR_DEGUG_CTL           0x01D9
 #define MSR_LAST_BRANCH_FROM    0x01DB
 #define MSR_LAST_BRANCH_TO      0x01DC
 #define MSR_LAST_EXCEPTION_FROM 0x01DD
 #define MSR_LAST_EXCEPTION_TO   0x01DE
+#define MSR_PAT                 0x0277
+#define MSR_AMD_ACCESS      0x9C5A203A
+#define MSR_EFER            0xC0000080
+#define MSR_STAR            0xC0000081
+#define MSR_LSTAR           0xC0000082
+#define MSR_CSTAR           0xC0000083
+#define MSR_SYSCALL_MASK    0xC0000084
+#define MSR_FS_BASE         0xC0000100
+#define MSR_GS_BASE         0xC0000101
+#define MSR_GS_SWAP         0xC0000102
+
+//
+// Flags in MSR_EFER
+//
+#define MSR_LMA                 0x0400
+#define MSR_LME                 0x0100
+#define MSR_SCE                 0x0001
+#define MSR_NXE                 0x0800
 
 //
 // IPI Types

Modified: trunk/reactos/include/ndk/pstypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Fri Apr 20 19:01:15 2012
@@ -922,7 +922,7 @@
     union
     {
         KSEMAPHORE LpcReplySemaphore;
-        KSEMAPHORE KeyedReplySemaphore;
+        KSEMAPHORE KeyedWaitSemaphore;
     };
     union
     {