[NDK]

- Remove deprecated KV86M structures and files.

svn path=/trunk/; revision=48736

diff --git a/reactos/drivers/video/videoprt/int10.c b/reactos/drivers/video/videoprt/int10.c
index 5f5458a..2b28713 100644 (file)
--- a/reactos/drivers/video/videoprt/int10.c
+++ b/reactos/drivers/video/videoprt/int10.c
@@ -20,7 +20,6 @@
  */
 
 #include "videoprt.h"
-#include "internal/i386/v86m.h"
 
 /* PRIVATE FUNCTIONS **********************************************************/
 

diff --git a/reactos/include/ndk/i386/asm.h b/reactos/include/ndk/i386/asm.h
index f545294..afc5b9c 100644 (file)
--- a/reactos/include/ndk/i386/asm.h
+++ b/reactos/include/ndk/i386/asm.h
@@ -67,29 +67,6 @@ Author:
 #define KGDT_NMI_TSS                            (0x58)
 #endif
 
-//
-// KV86M_REGISTERS Offsets
-//
-#define KV86M_REGISTERS_EBP                     0x0
-#define KV86M_REGISTERS_EDI                     0x4
-#define KV86M_REGISTERS_ESI                     0x8
-#define KV86M_REGISTERS_EDX                     0xC
-#define KV86M_REGISTERS_ECX                     0x10
-#define KV86M_REGISTERS_EBX                     0x14
-#define KV86M_REGISTERS_EAX                     0x18
-#define KV86M_REGISTERS_DS                      0x1C
-#define KV86M_REGISTERS_ES                      0x20
-#define KV86M_REGISTERS_FS                      0x24
-#define KV86M_REGISTERS_GS                      0x28
-#define KV86M_REGISTERS_EIP                     0x2C
-#define KV86M_REGISTERS_CS                      0x30
-#define KV86M_REGISTERS_EFLAGS                  0x34
-#define KV86M_REGISTERS_ESP                     0x38
-#define KV86M_REGISTERS_SS                      0x3C
-#define TF_SAVED_EXCEPTION_STACK                0x8C
-#define TF_REGS                                 0x90
-#define TF_ORIG_EBP                             0x94
-
 //
 // TSS Offsets
 //

diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h
index 1632532..bd30dfa 100644 (file)
--- a/reactos/ntoskrnl/include/internal/i386/ke.h
+++ b/reactos/ntoskrnl/include/internal/i386/ke.h
@@ -3,7 +3,6 @@
 #ifndef __ASM__
 
 #include "intrin_i.h"
-#include "v86m.h"
 
 //
 // Thread Dispatcher Header DebugActive Mask

diff --git a/reactos/ntoskrnl/include/internal/i386/v86m.h b/reactos/ntoskrnl/include/internal/i386/v86m.h
deleted file mode 100644 (file)
index 167bb7c..0000000
--- a/reactos/ntoskrnl/include/internal/i386/v86m.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "ketypes.h"
-
-/* Emulate cli/sti instructions */
-#define KV86M_EMULATE_CLI_STI          (0x1)
-/* Allow the v86 mode code to access i/o ports */
-#define KV86M_ALLOW_IO_PORT_ACCESS      (0x2)
-
-typedef struct _KV86M_REGISTERS
-{
-    /*
-     * General purpose registers
-     */
-    ULONG Ebp;
-    ULONG Edi;
-    ULONG Esi;
-    ULONG Edx;
-    ULONG Ecx;
-    ULONG Ebx;
-    ULONG Eax;
-    ULONG Ds;
-    ULONG Es;
-    ULONG Fs;
-    ULONG Gs;
-
-    /*
-     * Control registers
-     */
-    ULONG Eip;
-    ULONG Cs;
-    ULONG Eflags;
-    ULONG Esp;
-    ULONG Ss;
-
-    /*
-     * Control structures
-     */
-    ULONG RecoveryAddress;
-    UCHAR RecoveryInstruction[4];
-    ULONG Vif;
-    ULONG Flags;
-    PNTSTATUS PStatus;
-} KV86M_REGISTERS, *PKV86M_REGISTERS;
-
-typedef struct _KV86M_TRAP_FRAME
-{
-    KTRAP_FRAME Tf;
-
-    ULONG SavedExceptionStack;
-
-    /*
-     * These are put on the top of the stack by the routine that entered
-     * v86 mode so the exception handlers can find the control information
-     */
-    struct _KV86M_REGISTERS* regs;
-    ULONG orig_ebp;
-} KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME;

diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h
index 7aa74ef..004ce9a 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h
@@ -191,9 +191,6 @@ C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA);
 /* Platform specific checks */
 C_ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET);
 C_ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0);
-C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK);
-C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS);
-C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP);
 C_ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0);
 C_ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE);
 #endif