[NTVDM]: Start to organize the code...
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sat, 11 Jan 2014 15:27:18 +0000 (15:27 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sat, 11 Jan 2014 15:27:18 +0000 (15:27 +0000)
svn path=/branches/ntvdm/; revision=61583

20 files changed:
subsystems/ntvdm/CMakeLists.txt
subsystems/ntvdm/bios/bios.c [moved from subsystems/ntvdm/bios.c with 99% similarity]
subsystems/ntvdm/bios/bios.h [moved from subsystems/ntvdm/bios.h with 100% similarity]
subsystems/ntvdm/dos/dos.c [moved from subsystems/ntvdm/dos.c with 99% similarity]
subsystems/ntvdm/dos/dos.h [moved from subsystems/ntvdm/dos.h with 100% similarity]
subsystems/ntvdm/emulator.c
subsystems/ntvdm/hardware/cmos.c [moved from subsystems/ntvdm/cmos.c with 99% similarity]
subsystems/ntvdm/hardware/cmos.h [moved from subsystems/ntvdm/cmos.h with 100% similarity]
subsystems/ntvdm/hardware/pic.c [moved from subsystems/ntvdm/pic.c with 100% similarity]
subsystems/ntvdm/hardware/pic.h [moved from subsystems/ntvdm/pic.h with 100% similarity]
subsystems/ntvdm/hardware/ps2.c [moved from subsystems/ntvdm/ps2.c with 100% similarity]
subsystems/ntvdm/hardware/ps2.h [moved from subsystems/ntvdm/ps2.h with 100% similarity]
subsystems/ntvdm/hardware/speaker.c [moved from subsystems/ntvdm/speaker.c with 100% similarity]
subsystems/ntvdm/hardware/speaker.h [moved from subsystems/ntvdm/speaker.h with 100% similarity]
subsystems/ntvdm/hardware/timer.c [moved from subsystems/ntvdm/timer.c with 100% similarity]
subsystems/ntvdm/hardware/timer.h [moved from subsystems/ntvdm/timer.h with 100% similarity]
subsystems/ntvdm/hardware/vga.c [moved from subsystems/ntvdm/vga.c with 99% similarity]
subsystems/ntvdm/hardware/vga.h [moved from subsystems/ntvdm/vga.h with 100% similarity]
subsystems/ntvdm/int32.c
subsystems/ntvdm/ntvdm.c

index 43969dc..07e9902 100644 (file)
@@ -1,23 +1,25 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fast486)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/fast486
+    ntvdm)
 
 spec2def(ntvdm.exe ntvdm.spec)
 
 list(APPEND SOURCE
-    bios.c
+    bios/bios.c
+    hardware/cmos.c
+    hardware/pic.c
+    hardware/ps2.c
+    hardware/speaker.c
+    hardware/timer.c
+    hardware/vga.c
+    dos/dos.c
     bop.c
-    cmos.c
-    dos.c
     emulator.c
     int32.c
     io.c
-    pic.c
-    ps2.c
     registers.c
-    speaker.c
-    timer.c
     vddsup.c
-    vga.c
     ntvdm.c
     ntvdm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def)
similarity index 99%
rename from subsystems/ntvdm/bios.c
rename to subsystems/ntvdm/bios/bios.c
index 0282498..3bc6c6a 100644 (file)
 #include "bios.h"
 
 #include "io.h"
-#include "vga.h"
-#include "pic.h"
-#include "ps2.h"
-#include "timer.h"
+#include "hardware/vga.h"
+#include "hardware/pic.h"
+#include "hardware/ps2.h"
+#include "hardware/timer.h"
 
 #include "int32.h"
 #include "registers.h"
similarity index 99%
rename from subsystems/ntvdm/dos.c
rename to subsystems/ntvdm/dos/dos.c
index affdded..16366d2 100644 (file)
@@ -13,7 +13,7 @@
 #include "emulator.h"
 #include "dos.h"
 
-#include "bios.h"
+#include "bios/bios.h"
 #include "bop.h"
 #include "int32.h"
 #include "registers.h"
index 49a52fb..2caed1c 100644 (file)
 #define NDEBUG
 
 #include "emulator.h"
-#include "bios.h"
+#include "bios/bios.h"
 #include "bop.h"
 #include "vddsup.h"
 #include "io.h"
 #include "registers.h"
-#include "vga.h"
-#include "pic.h"
+#include "hardware/vga.h"
+#include "hardware/pic.h"
 
 // HACK
 typedef INT VDM_MODE;
similarity index 99%
rename from subsystems/ntvdm/cmos.c
rename to subsystems/ntvdm/hardware/cmos.c
index a49a57b..d6e56f6 100644 (file)
@@ -13,7 +13,7 @@
 #include "emulator.h"
 #include "cmos.h"
 #include "io.h"
-#include "bios.h"
+#include "bios/bios.h"
 #include "pic.h"
 
 /* PRIVATE VARIABLES **********************************************************/
similarity index 99%
rename from subsystems/ntvdm/vga.c
rename to subsystems/ntvdm/hardware/vga.c
index 56bdee3..52e8333 100644 (file)
@@ -14,7 +14,7 @@
 #include "vga.h"
 
 #include "io.h"
-#include "bios.h"
+#include "bios/bios.h"
 
 /* PRIVATE VARIABLES **********************************************************/
 
index beb2bdd..6e2dfcd 100644 (file)
@@ -15,7 +15,7 @@
 #include "int32.h"
 
 #include "bop.h"
-#include "bios.h"
+#include "bios/bios.h"
 #include "registers.h"
 
 /* PRIVATE VARIABLES **********************************************************/
index 4c0df14..e3c12ae 100644 (file)
 
 #include "ntvdm.h"
 #include "emulator.h"
-#include "cmos.h"
-#include "bios.h"
-#include "speaker.h"
-#include "vga.h"
-#include "dos.h"
-#include "timer.h"
-#include "pic.h"
-#include "ps2.h"
+
+#include "bios/bios.h"
+#include "hardware/cmos.h"
+#include "hardware/pic.h"
+#include "hardware/ps2.h"
+#include "hardware/speaker.h"
+#include "hardware/timer.h"
+#include "hardware/vga.h"
+#include "dos/dos.h"
 
 /*
  * Activate this line if you want to be able to test NTVDM with:
@@ -142,6 +143,12 @@ INT wmain(INT argc, WCHAR *argv[])
     /* Initialize the PC Speaker */
     SpeakerInitialize();
 
+    
+    
+    
+    
+    
+    
     /* Initialize the system BIOS */
     if (!BiosInitialize())
     {