[NTVDM]: Start to organize the code...

svn path=/branches/ntvdm/; revision=61583

subsystems/ntvdm/CMakeLists.txt

@@ -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)

subsystems/ntvdm/bios/bios.c

@@ -14,10 +14,10 @@
 #include "bios.h"
 
 #include "io.h"
-#include "vga.h"
+#include "hardware/vga.h"
-#include "pic.h"
+#include "hardware/pic.h"
-#include "ps2.h"
+#include "hardware/ps2.h"
-#include "timer.h"
+#include "hardware/timer.h"
 
 #include "int32.h"
 #include "registers.h"

subsystems/ntvdm/dos/dos.c

@@ -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"

subsystems/ntvdm/emulator.c

@@ -11,13 +11,13 @@
 #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 "hardware/vga.h"
-#include "pic.h"
+#include "hardware/pic.h"
 
 // HACK
 typedef INT VDM_MODE;

subsystems/ntvdm/hardware/cmos.c

@@ -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 **********************************************************/

subsystems/ntvdm/hardware/vga.c

@@ -14,7 +14,7 @@
 #include "vga.h"
 
 #include "io.h"
-#include "bios.h"
+#include "bios/bios.h"
 
 /* PRIVATE VARIABLES **********************************************************/
 

subsystems/ntvdm/int32.c

@@ -15,7 +15,7 @@
 #include "int32.h"
 
 #include "bop.h"
-#include "bios.h"
+#include "bios/bios.h"
 #include "registers.h"
 
 /* PRIVATE VARIABLES **********************************************************/

subsystems/ntvdm/ntvdm.c

@@ -12,14 +12,15 @@
 
 #include "ntvdm.h"
 #include "emulator.h"
-#include "cmos.h"
+
-#include "bios.h"
+#include "bios/bios.h"
-#include "speaker.h"
+#include "hardware/cmos.h"
-#include "vga.h"
+#include "hardware/pic.h"
-#include "dos.h"
+#include "hardware/ps2.h"
-#include "timer.h"
+#include "hardware/speaker.h"
-#include "pic.h"
+#include "hardware/timer.h"
-#include "ps2.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())
     {