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

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

diff --git a/subsystems/ntvdm/CMakeLists.txt b/subsystems/ntvdm/CMakeLists.txt
index 43969dc..07e9902 100644 (file)
--- a/subsystems/ntvdm/CMakeLists.txt
+++ b/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
 
 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
     bop.c

-    cmos.c
-    dos.c

     emulator.c
     int32.c
     io.c
     emulator.c
     int32.c
     io.c

-    pic.c
-    ps2.c

     registers.c
     registers.c

-    speaker.c
-    timer.c

     vddsup.c
     vddsup.c

-    vga.c

     ntvdm.c
     ntvdm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def)
     ntvdm.c
     ntvdm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def)

diff --git a/subsystems/ntvdm/bios.c b/subsystems/ntvdm/bios/bios.c
similarity index 99%
rename from subsystems/ntvdm/bios.c
rename to subsystems/ntvdm/bios/bios.c
index 0282498..3bc6c6a 100644 (file)
--- a/subsystems/ntvdm/bios.c
+++ b/subsystems/ntvdm/bios/bios.c
@@ -14,10 +14,10 @@
 #include "bios.h"
 
 #include "io.h"
 #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"
 
 #include "int32.h"
 #include "registers.h"

diff --git a/subsystems/ntvdm/bios.h b/subsystems/ntvdm/bios/bios.h
similarity index 100%
rename from subsystems/ntvdm/bios.h
rename to subsystems/ntvdm/bios/bios.h

diff --git a/subsystems/ntvdm/dos.c b/subsystems/ntvdm/dos/dos.c
similarity index 99%
rename from subsystems/ntvdm/dos.c
rename to subsystems/ntvdm/dos/dos.c
index affdded..16366d2 100644 (file)
--- a/subsystems/ntvdm/dos.c
+++ b/subsystems/ntvdm/dos/dos.c
@@ -13,7 +13,7 @@
 #include "emulator.h"
 #include "dos.h"
 
 #include "emulator.h"
 #include "dos.h"
 

-#include "bios.h"
+#include "bios/bios.h"

 #include "bop.h"
 #include "int32.h"
 #include "registers.h"
 #include "bop.h"
 #include "int32.h"
 #include "registers.h"

diff --git a/subsystems/ntvdm/dos.h b/subsystems/ntvdm/dos/dos.h
similarity index 100%
rename from subsystems/ntvdm/dos.h
rename to subsystems/ntvdm/dos/dos.h

diff --git a/subsystems/ntvdm/emulator.c b/subsystems/ntvdm/emulator.c
index 49a52fb..2caed1c 100644 (file)
--- a/subsystems/ntvdm/emulator.c
+++ b/subsystems/ntvdm/emulator.c
@@ -11,13 +11,13 @@
 #define NDEBUG
 
 #include "emulator.h"
 #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 "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;
 
 // HACK
 typedef INT VDM_MODE;

diff --git a/subsystems/ntvdm/cmos.c b/subsystems/ntvdm/hardware/cmos.c
similarity index 99%
rename from subsystems/ntvdm/cmos.c
rename to subsystems/ntvdm/hardware/cmos.c
index a49a57b..d6e56f6 100644 (file)
--- a/subsystems/ntvdm/cmos.c
+++ b/subsystems/ntvdm/hardware/cmos.c
@@ -13,7 +13,7 @@
 #include "emulator.h"
 #include "cmos.h"
 #include "io.h"
 #include "emulator.h"
 #include "cmos.h"
 #include "io.h"

-#include "bios.h"
+#include "bios/bios.h"

 #include "pic.h"
 
 /* PRIVATE VARIABLES **********************************************************/
 #include "pic.h"
 
 /* PRIVATE VARIABLES **********************************************************/

diff --git a/subsystems/ntvdm/cmos.h b/subsystems/ntvdm/hardware/cmos.h
similarity index 100%
rename from subsystems/ntvdm/cmos.h
rename to subsystems/ntvdm/hardware/cmos.h

diff --git a/subsystems/ntvdm/pic.c b/subsystems/ntvdm/hardware/pic.c
similarity index 100%
rename from subsystems/ntvdm/pic.c
rename to subsystems/ntvdm/hardware/pic.c

diff --git a/subsystems/ntvdm/pic.h b/subsystems/ntvdm/hardware/pic.h
similarity index 100%
rename from subsystems/ntvdm/pic.h
rename to subsystems/ntvdm/hardware/pic.h

diff --git a/subsystems/ntvdm/ps2.c b/subsystems/ntvdm/hardware/ps2.c
similarity index 100%
rename from subsystems/ntvdm/ps2.c
rename to subsystems/ntvdm/hardware/ps2.c

diff --git a/subsystems/ntvdm/ps2.h b/subsystems/ntvdm/hardware/ps2.h
similarity index 100%
rename from subsystems/ntvdm/ps2.h
rename to subsystems/ntvdm/hardware/ps2.h

diff --git a/subsystems/ntvdm/speaker.c b/subsystems/ntvdm/hardware/speaker.c
similarity index 100%
rename from subsystems/ntvdm/speaker.c
rename to subsystems/ntvdm/hardware/speaker.c

diff --git a/subsystems/ntvdm/speaker.h b/subsystems/ntvdm/hardware/speaker.h
similarity index 100%
rename from subsystems/ntvdm/speaker.h
rename to subsystems/ntvdm/hardware/speaker.h

diff --git a/subsystems/ntvdm/timer.c b/subsystems/ntvdm/hardware/timer.c
similarity index 100%
rename from subsystems/ntvdm/timer.c
rename to subsystems/ntvdm/hardware/timer.c

diff --git a/subsystems/ntvdm/timer.h b/subsystems/ntvdm/hardware/timer.h
similarity index 100%
rename from subsystems/ntvdm/timer.h
rename to subsystems/ntvdm/hardware/timer.h

diff --git a/subsystems/ntvdm/vga.c b/subsystems/ntvdm/hardware/vga.c
similarity index 99%
rename from subsystems/ntvdm/vga.c
rename to subsystems/ntvdm/hardware/vga.c
index 56bdee3..52e8333 100644 (file)
--- a/subsystems/ntvdm/vga.c
+++ b/subsystems/ntvdm/hardware/vga.c
@@ -14,7 +14,7 @@
 #include "vga.h"
 
 #include "io.h"
 #include "vga.h"
 
 #include "io.h"

-#include "bios.h"
+#include "bios/bios.h"

 
 /* PRIVATE VARIABLES **********************************************************/
 
 
 /* PRIVATE VARIABLES **********************************************************/
 

diff --git a/subsystems/ntvdm/vga.h b/subsystems/ntvdm/hardware/vga.h
similarity index 100%
rename from subsystems/ntvdm/vga.h
rename to subsystems/ntvdm/hardware/vga.h

diff --git a/subsystems/ntvdm/int32.c b/subsystems/ntvdm/int32.c
index beb2bdd..6e2dfcd 100644 (file)
--- a/subsystems/ntvdm/int32.c
+++ b/subsystems/ntvdm/int32.c
@@ -15,7 +15,7 @@
 #include "int32.h"
 
 #include "bop.h"
 #include "int32.h"
 
 #include "bop.h"

-#include "bios.h"
+#include "bios/bios.h"

 #include "registers.h"
 
 /* PRIVATE VARIABLES **********************************************************/
 #include "registers.h"
 
 /* PRIVATE VARIABLES **********************************************************/

diff --git a/subsystems/ntvdm/ntvdm.c b/subsystems/ntvdm/ntvdm.c
index 4c0df14..e3c12ae 100644 (file)
--- a/subsystems/ntvdm/ntvdm.c
+++ b/subsystems/ntvdm/ntvdm.c
@@ -12,14 +12,15 @@
 
 #include "ntvdm.h"
 #include "emulator.h"
 
 #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:
 
 /*
  * 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 PC Speaker */
     SpeakerInitialize();
 

+    
+    
+    
+    
+    
+    

     /* Initialize the system BIOS */
     if (!BiosInitialize())
     {
     /* Initialize the system BIOS */
     if (!BiosInitialize())
     {