- Move asm.h to NDK.

svn path=/trunk/; revision=16655

diff --git a/reactos/include/ndk/asm.h b/reactos/include/ndk/asm.h
new file mode 100644 (file)
index 0000000..f58ef92
--- /dev/null
+++ b/reactos/include/ndk/asm.h
@@ -0,0 +1,194 @@
+/*\r
+ * PROJECT:         ReactOS Native Headers\r
+ * FILE:            include/ndk/asm.h\r
+ * PURPOSE:         Defintions for Structures used in Assembly Code\r
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)\r
+ * UPDATE HISTORY:\r
+ *                  Created 07/19/05\r
+ */\r
+#ifndef _ASM_H\r
+#define _ASM_H\r
+\r
+/* DEPENDENCIES **************************************************************/\r
+\r
+/* EXPORTED DATA *************************************************************/\r
+\r
+/* CONSTANTS *****************************************************************/\r
+\r
+/*\r
+ * Definitions for the offsets of members in the KV86M_REGISTERS\r
+ */\r
+#define KV86M_REGISTERS_EBP             0x0\r
+#define KV86M_REGISTERS_EDI             0x4\r
+#define KV86M_REGISTERS_ESI             0x8\r
+#define KV86M_REGISTERS_EDX             0xC\r
+#define KV86M_REGISTERS_ECX             0x10\r
+#define KV86M_REGISTERS_EBX             0x14\r
+#define KV86M_REGISTERS_EAX             0x18\r
+#define KV86M_REGISTERS_DS              0x1C\r
+#define KV86M_REGISTERS_ES              0x20\r
+#define KV86M_REGISTERS_FS              0x24\r
+#define KV86M_REGISTERS_GS              0x28\r
+#define KV86M_REGISTERS_EIP             0x2C\r
+#define KV86M_REGISTERS_CS              0x30\r
+#define KV86M_REGISTERS_EFLAGS          0x34\r
+#define KV86M_REGISTERS_ESP             0x38\r
+#define KV86M_REGISTERS_SS              0x3C\r
+\r
+#define TF_SAVED_EXCEPTION_STACK        0x8C\r
+#define TF_REGS                         0x90\r
+#define TF_ORIG_EBP                     0x94\r
+\r
+/* TSS Offsets */\r
+#define KTSS_ESP0                       0x4\r
+#define KTSS_CR3                        0x1C\r
+#define KTSS_EFLAGS                     0x24\r
+#define KTSS_IOMAPBASE                  0x66\r
+\r
+/*\r
+ * Defines for accessing KPCR and KTHREAD structure members\r
+ */\r
+#define KTHREAD_INITIAL_STACK           0x18\r
+#define KTHREAD_STACK_LIMIT             0x1C\r
+#define KTHREAD_TEB                     0x20\r
+#define KTHREAD_KERNEL_STACK            0x28\r
+#define KTHREAD_NPX_STATE               0x31\r
+#define KTHREAD_STATE                   0x2D\r
+#define KTHREAD_APCSTATE_PROCESS        0x34 + 0x10\r
+#define KTHREAD_PENDING_USER_APC        0x34 + 0x16\r
+#define KTHREAD_PENDING_KERNEL_APC      0x34 + 0x15\r
+#define KTHREAD_CONTEXT_SWITCHES        0x4C\r
+#define KTHREAD_WAIT_IRQL               0x54\r
+#define KTHREAD_SERVICE_TABLE           0xDC\r
+#define KTHREAD_PREVIOUS_MODE           0x137\r
+#define KTHREAD_TRAP_FRAME              0x128\r
+#define KTHREAD_CALLBACK_STACK          0x120\r
+\r
+#define KPROCESS_DIRECTORY_TABLE_BASE   0x18\r
+#define KPROCESS_LDT_DESCRIPTOR0        0x20\r
+#define KPROCESS_LDT_DESCRIPTOR1        0x24\r
+#define KPROCESS_IOPM_OFFSET            0x30\r
+\r
+#define KPCR_EXCEPTION_LIST             0x0\r
+#define KPCR_INITIAL_STACK              0x4\r
+#define KPCR_STACK_LIMIT                0x8\r
+#define KPCR_SELF                       0x1C\r
+#define KPCR_GDT                        0x3C\r
+#define KPCR_TSS                        0x40\r
+#define KPCR_CURRENT_THREAD             0x124\r
+#define KPCR_NPX_THREAD                 0x2F4\r
+\r
+/* FPU Save Area Offsets */\r
+#define FN_CONTROL_WORD                 0x0\r
+#define FN_STATUS_WORD                  0x4\r
+#define FN_TAG_WORD                     0x8\r
+#define FN_DATA_SELECTOR                0x18\r
+#define FN_CR0_NPX_STATE                0x20C\r
+#define SIZEOF_FX_SAVE_AREA             528\r
+\r
+/* Trap Frame Offsets */\r
+#define KTRAP_FRAME_DEBUGEBP            0x0\r
+#define KTRAP_FRAME_DEBUGEIP            0x4\r
+#define KTRAP_FRAME_DEBUGARGMARK        0x8\r
+#define KTRAP_FRAME_DEBUGPOINTER        0xC\r
+#define KTRAP_FRAME_TEMPSS              0x10\r
+#define KTRAP_FRAME_TEMPESP             0x14\r
+#define KTRAP_FRAME_DR0                 0x18\r
+#define KTRAP_FRAME_DR1                 0x1C\r
+#define KTRAP_FRAME_DR2                 0x20\r
+#define KTRAP_FRAME_DR3                 0x24\r
+#define KTRAP_FRAME_DR6                 0x28\r
+#define KTRAP_FRAME_DR7                 0x2C\r
+#define KTRAP_FRAME_GS                  0x30\r
+#define KTRAP_FRAME_RESERVED1           0x32\r
+#define KTRAP_FRAME_ES                  0x34\r
+#define KTRAP_FRAME_RESERVED2           0x36\r
+#define KTRAP_FRAME_DS                  0x38\r
+#define KTRAP_FRAME_RESERVED3           0x3A\r
+#define KTRAP_FRAME_EDX                 0x3C\r
+#define KTRAP_FRAME_ECX                 0x40\r
+#define KTRAP_FRAME_EAX                 0x44\r
+#define KTRAP_FRAME_PREVIOUS_MODE       0x48\r
+#define KTRAP_FRAME_EXCEPTION_LIST      0x4C\r
+#define KTRAP_FRAME_FS                  0x50\r
+#define KTRAP_FRAME_RESERVED4           0x52\r
+#define KTRAP_FRAME_EDI                 0x54\r
+#define KTRAP_FRAME_ESI                 0x58\r
+#define KTRAP_FRAME_EBX                 0x5C\r
+#define KTRAP_FRAME_EBP                 0x60\r
+#define KTRAP_FRAME_ERROR_CODE          0x64\r
+#define KTRAP_FRAME_EIP                 0x68\r
+#define KTRAP_FRAME_CS                  0x6C\r
+#define KTRAP_FRAME_EFLAGS              0x70\r
+#define KTRAP_FRAME_ESP                 0x74\r
+#define KTRAP_FRAME_SS                  0x78\r
+#define KTRAP_FRAME_RESERVED5           0x7A\r
+#define KTRAP_FRAME_V86_ES              0x7C\r
+#define KTRAP_FRAME_RESERVED6           0x7E\r
+#define KTRAP_FRAME_V86_DS              0x80\r
+#define KTRAP_FRAME_RESERVED7           0x82\r
+#define KTRAP_FRAME_V86_FS              0x84\r
+#define KTRAP_FRAME_RESERVED8           0x86\r
+#define KTRAP_FRAME_V86_GS              0x88\r
+#define KTRAP_FRAME_RESERVED9           0x8A\r
+#define KTRAP_FRAME_SIZE                0x8C\r
+\r
+/* User Shared Data */\r
+#define KERNEL_USER_SHARED_DATA         0x7FFE0000\r
+#define KUSER_SHARED_PROCESSOR_FEATURES KERNEL_USER_SHARED_DATA + 0x274\r
+#define KUSER_SHARED_SYSCALL            KERNEL_USER_SHARED_DATA + 0x300\r
+#define KUSER_SHARED_SYSCALL_RET        KERNEL_USER_SHARED_DATA + 0x304\r
+#define PROCESSOR_FEATURE_FXSR          KUSER_SHARED_PROCESSOR_FEATURES + 0x4\r
+\r
+/* CONTEXT CONSTANTS */\r
+#define CONTEXT_FLAGS                   0x0\r
+#define CONTEXT_DR6                     0x14\r
+#define CONTEXT_FLOAT_SAVE              0x1C\r
+#define CONTEXT_EDI                     0x9C\r
+#define CONTEXT_ESI                     0xA0\r
+#define CONTEXT_EBX                     0xA4\r
+#define CONTEXT_EDX                     0xA8\r
+#define CONTEXT_ECX                     0xAC\r
+#define CONTEXT_EAX                     0xB0\r
+#define CONTEXT_EBP                     0xB4\r
+#define CONTEXT_EIP                     0xB8\r
+#define CONTEXT_ESP                     0xC4\r
+#define CONTEXT_FLOAT_SAVE_CONTROL_WORD CONTEXT_FLOAT_SAVE + FN_CONTROL_WORD\r
+#define CONTEXT_FLOAT_SAVE_STATUS_WORD  CONTEXT_FLOAT_SAVE + FN_STATUS_WORD\r
+#define CONTEXT_FLOAT_SAVE_TAG_WORD     CONTEXT_FLOAT_SAVE + FN_TAG_WORD\r
+\r
+/* TEB CONSTANTS */\r
+#define TEB_EXCEPTION_LIST              0x0\r
+#define TEB_STACK_BASE                  0x4\r
+#define TEB_STACK_LIMIT                 0x8\r
+#define TEB_FIBER_DATA                  0x10\r
+#define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8\r
+#define TEB_DEALLOCATION_STACK          0xE0C\r
+#define TEB_GUARANTEED_STACK_BYTES      0xF78\r
+#define TEB_FLS_DATA                    0xFB4\r
+\r
+/* FIBER CONSTANTS */\r
+#define FIBER_PARAMETER                 0x0\r
+#define FIBER_EXCEPTION_LIST            0x4\r
+#define FIBER_STACK_BASE                0x8\r
+#define FIBER_STACK_LIMIT               0xC\r
+#define FIBER_DEALLOCATION_STACK        0x10\r
+#define FIBER_CONTEXT                   0x14\r
+#define FIBER_GUARANTEED_STACK_BYTES    0x2E0\r
+#define FIBER_FLS_DATA                  0x2E4\r
+#define FIBER_ACTIVATION_CONTEXT_STACK  0x2E8\r
+#define FIBER_CONTEXT_FLAGS             FIBER_CONTEXT + CONTEXT_FLAGS\r
+#define FIBER_CONTEXT_EAX               FIBER_CONTEXT + CONTEXT_EAX\r
+#define FIBER_CONTEXT_EBX               FIBER_CONTEXT + CONTEXT_EBX\r
+#define FIBER_CONTEXT_ECX               FIBER_CONTEXT + CONTEXT_ECX\r
+#define FIBER_CONTEXT_EDX               FIBER_CONTEXT + CONTEXT_EDX\r
+#define FIBER_CONTEXT_ESI               FIBER_CONTEXT + CONTEXT_ESI\r
+#define FIBER_CONTEXT_EDI               FIBER_CONTEXT + CONTEXT_EDI\r
+#define FIBER_CONTEXT_EBP               FIBER_CONTEXT + CONTEXT_EBP\r
+#define FIBER_CONTEXT_ESP               FIBER_CONTEXT + CONTEXT_ESP\r
+#define FIBER_CONTEXT_DR6               FIBER_CONTEXT + CONTEXT_DR6\r
+#define FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD    FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_STATUS_WORD \r
+#define FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD   FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_CONTROL_WORD\r
+#define FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD       FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_TAG_WORD\r
+#endif\r
+\r

diff --git a/reactos/lib/kernel32/thread/i386/fiber.S b/reactos/lib/kernel32/thread/i386/fiber.S
index 5787fec..214a264 100644 (file)
--- a/reactos/lib/kernel32/thread/i386/fiber.S
+++ b/reactos/lib/kernel32/thread/i386/fiber.S
@@ -8,13 +8,10 @@
  */
 
 #include <ndk/i386/segment.h>
+#include <ndk/asm.h>
 
-/* 
- * FIXME: When ntoskrnl header changes are complete, move asm.h out of ntoskrnl
- * so that we can use it here as well
- */
-//#include <ndk/asm.h>
-#include <../ntoskrnl/include/internal/asm.h>
+#define CONTEXT_FULL                    0x10007
+#define CONTEXT_FLOATING_POINT          0xF
 
 .globl _SwitchToFiber@4
 .intel_syntax noprefix

diff --git a/reactos/ntoskrnl/include/internal/asm.h b/reactos/ntoskrnl/include/internal/asm.h
deleted file mode 100644 (file)
index 7dea7fd..0000000
--- a/reactos/ntoskrnl/include/internal/asm.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*\r
- * FIXME: Will be moved to main include directory soon\r
- */\r
-\r
-/*\r
- * Definitions for the offsets of members in the KV86M_REGISTERS\r
- */\r
-#define        KV86M_REGISTERS_EBP     (0x0)\r
-#define        KV86M_REGISTERS_EDI     (0x4)\r
-#define        KV86M_REGISTERS_ESI     (0x8)\r
-#define KV86M_REGISTERS_EDX    (0xC)\r
-#define        KV86M_REGISTERS_ECX     (0x10)\r
-#define KV86M_REGISTERS_EBX    (0x14)\r
-#define KV86M_REGISTERS_EAX    (0x18)\r
-#define        KV86M_REGISTERS_DS      (0x1C)\r
-#define KV86M_REGISTERS_ES     (0x20)\r
-#define KV86M_REGISTERS_FS     (0x24)\r
-#define KV86M_REGISTERS_GS     (0x28)\r
-#define KV86M_REGISTERS_EIP     (0x2C)\r
-#define KV86M_REGISTERS_CS      (0x30)\r
-#define KV86M_REGISTERS_EFLAGS  (0x34)\r
-#define        KV86M_REGISTERS_ESP     (0x38)\r
-#define KV86M_REGISTERS_SS     (0x3C)\r
-\r
-#define TF_SAVED_EXCEPTION_STACK (0x8C)\r
-#define TF_REGS                  (0x90)\r
-#define TF_ORIG_EBP              (0x94)\r
-\r
-\r
-/* TSS Offsets */\r
-#define KTSS_ESP0      (0x4)\r
-#define KTSS_CR3       (0x1C)\r
-#define KTSS_EFLAGS    (0x24)\r
-#define KTSS_IOMAPBASE (0x66)\r
-\r
-/*\r
- * Defines for accessing KPCR and KTHREAD structure members\r
- */\r
-#define KTHREAD_INITIAL_STACK     0x18\r
-#define KTHREAD_STACK_LIMIT       0x1C\r
-#define KTHREAD_TEB               0x20\r
-#define KTHREAD_KERNEL_STACK      0x28\r
-#define KTHREAD_NPX_STATE         0x31\r
-#define KTHREAD_STATE             0x2D\r
-#define KTHREAD_APCSTATE_PROCESS  0x34 + 0x10\r
-#define KTHREAD_PENDING_USER_APC  0x34 + 0x16\r
-#define KTHREAD_PENDING_KERNEL_APC 0x34 + 0x15\r
-#define KTHREAD_CONTEXT_SWITCHES  0x4C\r
-#define KTHREAD_WAIT_IRQL         0x54\r
-#define KTHREAD_SERVICE_TABLE     0xDC\r
-#define KTHREAD_PREVIOUS_MODE     0x137\r
-#define KTHREAD_TRAP_FRAME        0x128\r
-#define KTHREAD_CALLBACK_STACK    0x120\r
-\r
-#define KPROCESS_DIRECTORY_TABLE_BASE 0x18\r
-#define KPROCESS_LDT_DESCRIPTOR0      0x20\r
-#define KPROCESS_LDT_DESCRIPTOR1      0x24\r
-#define KPROCESS_IOPM_OFFSET          0x30\r
-\r
-#define KPCR_EXCEPTION_LIST       0x0\r
-#define KPCR_INITIAL_STACK        0x4\r
-#define KPCR_STACK_LIMIT          0x8\r
-#define KPCR_SELF                 0x1C\r
-#define KPCR_GDT                  0x3C\r
-#define KPCR_TSS                  0x40\r
-#define KPCR_CURRENT_THREAD       0x124\r
-#define KPCR_NPX_THREAD           0x2F4\r
-\r
-/* FPU Save Area Offsets */\r
-#define FN_CONTROL_WORD        0x0\r
-#define FN_STATUS_WORD         0x4\r
-#define FN_TAG_WORD            0x8\r
-#define FN_DATA_SELECTOR       0x18\r
-#define FN_CR0_NPX_STATE       0x20C\r
-#define SIZEOF_FX_SAVE_AREA    528\r
-\r
-/* Trap Frame Offsets */\r
-#define KTRAP_FRAME_DEBUGEBP     (0x0)\r
-#define KTRAP_FRAME_DEBUGEIP     (0x4)\r
-#define KTRAP_FRAME_DEBUGARGMARK (0x8)\r
-#define KTRAP_FRAME_DEBUGPOINTER (0xC)\r
-#define KTRAP_FRAME_TEMPSS       (0x10)\r
-#define KTRAP_FRAME_TEMPESP      (0x14)\r
-#define KTRAP_FRAME_DR0          (0x18)\r
-#define KTRAP_FRAME_DR1          (0x1C)\r
-#define KTRAP_FRAME_DR2          (0x20)\r
-#define KTRAP_FRAME_DR3          (0x24)\r
-#define KTRAP_FRAME_DR6          (0x28)\r
-#define KTRAP_FRAME_DR7          (0x2C)\r
-#define KTRAP_FRAME_GS           (0x30)\r
-#define KTRAP_FRAME_RESERVED1    (0x32)\r
-#define KTRAP_FRAME_ES           (0x34)\r
-#define KTRAP_FRAME_RESERVED2    (0x36)\r
-#define KTRAP_FRAME_DS           (0x38)\r
-#define KTRAP_FRAME_RESERVED3    (0x3A)\r
-#define KTRAP_FRAME_EDX          (0x3C)\r
-#define KTRAP_FRAME_ECX          (0x40)\r
-#define KTRAP_FRAME_EAX          (0x44)\r
-#define KTRAP_FRAME_PREVIOUS_MODE (0x48)\r
-#define KTRAP_FRAME_EXCEPTION_LIST (0x4C)\r
-#define KTRAP_FRAME_FS             (0x50)\r
-#define KTRAP_FRAME_RESERVED4      (0x52)\r
-#define KTRAP_FRAME_EDI            (0x54)\r
-#define KTRAP_FRAME_ESI            (0x58)\r
-#define KTRAP_FRAME_EBX            (0x5C)\r
-#define KTRAP_FRAME_EBP            (0x60)\r
-#define KTRAP_FRAME_ERROR_CODE     (0x64)\r
-#define KTRAP_FRAME_EIP            (0x68)\r
-#define KTRAP_FRAME_CS             (0x6C)\r
-#define KTRAP_FRAME_EFLAGS         (0x70)\r
-#define KTRAP_FRAME_ESP            (0x74)\r
-#define KTRAP_FRAME_SS             (0x78)\r
-#define KTRAP_FRAME_RESERVED5      (0x7A)\r
-#define KTRAP_FRAME_V86_ES         (0x7C)\r
-#define KTRAP_FRAME_RESERVED6      (0x7E)\r
-#define KTRAP_FRAME_V86_DS         (0x80)\r
-#define KTRAP_FRAME_RESERVED7      (0x82)\r
-#define KTRAP_FRAME_V86_FS         (0x84)\r
-#define KTRAP_FRAME_RESERVED8      (0x86)\r
-#define KTRAP_FRAME_V86_GS         (0x88)\r
-#define KTRAP_FRAME_RESERVED9      (0x8A)\r
-#define KTRAP_FRAME_SIZE           (0x8C)\r
-\r
-/* User Shared Data */\r
-#define KUSER_SHARED_DATA               0x7FFE0000\r
-#define KUSER_SHARED_PROCESSOR_FEATURES KUSER_SHARED_DATA + 0x274\r
-#define KUSER_SHARED_SYSCALL            KUSER_SHARED_DATA + 0x300\r
-#define KUSER_SHARED_SYSCALL_RET        KUSER_SHARED_DATA + 0x304\r
-#define PROCESSOR_FEATURE_FXSR          KUSER_SHARED_PROCESSOR_FEATURES + 0x4\r
-\r
-/* CONTEXT CONSTANTS */\r
-#define CONTEXT_FULL                    0x10007\r
-#define CONTEXT_FLOATING_POINT          0xF\r
-#define CONTEXT_FLAGS                   0x0\r
-#define CONTEXT_DR6                     0x14\r
-#define CONTEXT_FLOAT_SAVE              0x1C\r
-#define CONTEXT_EDI                     0x9C\r
-#define CONTEXT_ESI                     0xA0\r
-#define CONTEXT_EBX                     0xA4\r
-#define CONTEXT_EDX                     0xA8\r
-#define CONTEXT_ECX                     0xAC\r
-#define CONTEXT_EAX                     0xB0\r
-#define CONTEXT_EBP                     0xB4\r
-#define CONTEXT_EIP                     0xB8\r
-#define CONTEXT_ESP                     0xC4\r
-#define CONTEXT_FLOAT_SAVE_CONTROL_WORD CONTEXT_FLOAT_SAVE + FN_CONTROL_WORD\r
-#define CONTEXT_FLOAT_SAVE_STATUS_WORD  CONTEXT_FLOAT_SAVE + FN_STATUS_WORD\r
-#define CONTEXT_FLOAT_SAVE_TAG_WORD     CONTEXT_FLOAT_SAVE + FN_TAG_WORD\r
-\r
-/* TEB CONSTANTS */\r
-#define TEB_EXCEPTION_LIST              0x0\r
-#define TEB_STACK_BASE                  0x4\r
-#define TEB_STACK_LIMIT                 0x8\r
-#define TEB_FIBER_DATA                  0x10\r
-#define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8\r
-#define TEB_DEALLOCATION_STACK          0xE0C\r
-#define TEB_GUARANTEED_STACK_BYTES      0xF78\r
-#define TEB_FLS_DATA                    0xFB4\r
-\r
-/* FIBER CONSTANTS */\r
-#define FIBER_PARAMETER                 0x0\r
-#define FIBER_EXCEPTION_LIST            0x4\r
-#define FIBER_STACK_BASE                0x8\r
-#define FIBER_STACK_LIMIT               0xC\r
-#define FIBER_DEALLOCATION_STACK        0x10\r
-#define FIBER_CONTEXT                   0x14\r
-#define FIBER_GUARANTEED_STACK_BYTES    0x2E0\r
-#define FIBER_FLS_DATA                  0x2E4\r
-#define FIBER_ACTIVATION_CONTEXT_STACK  0x2E8\r
-#define FIBER_CONTEXT_FLAGS             FIBER_CONTEXT + CONTEXT_FLAGS\r
-#define FIBER_CONTEXT_EAX               FIBER_CONTEXT + CONTEXT_EAX\r
-#define FIBER_CONTEXT_EBX               FIBER_CONTEXT + CONTEXT_EBX\r
-#define FIBER_CONTEXT_ECX               FIBER_CONTEXT + CONTEXT_ECX\r
-#define FIBER_CONTEXT_EDX               FIBER_CONTEXT + CONTEXT_EDX\r
-#define FIBER_CONTEXT_ESI               FIBER_CONTEXT + CONTEXT_ESI\r
-#define FIBER_CONTEXT_EDI               FIBER_CONTEXT + CONTEXT_EDI\r
-#define FIBER_CONTEXT_EBP               FIBER_CONTEXT + CONTEXT_EBP\r
-#define FIBER_CONTEXT_ESP               FIBER_CONTEXT + CONTEXT_ESP\r
-#define FIBER_CONTEXT_DR6               FIBER_CONTEXT + CONTEXT_DR6\r
-#define FIBER_CONTEXT_FLOAT_SAVE_STATUS_WORD    FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_STATUS_WORD \r
-#define FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD   FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_CONTROL_WORD\r
-#define FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD       FIBER_CONTEXT + CONTEXT_FLOAT_SAVE_TAG_WORD\r

diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h
index e83d98c..adb6afa 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h
@@ -11,7 +11,6 @@
 
 #ifdef _NTOSKRNL_
 
-#include "asm.h"
 #include "ke.h"
 #include "i386/mm.h"
 #include "i386/fpu.h"

diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index 476324a..6f0daa9 100755 (executable)
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -18,8 +18,9 @@
 #include <ddk/ntddk.h>
 #include <ddk/ntifs.h>
 #include <ddk/wdmguid.h>
-#include <ndk/sysguid.h>
 #include <ndk/ntndk.h>
+#include <ndk/sysguid.h>
+#include <ndk/asm.h>
 #undef IO_TYPE_FILE
 #define IO_TYPE_FILE                    0x0F5L /* Temp Hack */
 

diff --git a/reactos/ntoskrnl/ke/i386/ctxswitch.S b/reactos/ntoskrnl/ke/i386/ctxswitch.S
index d35e46b..5fe5451 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/ctxswitch.S
+++ b/reactos/ntoskrnl/ke/i386/ctxswitch.S
@@ -12,7 +12,7 @@
 
 #include <roscfg.h>
 #include <internal/i386/ke.h>
-#include <internal/asm.h>
+#include <ndk/asm.h>
 #include <ndk/i386/segment.h>
 .intel_syntax noprefix
 

diff --git a/reactos/ntoskrnl/ke/i386/main.S b/reactos/ntoskrnl/ke/i386/main.S
index d12a29e..5513da6 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/main.S
+++ b/reactos/ntoskrnl/ke/i386/main.S
@@ -1,5 +1,5 @@
 #include <roscfg.h>
-#include <internal/asm.h>
+#include <ndk/asm.h>
 #include <ndk/i386/segment.h>
 
 #define AP_MAGIC (0x12481020)

diff --git a/reactos/ntoskrnl/ke/i386/stkswitch.S b/reactos/ntoskrnl/ke/i386/stkswitch.S
index dec9cc0..6581d49 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/stkswitch.S
+++ b/reactos/ntoskrnl/ke/i386/stkswitch.S
@@ -7,7 +7,8 @@
  */
 
 /* INCLUDES ******************************************************************/
-#include <internal/asm.h>
+#include <ndk/asm.h>
+
 /* FUNCTIONS ****************************************************************/
 
 /*

diff --git a/reactos/ntoskrnl/ke/i386/syscall.S b/reactos/ntoskrnl/ke/i386/syscall.S
index 5ef0295..0eef143 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/syscall.S
+++ b/reactos/ntoskrnl/ke/i386/syscall.S
@@ -12,7 +12,7 @@
 
 #include <roscfg.h>
 #include <internal/i386/ke.h>
-#include <internal/asm.h>
+#include <ndk/asm.h>
 #include <ndk/i386/segment.h>
 
 #define UserMode  (1)

diff --git a/reactos/ntoskrnl/ke/i386/trap.s b/reactos/ntoskrnl/ke/i386/trap.s
index b311c68..2ae7e06 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/trap.s
+++ b/reactos/ntoskrnl/ke/i386/trap.s
@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <roscfg.h>
-#include <internal/asm.h>
+#include <ndk/asm.h>
 #include <ndk/i386/segment.h>
 
 #define KernelMode 0

diff --git a/reactos/ntoskrnl/ke/i386/v86m_sup.S b/reactos/ntoskrnl/ke/i386/v86m_sup.S
index 94d0250..078b064 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/v86m_sup.S
+++ b/reactos/ntoskrnl/ke/i386/v86m_sup.S
@@ -6,7 +6,7 @@
  *                  Created 09/10/00
  */
 
-#include <internal/asm.h>
+#include <ndk/asm.h>
  
 .globl _Ki386RetToV86Mode
 .globl _KiV86Complete

diff --git a/reactos/tools/nci/ncitool.c b/reactos/tools/nci/ncitool.c
index 1b3f961..b7f8cd5 100644 (file)
--- a/reactos/tools/nci/ncitool.c
+++ b/reactos/tools/nci/ncitool.c
@@ -130,7 +130,7 @@ WriteFileHeader(FILE * StubFile,
             " * PROGRAMMER:      Computer Generated File. See tools/nci/ncitool.c\n"
             " * REMARK:          DO NOT EDIT OR COMMIT MODIFICATIONS TO THIS FILE\n"
             " */\n\n\n"
-            "#define KUSER_SHARED_SYSCALL 0x7FFE0300\n\n",
+            "#include <ndk/asm.h>\n\n",
             FileDescription,
             FileLocation);
 }