Author: akhaldi Date: Sun Oct 4 11:49:28 2015 New Revision: 69438
URL: http://svn.reactos.org/svn/reactos?rev=69438&view=rev Log: [NTVDM] Revert r69435.
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/int32.c trunk/reactos/subsystems/mvdm/ntvdm/int32.h trunk/reactos/subsystems/mvdm/ntvdm/io.c trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h trunk/reactos/subsystems/mvdm/ntvdm/utils.c trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,24 @@ * 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>
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,6 +8,11 @@
#ifndef _BIOS_H_ #define _BIOS_H_ + +/* INCLUDES *******************************************************************/ + +#include "kbdbios.h" +#include "vidbios.h"
/* DEFINES ********************************************************************/
@@ -160,4 +165,6 @@ VOID BiosCleanup(VOID);
-#endif /* _BIOS_H_ */ +#endif // _BIOS_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,38 @@ * 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 **********************************************************/
@@ -137,7 +165,7 @@
/* PRIVATE FUNCTIONS **********************************************************/
-static VOID Bios32CharPrint(CHAR Character) +static VOID BiosCharPrint(CHAR Character) { /* Save AX and BX */ USHORT AX = getAX(); @@ -506,7 +534,7 @@
static VOID WINAPI BiosRomBasic(LPWORD Stack) { - PrintMessageAnsi(Bios32CharPrint, "FATAL: INT18: BOOT FAILURE."); + PrintMessageAnsi(BiosCharPrint, "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.");
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,6 +8,10 @@
#ifndef _BIOS32_H_ #define _BIOS32_H_ + +/* INCLUDES *******************************************************************/ + +// #include <bios/bios.h>
/* DEFINES ********************************************************************/
@@ -37,4 +41,6 @@ BOOLEAN Bios32Initialize(VOID); VOID Bios32Cleanup(VOID);
-#endif /* _BIOS32_H_ */ +#endif // _BIOS32_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,6 +8,12 @@
#ifndef _BIOS32P_H_ #define _BIOS32P_H_ + +/* INCLUDES *******************************************************************/ + +#include <bios/bios.h> + +/**/ #include "int32.h" /**/
/* DEFINES ********************************************************************/
@@ -36,4 +42,6 @@ VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func); VOID PicIRQComplete(BYTE IntNum);
-#endif /* _BIOS32P_H_ */ +#endif // _BIOS32P_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,25 @@ * 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 ********************************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,21 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -9,10 +9,22 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,19 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,6 +8,8 @@
#ifndef _VBE_H_ #define _VBE_H_ + +#include "hardware/video/svga.h"
/* DEFINITIONS ****************************************************************/
@@ -103,4 +105,4 @@ VOID WINAPI VbeService(LPWORD Stack); BOOLEAN VbeInitialize(VOID);
-#endif /* _VBE_H_ */ +#endif // _VBE_H_
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,10 +8,20 @@ * 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 ********************************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,19 @@ * 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 ********************************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,19 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -9,10 +9,17 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,31 @@ * 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 *********************************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/clock... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,22 @@ * 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 ********************************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/b... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,15 @@ * Hermes Belusca-Maito (hermes.belusca@sfr.fr) */
+/* INCLUDES *******************************************************************/ + #include "ntvdm.h"
#define NDEBUG #include <debug.h> + +#include "emulator.h" +#include "bop.h"
/* PRIVATE VARIABLES **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/c... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -15,10 +15,19 @@ | 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/c... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,33 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/c... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,6 +8,10 @@
#ifndef _CPU_H_ #define _CPU_H_ + +/* INCLUDES *******************************************************************/ + +#include <fast486.h>
/* DEFINES ********************************************************************/
@@ -70,4 +74,6 @@ BOOLEAN CpuInitialize(VOID); VOID CpuCleanup(VOID);
-#endif /* _CPU_H_ */ +#endif // _CPU_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/r... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,11 +6,15 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -10,10 +10,29 @@ * 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!
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -12,6 +12,10 @@
#ifndef _DEM_H_ #define _DEM_H_ + +/* INCLUDES *******************************************************************/ + +#include "dos32krnl/dos.h"
/* DEFINES ********************************************************************/
@@ -97,4 +101,6 @@ OUT PUCHAR DriveNumber );
-#endif /* _DEM_H_ */ +#endif // _DEM_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,22 @@ * 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
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,19 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -9,10 +9,17 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,20 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,33 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,6 +8,12 @@
#ifndef _DOS_H_ #define _DOS_H_ + +/* INCLUDES *******************************************************************/ + +#include "device.h" + +/**/ #include "int32.h" /**/
/* DEFINES ********************************************************************/
@@ -327,4 +333,6 @@ */ BOOLEAN DosKRNLInitialize(VOID);
-#endif /* _DOS_H_ */ +#endif // _DOS_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,23 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -9,10 +9,22 @@ * 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"
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,21 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -44,10 +44,20 @@ * 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"
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,22 @@ * 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
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,29 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/m... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,33 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emula... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,39 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emula... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,6 +8,10 @@
#ifndef _EMULATOR_H_ #define _EMULATOR_H_ + +/* INCLUDES *******************************************************************/ + +#include <fast486.h>
/* DEFINES ********************************************************************/
@@ -117,4 +121,6 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput); VOID EmulatorCleanup(VOID);
-#endif /* _EMULATOR_H_ */ +#endif // _EMULATOR_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,19 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -18,10 +18,21 @@ * 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 ****************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,18 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,15 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,18 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,17 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -8,10 +8,19 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -11,10 +11,20 @@ * - 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -11,10 +11,20 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,15 @@ * 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>
Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,20 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int32... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,18 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int32... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -9,6 +9,10 @@
#ifndef _INT32_H_ #define _INT32_H_ + +/* INCLUDES *******************************************************************/ + +#include "cpu/callback.h"
/* DEFINES ********************************************************************/
@@ -56,4 +60,6 @@
VOID InitializeInt32(VOID);
-#endif /* _INT32_H_ */ +#endif // _INT32_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/io.c?... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/io.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -7,10 +7,15 @@ * Hermes Belusca-Maito (hermes.belusca@sfr.fr) */
+/* INCLUDES *******************************************************************/ + #include "ntvdm.h"
#define NDEBUG #include <debug.h> + +#include "emulator.h" +#include "io.h"
/* PRIVATE VARIABLES **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memor... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,15 @@ * 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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvdm... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,19 @@ * 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"
Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvdm... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -44,58 +44,6 @@
/* 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: @@ -158,4 +106,6 @@ VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent); VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);
-#endif /* _NTVDM_H_ */ +#endif // _NTVDM_H_ + +/* EOF */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/utils... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/utils.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/utils.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,14 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) */
+/* INCLUDES *******************************************************************/ + #include "ntvdm.h"
#define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS **********************************************************/
/* PUBLIC FUNCTIONS ***********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/vddsu... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c [iso-8859-1] Sun Oct 4 11:49:28 2015 @@ -6,10 +6,18 @@ * 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);