[NTVDM] Improve the PCH situation.
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 3 Oct 2015 21:47:46 +0000 (21:47 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 3 Oct 2015 21:47:46 +0000 (21:47 +0000)
svn path=/trunk/; revision=69435

94 files changed:
reactos/subsystems/mvdm/ntvdm/bios/bios.c
reactos/subsystems/mvdm/ntvdm/bios/bios.h
reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h
reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h
reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h
reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h
reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h
reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h
reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c
reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h
reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h
reactos/subsystems/mvdm/ntvdm/bios/rom.c
reactos/subsystems/mvdm/ntvdm/bios/rom.h
reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
reactos/subsystems/mvdm/ntvdm/bios/umamgr.h
reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
reactos/subsystems/mvdm/ntvdm/bios/vidbios.h
reactos/subsystems/mvdm/ntvdm/clock.c
reactos/subsystems/mvdm/ntvdm/clock.h
reactos/subsystems/mvdm/ntvdm/cpu/bop.c
reactos/subsystems/mvdm/ntvdm/cpu/bop.h
reactos/subsystems/mvdm/ntvdm/cpu/callback.c
reactos/subsystems/mvdm/ntvdm/cpu/callback.h
reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
reactos/subsystems/mvdm/ntvdm/cpu/cpu.h
reactos/subsystems/mvdm/ntvdm/cpu/registers.c
reactos/subsystems/mvdm/ntvdm/cpu/registers.h
reactos/subsystems/mvdm/ntvdm/cpu/x86context.h
reactos/subsystems/mvdm/ntvdm/dos/dem.c
reactos/subsystems/mvdm/ntvdm/dos/dem.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h
reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
reactos/subsystems/mvdm/ntvdm/dos/mouse32.h
reactos/subsystems/mvdm/ntvdm/emulator.c
reactos/subsystems/mvdm/ntvdm/emulator.h
reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
reactos/subsystems/mvdm/ntvdm/hardware/cmos.h
reactos/subsystems/mvdm/ntvdm/hardware/disk.c
reactos/subsystems/mvdm/ntvdm/hardware/disk.h
reactos/subsystems/mvdm/ntvdm/hardware/dma.c
reactos/subsystems/mvdm/ntvdm/hardware/dma.h
reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h
reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
reactos/subsystems/mvdm/ntvdm/hardware/mouse.h
reactos/subsystems/mvdm/ntvdm/hardware/pic.c
reactos/subsystems/mvdm/ntvdm/hardware/pic.h
reactos/subsystems/mvdm/ntvdm/hardware/pit.c
reactos/subsystems/mvdm/ntvdm/hardware/pit.h
reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
reactos/subsystems/mvdm/ntvdm/hardware/ppi.h
reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
reactos/subsystems/mvdm/ntvdm/hardware/ps2.h
reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h
reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h
reactos/subsystems/mvdm/ntvdm/int32.c
reactos/subsystems/mvdm/ntvdm/int32.h
reactos/subsystems/mvdm/ntvdm/io.c
reactos/subsystems/mvdm/ntvdm/io.h
reactos/subsystems/mvdm/ntvdm/memory.c
reactos/subsystems/mvdm/ntvdm/memory.h
reactos/subsystems/mvdm/ntvdm/ntvdm.c
reactos/subsystems/mvdm/ntvdm/ntvdm.h
reactos/subsystems/mvdm/ntvdm/utils.c
reactos/subsystems/mvdm/ntvdm/utils.h
reactos/subsystems/mvdm/ntvdm/vddsup.c
reactos/subsystems/mvdm/ntvdm/vddsup.h

index 9ee04e2..598be0b 100644 (file)
@@ -6,25 +6,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/callback.h"
-#include "cpu/bop.h"
-
-#include "bios.h"
-#include "bios32/bios32.h"
-#include "rom.h"
-#include "umamgr.h"
-
-#include "io.h"
-#include "hardware/cmos.h"
-
 #include <stdlib.h>
 
 /* DEFINES ********************************************************************/
index 8182a07..060ec0a 100644 (file)
@@ -9,11 +9,6 @@
 #ifndef _BIOS_H_
 #define _BIOS_H_
 
-/* INCLUDES *******************************************************************/
-
-#include "kbdbios.h"
-#include "vidbios.h"
-
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
@@ -165,6 +160,4 @@ BiosInitialize(IN LPCSTR BiosFileName,
 VOID
 BiosCleanup(VOID);
 
-#endif // _BIOS_H_
-
-/* EOF */
+#endif /* _BIOS_H_ */
index 436ac21..556d476 100644 (file)
@@ -7,39 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
-/* BIOS Version number and Copyright */
-#include <reactos/buildno.h>
-#include <reactos/version.h>
-
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/cpu.h" // for EMULATOR_FLAG_CF
-#include "cpu/bop.h"
-#include "int32.h"
-#include <isvbop.h>
-
-#include <bios/bios.h>
-#include <bios/rom.h>
-#include "bios32.h"
-#include "bios32p.h"
-#include "dskbios32.h"
-#include "kbdbios32.h"
-#include "vidbios32.h"
-#include "moubios32.h"
-
-#include "memory.h"
-#include "io.h"
-#include "hardware/cmos.h"
-#include "hardware/pic.h"
-#include "hardware/pit.h"
-#include "hardware/ps2.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 CALLBACK16 BiosContext;
@@ -165,7 +137,7 @@ static const BYTE PostCode[] =
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
-static VOID BiosCharPrint(CHAR Character)
+static VOID Bios32CharPrint(CHAR Character)
 {
     /* Save AX and BX */
     USHORT AX = getAX();
@@ -534,7 +506,7 @@ static VOID WINAPI BiosMiscService(LPWORD Stack)
 
 static VOID WINAPI BiosRomBasic(LPWORD Stack)
 {
-    PrintMessageAnsi(BiosCharPrint, "FATAL: INT18: BOOT FAILURE.");
+    PrintMessageAnsi(Bios32CharPrint, "FATAL: INT18: BOOT FAILURE.");
 
     /* ROM Basic is unsupported, display a message to the user */
     DisplayMessage(L"NTVDM doesn't support ROM Basic. The VDM is closing.");
index 6030361..2205b42 100644 (file)
@@ -9,10 +9,6 @@
 #ifndef _BIOS32_H_
 #define _BIOS32_H_
 
-/* INCLUDES *******************************************************************/
-
-// #include <bios/bios.h>
-
 /* DEFINES ********************************************************************/
 
 enum
@@ -41,6 +37,4 @@ typedef struct
 BOOLEAN Bios32Initialize(VOID);
 VOID Bios32Cleanup(VOID);
 
-#endif // _BIOS32_H_
-
-/* EOF */
+#endif /* _BIOS32_H_ */
index 28d1a45..bc4e25f 100644 (file)
@@ -9,12 +9,6 @@
 #ifndef _BIOS32P_H_
 #define _BIOS32P_H_
 
-/* INCLUDES *******************************************************************/
-
-#include <bios/bios.h>
-
-/**/ #include "int32.h" /**/
-
 /* DEFINES ********************************************************************/
 
 #define BIOS_PIC_MASTER_INT 0x08
@@ -42,6 +36,4 @@ do { \
 VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func);
 VOID PicIRQComplete(BYTE IntNum);
 
-#endif // _BIOS32P_H_
-
-/* EOF */
+#endif /* _BIOS32P_H_ */
index 9bc83c0..fa2864f 100644 (file)
@@ -6,26 +6,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-// #include "../../memory.h"
-// #include "cpu/bop.h"
-#include "cpu/cpu.h" // for EMULATOR_FLAG_ZF
-#include "int32.h"
-
-#include "dskbios32.h"
-// #include <bios/dskbios.h>
-#include "bios32p.h"
-
-#include "hardware/disk.h"
-
-
 /* DEFINES ********************************************************************/
 
 // Disks which are currently supported by the BIOS Disk module.
index c777620..f05d34e 100644 (file)
@@ -21,5 +21,3 @@ BOOLEAN DiskBios32Initialize(VOID);
 VOID DiskBios32Cleanup(VOID);
 
 #endif /* _DSKBIOS32_H_ */
-
-/* EOF */
index af4c57c..5921755 100644 (file)
@@ -6,22 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "kbdbios32.h"
-#include <bios/kbdbios.h>
-#include "bios32p.h"
-
-#include "int32.h"
-#include "cpu/cpu.h" // for EMULATOR_FLAG_ZF
-#include "io.h"
-#include "hardware/ps2.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static BYTE BiosKeyboardMap[256];
index 559101e..8a92708 100644 (file)
@@ -9,23 +9,11 @@
  * NOTE: Based from VirtualBox OSE ROM BIOS, and SeaBIOS.
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/cpu.h" // for EMULATOR_FLAG_CF
-
-#include "moubios32.h"
-#include "bios32p.h"
-
-#include "io.h"
-#include "hardware/mouse.h"
-#include "hardware/ps2.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 #define MOUSE_IRQ_INT   0x74
index 80b10ab..67bc6dc 100644 (file)
@@ -20,5 +20,3 @@ BOOLEAN MouseBiosInitialize(VOID);
 VOID MouseBios32Cleanup(VOID);
 
 #endif /* _MOUBIOS32_H_ */
-
-/* EOF */
index a7d656c..ca1c06f 100644 (file)
@@ -6,20 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/cpu.h"
-
-#include "vbe.h"
-
-#include "io.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static const VBE_MODE Modes[VBE_MODE_COUNT] = {
index b5198e9..c658c13 100644 (file)
@@ -9,8 +9,6 @@
 #ifndef _VBE_H_
 #define _VBE_H_
 
-#include "hardware/video/svga.h"
-
 /* DEFINITIONS ****************************************************************/
 
 #define OEM_NAME     "Cirrus Logic GD-5434 VGA"
@@ -105,4 +103,4 @@ typedef struct _VBE_MODE
 VOID WINAPI VbeService(LPWORD Stack);
 BOOLEAN VbeInitialize(VOID);
 
-#endif // _VBE_H_
+#endif /* _VBE_H_ */
index f9405d4..faa6ed9 100644 (file)
@@ -8,21 +8,11 @@
  * NOTE:            All of the real code is in bios/vidbios.c
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/bop.h"
-#include "int32.h"
-
-#include "vidbios32.h"
-#include <bios/vidbios.h>
-#include "bios32p.h"
-
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
index 3fc91a2..8709220 100644 (file)
@@ -21,5 +21,3 @@ BOOLEAN VidBios32Initialize(VOID);
 VOID VidBios32Cleanup(VOID);
 
 #endif /* _VIDBIOS32_H_ */
-
-/* EOF */
index 504984a..ab90cdf 100644 (file)
@@ -6,20 +6,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/bop.h"
-#include "int32.h"
-
-#include "bios.h"
-// #include "kbdbios.h"
-
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
index 11acf91..ec95f95 100644 (file)
@@ -20,6 +20,4 @@
 BOOLEAN KbdBiosInitialize(VOID);
 VOID KbdBiosCleanup(VOID);
 
-#endif // _KBDBIOS_H_
-
-/* EOF */
+#endif /* _KBDBIOS_H_ */
index 6fbf272..7bba14f 100644 (file)
@@ -6,20 +6,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "memory.h"
-#include "cpu/callback.h"
-#include "rom.h"
-
-#include "utils.h"
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 static BOOLEAN FASTCALL ShadowRomWrite(ULONG Address, PVOID Buffer, ULONG Size)
index b9d55dd..f54e7a5 100644 (file)
@@ -43,6 +43,4 @@ LoadRom(IN  PCSTR  RomFileName,
 VOID
 SearchAndInitRoms(IN PCALLBACK16 Context);
 
-#endif // _ROM_H_
-
-/* EOF */
+#endif /* _ROM_H_ */
index 06d0a17..d7f5fbe 100644 (file)
@@ -9,18 +9,11 @@
  *       indirectly by the DOS EMS Driver, and by VDD memory management functions.
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "memory.h"
-
-#include "umamgr.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 typedef struct _UMA_DESCRIPTOR
index 0d2a323..4385ac4 100644 (file)
@@ -29,6 +29,4 @@ BOOLEAN UmaDescReallocate(IN USHORT UmbSegment, IN OUT PUSHORT Size);
 BOOLEAN UmaMgrInitialize(VOID);
 VOID UmaMgrCleanup(VOID);
 
-#endif // _UMAMGR_H_
-
-/* EOF */
+#endif /* _UMAMGR_H_ */
index e4cdc37..a42f587 100644 (file)
@@ -7,32 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-/* BIOS Version number and Copyright */
-#include <reactos/buildno.h>
-#include <reactos/version.h>
-
-#include "emulator.h"
-#include "cpu/cpu.h"
-#include "cpu/bop.h"
-#include "memory.h"
-
-#include "bios.h"
-#include "bios32/bios32p.h"
-#include "rom.h"
-#include "bios32/vbe.h"
-// #include "vidbios.h"
-#include "bios32/vidbios32.h"
-
-#include "io.h"
-#include "hardware/video/svga.h"
-
 /* MACROS *********************************************************************/
 
 //
index a074029..eca14cd 100644 (file)
@@ -113,6 +113,4 @@ VOID VidBiosPost(VOID);
 BOOLEAN VidBiosInitialize(VOID);
 VOID VidBiosCleanup(VOID);
 
-#endif // _VIDBIOS_H_
-
-/* EOF */
+#endif /* _VIDBIOS_H_ */
index 84d6391..495674d 100644 (file)
@@ -7,23 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "clock.h"
-
-#include "cpu/cpu.h"
-#include "hardware/cmos.h"
-#include "hardware/ps2.h"
-#include "hardware/pit.h"
-#include "hardware/video/svga.h"
-#include "hardware/mouse.h"
-
 /* DEFINES ********************************************************************/
 
 /*
index b664a36..f5d04e5 100644 (file)
@@ -50,6 +50,4 @@ ULONGLONG GetCycleSpeed(VOID);
 VOID ClockUpdate(VOID);
 BOOLEAN ClockInitialize(VOID);
 
-#endif // _CLOCK_H_
-
-/* EOF */
+#endif /* _CLOCK_H_ */
index dc64f9b..8d16513 100644 (file)
@@ -7,16 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "bop.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 /*
index 6c05eb0..292125c 100644 (file)
@@ -23,6 +23,4 @@ typedef VOID (WINAPI *EMULATOR_BOP_PROC)(LPWORD Stack);
 VOID RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler);
 VOID FASTCALL EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode);
 
-#endif // _BOP_H_
-
-/* EOF */
+#endif /* _BOP_H_ */
index 00c8979..9d5905f 100644 (file)
 |   with the CPU registers is 100% prone to bugs!!
 \******************************************************************************/
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "callback.h"
-
-#include "cpu.h"
-#include "bop.h"
-#include <isvbop.h>
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static BYTE Yield[] =
index c0acf5d..4c7570e 100644 (file)
@@ -58,6 +58,4 @@ RegisterCallback16(IN  ULONG   FarPtr,
                    IN  SIZE_T  CallbackSize,
                    OUT PSIZE_T CodeSize OPTIONAL);
 
-#endif // _CALLBACK_H_
-
-/* EOF */
+#endif /* _CALLBACK_H_ */
index 212f522..07d38c5 100644 (file)
@@ -6,34 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu.h"
-
-#include "memory.h"
-#include "callback.h"
-#include "bop.h"
-#include <isvbop.h>
-
-#include "clock.h"
-#include "bios/rom.h"
-#include "hardware/cmos.h"
-#include "hardware/keyboard.h"
-#include "hardware/mouse.h"
-#include "hardware/pic.h"
-#include "hardware/ps2.h"
-#include "hardware/sound/speaker.h"
-#include "hardware/pit.h"
-#include "hardware/video/svga.h"
-
-#include "io.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 FAST486_STATE EmulatorContext;
index 28cd635..04ef503 100644 (file)
@@ -9,10 +9,6 @@
 #ifndef _CPU_H_
 #define _CPU_H_
 
-/* INCLUDES *******************************************************************/
-
-#include <fast486.h>
-
 /* DEFINES ********************************************************************/
 
 /* FLAGS */
@@ -74,6 +70,4 @@ VOID EmulatorTerminate(VOID);
 BOOLEAN CpuInitialize(VOID);
 VOID CpuCleanup(VOID);
 
-#endif // _CPU_H_
-
-/* EOF */
+#endif /* _CPU_H_ */
index 88c7183..fd6bf3a 100644 (file)
@@ -6,15 +6,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu.h"
 #include "x86context.h"
 
 /* PRIVATE VARIABLES **********************************************************/
index 366d887..f00f882 100644 (file)
@@ -116,6 +116,4 @@ VOID   WINAPI setMSW(USHORT);
 
 #endif
 
-#endif // _REGISTERS_H_
-
-/* EOF */
+#endif /* _REGISTERS_H_ */
index 541588b..707f882 100644 (file)
@@ -134,6 +134,4 @@ typedef struct _X86CONTEXT
 } X86CONTEXT;
 #include "poppack.h"
 
-#endif // __X86CONTEXT_H__
-
-/* EOF */
+#endif /* __X86CONTEXT_H__ */
index 0ed51c2..0608f56 100644 (file)
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include <isvbop.h>
-
-#include "utils.h"
-
-#include "dem.h"
-#include "dos/dos32krnl/device.h"
-#include "dos/dos32krnl/memory.h"
-#include "dos/dos32krnl/process.h"
-#include "cpu/bop.h"
-#include "cpu/cpu.h"
-
-#include "bios/bios.h"
-#include "mouse32.h"
-
-#include "vddsup.h"
-
 /*
  * EXPERIMENTAL!
  * Activate this line if you want to have COMMAND.COM completely external.
index befbe80..56356a3 100644 (file)
 #ifndef _DEM_H_
 #define _DEM_H_
 
-/* INCLUDES *******************************************************************/
-
-#include "dos32krnl/dos.h"
-
 /* DEFINES ********************************************************************/
 
 /* BOP Identifiers */
@@ -101,6 +97,4 @@ demSetCurrentDirectoryGetDrive
     OUT PUCHAR DriveNumber
 );
 
-#endif // _DEM_H_
-
-/* EOF */
+#endif /* _DEM_H_ */
index bf28310..e7ab8b0 100644 (file)
@@ -6,23 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "int32.h"
-
-#include "../dem.h"
-#include "dos.h"
-#include "dosfiles.h"
-#include "handle.h"
-#include "memory.h"
-#include "bios/bios.h"
-
 // This is needed because on UNICODE this symbol is redirected to
 // GetEnvironmentStringsW whereas on ANSI it corresponds to the real
 // "ANSI" function (and GetEnvironmentStringsA is aliased to it).
index ae8d419..8f02451 100644 (file)
@@ -7,20 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-
-#include "dos.h"
-#include "dos/dem.h"
-
-#include "bios/bios.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 PDOS_DEVICE_NODE Con = NULL;
index 334c04c..a436b73 100644 (file)
@@ -9,18 +9,11 @@
  *                  For other languages, please use COUNTRY.SYS
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-
-#include "country.h"
-#include "memory.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 /* CaseMap routine: should call INT 65h, AL=20h */
index 7d7cc12..3241db9 100644 (file)
@@ -96,4 +96,4 @@ VOID DosToUpperStrZ(PSTR DestStr, PSTR SrcStr);
 
 BOOLEAN DosCountryInitialize(VOID);
 
-#endif
+#endif /* _COUNTRY_H_ */
index 71fbdce..66cb64f 100644 (file)
@@ -6,21 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/bop.h"
-#include "device.h"
-
-#include "dos.h"
-#include "dos/dem.h"
-#include "memory.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static const BYTE StrategyRoutine[] = {
index 62409c6..93ae340 100644 (file)
@@ -208,6 +208,4 @@ VOID DeviceStrategyBop(VOID);
 VOID DeviceInterruptBop(VOID);
 DWORD DosLoadDriver(LPCSTR DriverFile);
 
-#endif // _DEVICE_H_
-
-/* EOF */
+#endif /* _DEVICE_H_ */
index d5b01ce..77a4db1 100644 (file)
@@ -7,34 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/cpu.h"
-#include "int32.h"
-
-#include "dos.h"
-#include "dos/dem.h"
-#include "country.h"
-#include "device.h"
-#include "handle.h"
-#include "dosfiles.h"
-#include "memory.h"
-#include "process.h"
-#include "himem.h"
-
-#include "bios/bios.h"
-
-#include "io.h"
-#include "hardware/ps2.h"
-
-#include "emsdrv.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 CALLBACK16 DosContext;
index 18e5007..bc335f9 100644 (file)
@@ -9,12 +9,6 @@
 #ifndef _DOS_H_
 #define _DOS_H_
 
-/* INCLUDES *******************************************************************/
-
-#include "device.h"
-
-/**/ #include "int32.h" /**/
-
 /* DEFINES ********************************************************************/
 
 //
@@ -333,6 +327,4 @@ VOID DosEchoCharacter(CHAR Character);
  */
 BOOLEAN DosKRNLInitialize(VOID);
 
-#endif // _DOS_H_
-
-/* EOF */
+#endif /* _DOS_H_ */
index 1dda966..4c69c83 100644 (file)
@@ -7,24 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "../../memory.h"
-
-#include "dos.h"
-#include "dos/dem.h"
-#include "dosfiles.h"
-#include "handle.h"
-#include "process.h"
-
-#include "bios/bios.h"
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 static VOID StoreNameInSft(LPCSTR FilePath, PDOS_FILE_DESCRIPTOR Descriptor)
index 1afc34b..9420302 100644 (file)
@@ -6,6 +6,8 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+#pragma once
+
 /* DEFINES ********************************************************************/
 
 #define FILE_INFO_STDIN  (1 << 0)
index bc22ce8..67dd546 100644 (file)
@@ -9,23 +9,11 @@
  *                  LIM EMS v4.0: http://www.phatcode.net/res/218/files/limems40.txt
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "../../memory.h"
-#include "bios/umamgr.h"
-
-#include "dos.h"
-#include "dos/dem.h"
-#include "device.h"
-
-#include "emsdrv.h"
-
 #define EMS_DEVICE_NAME     "EMMXXXX0"
 
 #define EMS_SEGMENT_SIZE    ((EMS_PHYSICAL_PAGES * EMS_PAGE_SIZE) >> 4)
index af6b1d5..0d3f1f6 100644 (file)
@@ -100,6 +100,4 @@ typedef struct _EMS_HARDWARE_INFO
 BOOLEAN EmsDrvInitialize(USHORT Segment, ULONG TotalPages);
 VOID EmsDrvCleanup(VOID);
 
-#endif // _EMSDRV_H_
-
-/* EOF */
+#endif /* _EMSDRV_H_ */
index 45ca0bc..378fc84 100644 (file)
@@ -6,22 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-
-#include "dos.h"
-#include "dos/dem.h"
-#include "dosfiles.h"
-#include "handle.h"
-#include "memory.h"
-#include "process.h"
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 /* Taken from base/shell/cmd/console.c */
index e81796d..35377ee 100644 (file)
@@ -6,6 +6,8 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+#pragma once
+
 /* DEFINITIONS ****************************************************************/
 
 #define DEFAULT_JFT_SIZE 20
index 19216ed..d6143b0 100644 (file)
  * of the internal Upper Memory Area Manager, in umamgr.c
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/bop.h"
-#include "../../memory.h"
-#include "bios/umamgr.h"
-
-#include "device.h"
-#include "himem.h"
-
 #define XMS_DEVICE_NAME "XMSXXXX0"
 
 /* BOP Identifiers */
index 0976ce3..ab2a7ba 100644 (file)
@@ -65,6 +65,4 @@ BOOLEAN XmsGetDriverEntry(PDWORD Pointer);
 VOID XmsInitialize(VOID);
 VOID XmsCleanup(VOID);
 
-#endif // _HIMEM_H_
-
-/* EOF */
+#endif /* _HIMEM_H_ */
index b7cf0a5..99f8704 100644 (file)
@@ -7,23 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-
-#include "bios/umamgr.h" // HACK until we correctly call XMS services for UMBs.
-
-#include "dos.h"
-#include "dos/dem.h"
-#include "memory.h"
-#include "process.h"
-#include "himem.h"
-
 // FIXME: Should be dynamically initialized!
 #define FIRST_MCB_SEGMENT   (SYSTEM_ENV_BLOCK + 0x200)  // old value: 0x1000
 #define USER_MEMORY_SIZE    (0x9FFE - FIRST_MCB_SEGMENT)
index c38ae76..9131738 100644 (file)
@@ -50,6 +50,4 @@ VOID DosChangeMemoryOwner(WORD Segment, WORD NewOwner);
 VOID DosInitializeUmb(VOID);
 VOID DosInitializeMemory(VOID);
 
-#endif // _DOS_MEMORY_H_
-
-/* EOF */
+#endif /* _DOS_MEMORY_H_ */
index f15b24f..50e725d 100644 (file)
@@ -7,30 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cpu/cpu.h"
-
-#include "dos.h"
-#include "dos/dem.h"
-#include "dosfiles.h"
-#include "handle.h"
-#include "process.h"
-#include "memory.h"
-
-#include "bios/bios.h"
-
-#include "io.h"
-#include "hardware/ps2.h"
-
-#include "vddsup.h"
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 static VOID DosInitPsp(IN WORD Segment,
index fe65389..c998b8a 100644 (file)
@@ -6,6 +6,8 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
+#pragma once
+
 /* DEFINITIONS ****************************************************************/
 
 #define DOS_CMDLINE_LENGTH   127
index f704ed2..3f378c3 100644 (file)
@@ -6,34 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-/* Driver Version number and Copyright */
-#include <reactos/buildno.h>
-#include <reactos/version.h>
-
-#include "emulator.h"
-
-#include "cpu/cpu.h"
-#include "int32.h"
-#include "hardware/mouse.h"
-#include "hardware/ps2.h"
-#include "hardware/pic.h"
-#include "hardware/video/svga.h"
-
-#include "mouse32.h"
-#include "bios/bios.h"
-#include "bios/bios32/bios32p.h"
-
-#include "memory.h"
-#include "io.h"
-#include "dos32krnl/memory.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static const CHAR MouseCopyright[] =
index e9fcbea..4e6654c 100644 (file)
@@ -78,6 +78,4 @@ typedef struct _MOUSE_DRIVER_STATE
 BOOLEAN DosMouseInitialize(VOID);
 VOID DosMouseCleanup(VOID);
 
-#endif // _MOUSE32_H_
-
-/* EOF */
+#endif /* _MOUSE32_H_ */
index dd92213..75a4a7e 100644 (file)
@@ -6,40 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "memory.h"
-
-#include "cpu/callback.h"
-#include "cpu/cpu.h"
-#include "cpu/bop.h"
-#include <isvbop.h>
-
-#include "int32.h"
-
-#include "clock.h"
-#include "bios/rom.h"
-#include "hardware/cmos.h"
-#include "hardware/disk.h"
-#include "hardware/dma.h"
-#include "hardware/keyboard.h"
-#include "hardware/mouse.h"
-#include "hardware/pic.h"
-#include "hardware/pit.h"
-#include "hardware/ppi.h"
-#include "hardware/ps2.h"
-#include "hardware/sound/speaker.h"
-#include "hardware/video/svga.h"
-
-#include "vddsup.h"
-#include "io.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 LPVOID  BaseAddress = NULL;
index deff274..e5abc9e 100644 (file)
@@ -9,10 +9,6 @@
 #ifndef _EMULATOR_H_
 #define _EMULATOR_H_
 
-/* INCLUDES *******************************************************************/
-
-#include <fast486.h>
-
 /* DEFINES ********************************************************************/
 
 /* Basic Memory Management */
@@ -121,6 +117,4 @@ VOID EmulatorTerminate(VOID);
 BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput);
 VOID EmulatorCleanup(VOID);
 
-#endif // _EMULATOR_H_
-
-/* EOF */
+#endif /* _EMULATOR_H_ */
index 8482553..c7fff9f 100644 (file)
@@ -6,20 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "cmos.h"
-
-#include "io.h"
-#include "pic.h"
-#include "clock.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static HANDLE hCmosRam = INVALID_HANDLE_VALUE;
index 3420f57..ec73c9b 100644 (file)
@@ -151,6 +151,4 @@ DWORD RtcGetTicksPerSecond(VOID);
 VOID CmosInitialize(VOID);
 VOID CmosCleanup(VOID);
 
-#endif // _CMOS_H_
-
-/* EOF */
+#endif /* _CMOS_H_ */
index 0b23048..135df9b 100644 (file)
  *         in little endian) *MUST* be fixed!
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "disk.h"
-
-// #include "io.h"
-#include "memory.h"
-
-#include "utils.h"
-
-
 /**************** HARD DRIVES -- VHD FIXED DISK FORMAT SUPPORT ****************/
 
 // http://citrixblogger.org/2008/12/01/dynamic-vhd-walkthrough/
index 826e3f1..524d099 100644 (file)
@@ -88,6 +88,4 @@ UnmountDisk(IN DISK_TYPE DiskType,
 BOOLEAN DiskCtrlInitialize(VOID);
 VOID DiskCtrlCleanup(VOID);
 
-#endif // _DISK_H_
-
-/* EOF */
+#endif /* _DISK_H_ */
index c2816ad..9e9b434 100644 (file)
@@ -7,19 +7,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "dma.h"
-
-#include "io.h"
-#include "memory.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 /*
index 7155d5b..4f4aa4c 100644 (file)
@@ -59,6 +59,4 @@ DWORD DmaRequest(IN WORD      iChannel,
 
 VOID DmaInitialize(VOID);
 
-#endif // _DMA_H_
-
-/* EOF */
+#endif /* _DMA_H_ */
index 6d18b9d..a2230f5 100644 (file)
@@ -6,16 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "keyboard.h"
-#include "ps2.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static BOOLEAN Reporting = FALSE;
index 0bc5f61..b185436 100644 (file)
@@ -22,4 +22,4 @@
 VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent);
 BOOLEAN KeyboardInit(BYTE PS2Connector);
 
-#endif // _KEYBOARD_H_
+#endif /* _KEYBOARD_H_ */
index 624cdbb..a8df154 100644 (file)
@@ -6,19 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "mouse.h"
-#include "ps2.h"
-
-#include "clock.h"
-#include "video/svga.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static const BYTE ScrollMagic[3]      = { 200, 100, 80 };
index 91500b6..e34a391 100644 (file)
@@ -66,4 +66,4 @@ VOID MouseEventHandler(PMOUSE_EVENT_RECORD MouseEvent);
 VOID MouseGetDataFast(PCOORD CurrentPosition, PBYTE CurrentButtonState);
 BOOLEAN MouseInit(BYTE PS2Connector);
 
-#endif // _MOUSE_H_
+#endif /* _MOUSE_H_ */
index 63ac9d6..a17a93f 100644 (file)
@@ -7,18 +7,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "pic.h"
-
-#include "io.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 typedef struct _PIC
index ed1b3f4..8e114f2 100644 (file)
@@ -37,6 +37,4 @@ BYTE PicGetInterrupt(VOID);
 
 VOID PicInitialize(VOID);
 
-#endif // _PIC_H_
-
-/* EOF */
+#endif /* _PIC_H_ */
index 540ecec..1a28f29 100644 (file)
@@ -8,20 +8,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "pit.h"
-
-#include "io.h"
-#include "pic.h"
-#include "clock.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static PIT_CHANNEL PitChannels[PIT_CHANNELS];
index d8799a1..80f1a30 100644 (file)
@@ -77,6 +77,4 @@ WORD PitGetReloadValue(BYTE Channel);
 
 VOID PitInitialize(VOID);
 
-#endif // _PIT_H_
-
-/* EOF */
+#endif /* _PIT_H_ */
index fbab101..e3fa3d7 100644 (file)
  *        - This controller is here only for having ports 61h and 62h working.
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "ppi.h"
-
-#include "hardware/pit.h"
-#include "hardware/sound/speaker.h"
-
-#include "io.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 /*static*/ BYTE Port61hState = 0x00; // Used in emulator.c
index 4ec550d..68810e5 100644 (file)
@@ -21,6 +21,4 @@ extern BYTE Port61hState;
 
 VOID PpiInitialize(VOID);
 
-#endif // _PPI_H_
-
-/* EOF */
+#endif /* _PPI_H_ */
index 4222cc5..74312c2 100644 (file)
  *                  http://www.computer-engineering.org/ps2keyboard/
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "ps2.h"
-
-#include "memory.h"
-#include "io.h"
-#include "pic.h"
-#include "clock.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 #define BUFFER_SIZE 32
index d2a61ab..2033136 100644 (file)
@@ -57,6 +57,4 @@ BOOLEAN PS2PortQueueRead(BYTE PS2Port);
 BOOLEAN PS2Initialize(VOID);
 VOID PS2Cleanup(VOID);
 
-#endif // _PS2_H_
-
-/* EOF */
+#endif /* _PS2_H_ */
index f99918b..ac035fc 100644 (file)
@@ -6,16 +6,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "speaker.h"
-#include "hardware/pit.h"
-
 /* Extra PSDK/NDK Headers */
 #include <ndk/iofuncs.h>
 
index c305558..e5721ec 100644 (file)
@@ -16,6 +16,4 @@ VOID SpeakerChange(UCHAR Port61hValue);
 VOID SpeakerInitialize(VOID);
 VOID SpeakerCleanup(VOID);
 
-#endif // _SPEAKER_H_
-
-/* EOF */
+#endif /* _SPEAKER_H_ */
index f5b06ca..712edd2 100644 (file)
@@ -6,21 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "svga.h"
-#include <bios/vidbios.h>
-
-#include "memory.h"
-#include "io.h"
-#include "clock.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 };
index b4e16d0..1135742 100644 (file)
@@ -385,6 +385,4 @@ BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical);
 BOOLEAN VgaInitialize(HANDLE TextHandle);
 VOID VgaCleanup(VOID);
 
-#endif // _SVGA_H_
-
-/* EOF */
+#endif /* _SVGA_H_ */
index 0081765..3ba666d 100644 (file)
@@ -7,19 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "int32.h"
-
-#include "cpu/bop.h"
-#include <isvbop.h>
-
 /* PRIVATE VARIABLES **********************************************************/
 
 /*
index 78a05a4..c3ea5ef 100644 (file)
 #ifndef _INT32_H_
 #define _INT32_H_
 
-/* INCLUDES *******************************************************************/
-
-#include "cpu/callback.h"
-
 /* DEFINES ********************************************************************/
 
 /* 32-bit Interrupt Identifiers */
@@ -60,6 +56,4 @@ Int32Call(IN PCALLBACK16 Context,
 
 VOID InitializeInt32(VOID);
 
-#endif // _INT32_H_
-
-/* EOF */
+#endif /* _INT32_H_ */
index 4eb20c2..02fa112 100644 (file)
@@ -7,16 +7,11 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "io.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 typedef struct _EMULATOR_IO_HANDLERS
index edd9100..bf4653e 100644 (file)
@@ -103,6 +103,4 @@ VOID FASTCALL EmulatorWriteIo
     UCHAR DataSize
 );
 
-#endif // _IO_H_
-
-/* EOF */
+#endif /* _IO_H_ */
index 3b53374..85283e7 100644 (file)
@@ -6,16 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "memory.h"
-
 /* PRIVATE VARIABLES **********************************************************/
 
 typedef struct _MEM_HOOK
index 0fa3ee7..3dd9698 100644 (file)
@@ -92,6 +92,4 @@ MemQueryMemoryZone
     PBOOLEAN Hooked
 );
 
-#endif // _MEMORY_H_
-
-/* EOF */
+#endif /* _MEMORY_H_ */
index 7d9a825..49384c7 100644 (file)
@@ -6,20 +6,11 @@
  * PROGRAMMERS:     Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org>
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-
-#include "bios/bios.h"
-#include "cpu/cpu.h"
-
-#include "dos/dem.h"
-
 #include "resource.h"
 
 /* VARIABLES ******************************************************************/
index 77b58fd..74f8762 100644 (file)
@@ -45,6 +45,58 @@ DWORD WINAPI SetLastConsoleEventActive(VOID);
 /* PSEH for SEH Support */
 #include <pseh/pseh2.h>
 
+#include <reactos/buildno.h>
+#include <reactos/version.h>
+
+#include <fast486.h>
+#include <isvbop.h>
+
+#include "bios/bios32/bios32.h"
+#include "bios/bios32/dskbios32.h"
+#include "bios/bios32/kbdbios32.h"
+#include "bios/bios32/moubios32.h"
+#include "bios/bios32/vidbios32.h"
+#include "bios/vidbios.h"
+#include "bios/bios.h"
+#include "bios/kbdbios.h"
+#include "bios/umamgr.h"
+#include "cpu/callback.h"
+#include "bios/rom.h"
+#include "clock.h"
+#include "cpu/bop.h"
+#include "cpu/cpu.h"
+#include "dos/dem.h"
+#include "dos/mouse32.h"
+#include "dos/dos32krnl/country.h"
+#include "dos/dos32krnl/device.h"
+#include "dos/dos32krnl/dos.h"
+#include "dos/dos32krnl/dosfiles.h"
+#include "dos/dos32krnl/emsdrv.h"
+#include "dos/dos32krnl/handle.h"
+#include "dos/dos32krnl/himem.h"
+#include "dos/dos32krnl/process.h"
+#include "emulator.h"
+#include "hardware/cmos.h"
+#include "hardware/disk.h"
+#include "hardware/dma.h"
+#include "hardware/keyboard.h"
+#include "hardware/mouse.h"
+#include "hardware/pic.h"
+#include "hardware/pit.h"
+#include "hardware/ppi.h"
+#include "hardware/ps2.h"
+#include "hardware/sound/speaker.h"
+#include "hardware/video/svga.h"
+#include "bios/bios32/vbe.h"
+#include "int32.h"
+#include "bios/bios32/bios32p.h"
+#include "io.h"
+#include "utils.h"
+#include "vddsup.h"
+
+#include "memory.h"
+#include "dos/dos32krnl/memory.h"
+
 /*
  * Activate this line if you want to run NTVDM in standalone mode with:
  * ntvdm.exe <program>
@@ -106,6 +158,4 @@ VOID ConsoleReattach(HANDLE ConOutHandle);
 VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent);
 VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);
 
-#endif // _NTVDM_H_
-
-/* EOF */
+#endif /* _NTVDM_H_ */
index d46a284..3170075 100644 (file)
@@ -6,15 +6,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-/* PRIVATE FUNCTIONS **********************************************************/
-
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 VOID
index bb53b50..7b3887d 100644 (file)
@@ -24,6 +24,4 @@ FileLoadByHandle(IN  HANDLE FileHandle,
                  IN  ULONG  FileSize,
                  OUT PULONG BytesRead);
 
-#endif // _UTILS_H_
-
-/* EOF */
+#endif /* _UTILS_H_ */
index f6a6fa9..ac02484 100644 (file)
@@ -6,19 +6,11 @@
  * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-/* INCLUDES *******************************************************************/
-
 #include "ntvdm.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "emulator.h"
-#include "vddsup.h"
-
-#include "cpu/bop.h"
-#include <isvbop.h>
-
 typedef VOID (WINAPI *VDD_PROC)(VOID);
 
 typedef struct _VDD_MODULE
index fa0d990..e8023dd 100644 (file)
@@ -18,6 +18,4 @@ VOID VDDResumeUserHook(VOID);
 
 VOID VDDSupInitialize(VOID);
 
-#endif // _VDDSUP_H_
-
-/* EOF */
+#endif /* _VDDSUP_H_ */