Author: akhaldi Date: Sat Oct 3 21:47:46 2015 New Revision: 69435
URL: http://svn.reactos.org/svn/reactos?rev=69435&view=rev Log: [NTVDM] Improve the PCH situation.
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/dskbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h 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/bios32/vidbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/clock.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.h 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/cpu/registers.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h 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/country.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h 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/dosfiles.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h 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/cmos.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h 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/io.h trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/memory.h 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/utils.h trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c trunk/reactos/subsystems/mvdm/ntvdm/vddsup.h
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] Sat Oct 3 21:47:46 2015 @@ -6,24 +6,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -8,11 +8,6 @@
#ifndef _BIOS_H_ #define _BIOS_H_ - -/* INCLUDES *******************************************************************/ - -#include "kbdbios.h" -#include "vidbios.h"
/* DEFINES ********************************************************************/
@@ -165,6 +160,4 @@ VOID BiosCleanup(VOID);
-#endif // _BIOS_H_ - -/* EOF */ +#endif /* _BIOS_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,38 +7,10 @@ * 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 **********************************************************/
@@ -165,7 +137,7 @@
/* 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 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.");
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] Sat Oct 3 21:47:46 2015 @@ -8,10 +8,6 @@
#ifndef _BIOS32_H_ #define _BIOS32_H_ - -/* INCLUDES *******************************************************************/ - -// #include <bios/bios.h>
/* DEFINES ********************************************************************/
@@ -41,6 +37,4 @@ BOOLEAN Bios32Initialize(VOID); VOID Bios32Cleanup(VOID);
-#endif // _BIOS32_H_ - -/* EOF */ +#endif /* _BIOS32_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -8,12 +8,6 @@
#ifndef _BIOS32P_H_ #define _BIOS32P_H_ - -/* INCLUDES *******************************************************************/ - -#include <bios/bios.h> - -/**/ #include "int32.h" /**/
/* DEFINES ********************************************************************/
@@ -42,6 +36,4 @@ VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func); VOID PicIRQComplete(BYTE IntNum);
-#endif // _BIOS32P_H_ - -/* EOF */ +#endif /* _BIOS32P_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,25 +6,10 @@ * 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/dskbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -21,5 +21,3 @@ VOID DiskBios32Cleanup(VOID);
#endif /* _DSKBIOS32_H_ */ - -/* EOF */
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] Sat Oct 3 21:47:46 2015 @@ -6,21 +6,10 @@ * 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/kbdbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -39,5 +39,3 @@ VOID KbdBios32Post(VOID);
#endif /* _KBDBIOS32_H_ */ - -/* EOF */
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] Sat Oct 3 21:47:46 2015 @@ -9,22 +9,10 @@ * 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/moubios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -20,5 +20,3 @@ VOID MouseBios32Cleanup(VOID);
#endif /* _MOUBIOS32_H_ */ - -/* EOF */
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] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -8,8 +8,6 @@
#ifndef _VBE_H_ #define _VBE_H_ - -#include "hardware/video/svga.h"
/* DEFINITIONS ****************************************************************/
@@ -105,4 +103,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] Sat Oct 3 21:47:46 2015 @@ -8,20 +8,10 @@ * 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/bios32/vidbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -21,5 +21,3 @@ VOID VidBios32Cleanup(VOID);
#endif /* _VIDBIOS32_H_ */ - -/* EOF */
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] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * 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/kbdbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -20,6 +20,4 @@ BOOLEAN KbdBiosInitialize(VOID); VOID KbdBiosCleanup(VOID);
-#endif // _KBDBIOS_H_ - -/* EOF */ +#endif /* _KBDBIOS_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * 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/rom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -43,6 +43,4 @@ VOID SearchAndInitRoms(IN PCALLBACK16 Context);
-#endif // _ROM_H_ - -/* EOF */ +#endif /* _ROM_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -9,17 +9,10 @@ * 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/umamgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -29,6 +29,4 @@ BOOLEAN UmaMgrInitialize(VOID); VOID UmaMgrCleanup(VOID);
-#endif // _UMAMGR_H_ - -/* EOF */ +#endif /* _UMAMGR_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,31 +7,10 @@ * 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/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios/... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -113,6 +113,4 @@ BOOLEAN VidBiosInitialize(VOID); VOID VidBiosCleanup(VOID);
-#endif // _VIDBIOS_H_ - -/* EOF */ +#endif /* _VIDBIOS_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,22 +7,10 @@ * 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/clock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/clock... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -50,6 +50,4 @@ VOID ClockUpdate(VOID); BOOLEAN ClockInitialize(VOID);
-#endif // _CLOCK_H_ - -/* EOF */ +#endif /* _CLOCK_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,15 +7,10 @@ * 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/bop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/b... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -23,6 +23,4 @@ VOID RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler); VOID FASTCALL EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode);
-#endif // _BOP_H_ - -/* EOF */ +#endif /* _BOP_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -15,19 +15,10 @@ | 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/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/c... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -58,6 +58,4 @@ IN SIZE_T CallbackSize, OUT PSIZE_T CodeSize OPTIONAL);
-#endif // _CALLBACK_H_ - -/* EOF */ +#endif /* _CALLBACK_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,33 +6,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -8,10 +8,6 @@
#ifndef _CPU_H_ #define _CPU_H_ - -/* INCLUDES *******************************************************************/ - -#include <fast486.h>
/* DEFINES ********************************************************************/
@@ -74,6 +70,4 @@ BOOLEAN CpuInitialize(VOID); VOID CpuCleanup(VOID);
-#endif // _CPU_H_ - -/* EOF */ +#endif /* _CPU_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -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 **********************************************************/
Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/r... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -116,6 +116,4 @@
#endif
-#endif // _REGISTERS_H_ - -/* EOF */ +#endif /* _REGISTERS_H_ */
Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/x... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -134,6 +134,4 @@ } X86CONTEXT; #include "poppack.h"
-#endif // __X86CONTEXT_H__ - -/* EOF */ +#endif /* __X86CONTEXT_H__ */
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] Sat Oct 3 21:47:46 2015 @@ -10,29 +10,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -12,10 +12,6 @@
#ifndef _DEM_H_ #define _DEM_H_ - -/* INCLUDES *******************************************************************/ - -#include "dos32krnl/dos.h"
/* DEFINES ********************************************************************/
@@ -101,6 +97,4 @@ OUT PUCHAR DriveNumber );
-#endif // _DEM_H_ - -/* EOF */ +#endif /* _DEM_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,22 +6,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -7,19 +7,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -9,17 +9,10 @@ * 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/country.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -96,4 +96,4 @@
BOOLEAN DosCountryInitialize(VOID);
-#endif +#endif /* _COUNTRY_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,20 +6,10 @@ * 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/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -208,6 +208,4 @@ VOID DeviceInterruptBop(VOID); DWORD DosLoadDriver(LPCSTR DriverFile);
-#endif // _DEVICE_H_ - -/* EOF */ +#endif /* _DEVICE_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,33 +7,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -8,12 +8,6 @@
#ifndef _DOS_H_ #define _DOS_H_ - -/* INCLUDES *******************************************************************/ - -#include "device.h" - -/**/ #include "int32.h" /**/
/* DEFINES ********************************************************************/
@@ -333,6 +327,4 @@ */ BOOLEAN DosKRNLInitialize(VOID);
-#endif // _DOS_H_ - -/* EOF */ +#endif /* _DOS_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,23 +7,10 @@ * 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/dosfiles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -5,6 +5,8 @@ * PURPOSE: DOS32 Files Support * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ + +#pragma once
/* DEFINES ********************************************************************/
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] Sat Oct 3 21:47:46 2015 @@ -9,22 +9,10 @@ * 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/emsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -100,6 +100,4 @@ BOOLEAN EmsDrvInitialize(USHORT Segment, ULONG TotalPages); VOID EmsDrvCleanup(VOID);
-#endif // _EMSDRV_H_ - -/* EOF */ +#endif /* _EMSDRV_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,21 +6,10 @@ * 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/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -5,6 +5,8 @@ * PURPOSE: DOS32 Handles (Job File Table) * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ + +#pragma once
/* DEFINITIONS ****************************************************************/
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] Sat Oct 3 21:47:46 2015 @@ -44,20 +44,10 @@ * 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/himem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -65,6 +65,4 @@ VOID XmsInitialize(VOID); VOID XmsCleanup(VOID);
-#endif // _HIMEM_H_ - -/* EOF */ +#endif /* _HIMEM_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,22 +7,10 @@ * 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/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -50,6 +50,4 @@ VOID DosInitializeUmb(VOID); VOID DosInitializeMemory(VOID);
-#endif // _DOS_MEMORY_H_ - -/* EOF */ +#endif /* _DOS_MEMORY_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,29 +7,10 @@ * 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/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/d... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -5,6 +5,8 @@ * PURPOSE: DOS32 Processes * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ + +#pragma once
/* DEFINITIONS ****************************************************************/
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] Sat Oct 3 21:47:46 2015 @@ -6,33 +6,10 @@ * 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/dos/mouse32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/m... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -78,6 +78,4 @@ BOOLEAN DosMouseInitialize(VOID); VOID DosMouseCleanup(VOID);
-#endif // _MOUSE32_H_ - -/* EOF */ +#endif /* _MOUSE32_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,39 +6,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -8,10 +8,6 @@
#ifndef _EMULATOR_H_ #define _EMULATOR_H_ - -/* INCLUDES *******************************************************************/ - -#include <fast486.h>
/* DEFINES ********************************************************************/
@@ -121,6 +117,4 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput); VOID EmulatorCleanup(VOID);
-#endif // _EMULATOR_H_ - -/* EOF */ +#endif /* _EMULATOR_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * 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/cmos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -151,6 +151,4 @@ VOID CmosInitialize(VOID); VOID CmosCleanup(VOID);
-#endif // _CMOS_H_ - -/* EOF */ +#endif /* _CMOS_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -18,21 +18,10 @@ * 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/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -88,6 +88,4 @@ BOOLEAN DiskCtrlInitialize(VOID); VOID DiskCtrlCleanup(VOID);
-#endif // _DISK_H_ - -/* EOF */ +#endif /* _DISK_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,18 +7,10 @@ * 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/dma.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -59,6 +59,4 @@
VOID DmaInitialize(VOID);
-#endif // _DMA_H_ - -/* EOF */ +#endif /* _DMA_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,15 +6,10 @@ * 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/keyboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -22,4 +22,4 @@ VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent); BOOLEAN KeyboardInit(BYTE PS2Connector);
-#endif // _KEYBOARD_H_ +#endif /* _KEYBOARD_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,18 +6,10 @@ * 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/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -66,4 +66,4 @@ VOID MouseGetDataFast(PCOORD CurrentPosition, PBYTE CurrentButtonState); BOOLEAN MouseInit(BYTE PS2Connector);
-#endif // _MOUSE_H_ +#endif /* _MOUSE_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,17 +7,10 @@ * 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/pic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -37,6 +37,4 @@
VOID PicInitialize(VOID);
-#endif // _PIC_H_ - -/* EOF */ +#endif /* _PIC_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -8,19 +8,10 @@ * 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/pit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -77,6 +77,4 @@
VOID PitInitialize(VOID);
-#endif // _PIT_H_ - -/* EOF */ +#endif /* _PIT_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -11,20 +11,10 @@ * - 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/ppi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -21,6 +21,4 @@
VOID PpiInitialize(VOID);
-#endif // _PPI_H_ - -/* EOF */ +#endif /* _PPI_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -11,20 +11,10 @@ * 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/ps2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -57,6 +57,4 @@ BOOLEAN PS2Initialize(VOID); VOID PS2Cleanup(VOID);
-#endif // _PS2_H_ - -/* EOF */ +#endif /* _PS2_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,15 +6,10 @@ * 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/sound/speaker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -16,6 +16,4 @@ VOID SpeakerInitialize(VOID); VOID SpeakerCleanup(VOID);
-#endif // _SPEAKER_H_ - -/* EOF */ +#endif /* _SPEAKER_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] Sat Oct 3 21:47:46 2015 @@ -6,20 +6,10 @@ * 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/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hardw... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -385,6 +385,4 @@ BOOLEAN VgaInitialize(HANDLE TextHandle); VOID VgaCleanup(VOID);
-#endif // _SVGA_H_ - -/* EOF */ +#endif /* _SVGA_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,18 +7,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -9,10 +9,6 @@
#ifndef _INT32_H_ #define _INT32_H_ - -/* INCLUDES *******************************************************************/ - -#include "cpu/callback.h"
/* DEFINES ********************************************************************/
@@ -60,6 +56,4 @@
VOID InitializeInt32(VOID);
-#endif // _INT32_H_ - -/* EOF */ +#endif /* _INT32_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -7,15 +7,10 @@ * 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/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/io.h?... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/io.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/io.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -103,6 +103,4 @@ UCHAR DataSize );
-#endif // _IO_H_ - -/* EOF */ +#endif /* _IO_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,15 +6,10 @@ * 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/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memor... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -92,6 +92,4 @@ PBOOLEAN Hooked );
-#endif // _MEMORY_H_ - -/* EOF */ +#endif /* _MEMORY_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * 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] Sat Oct 3 21:47:46 2015 @@ -44,6 +44,58 @@
/* 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: @@ -106,6 +158,4 @@ VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent); VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);
-#endif // _NTVDM_H_ - -/* EOF */ +#endif /* _NTVDM_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,14 +6,10 @@ * 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/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/utils... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/utils.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/utils.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -24,6 +24,4 @@ IN ULONG FileSize, OUT PULONG BytesRead);
-#endif // _UTILS_H_ - -/* EOF */ +#endif /* _UTILS_H_ */
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] Sat Oct 3 21:47:46 2015 @@ -6,18 +6,10 @@ * 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);
Modified: trunk/reactos/subsystems/mvdm/ntvdm/vddsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/vddsu... ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/vddsup.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/vddsup.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -18,6 +18,4 @@
VOID VDDSupInitialize(VOID);
-#endif // _VDDSUP_H_ - -/* EOF */ +#endif /* _VDDSUP_H_ */
-
akhaldi＠svn.reactos.org