[VM][WIP] Use namespace to devices per VMs.

[csp-qt/common_source_project-fm7.git] / source / src / vm / fmr50 / fmr50.h

diff --git a/source/src/vm/fmr50/fmr50.h b/source/src/vm/fmr50/fmr50.h
index 6e7a086..bc5a17d 100644 (file)
--- a/source/src/vm/fmr50/fmr50.h
+++ b/source/src/vm/fmr50/fmr50.h
@@ -78,7 +78,6 @@
 #define USE_CPU_TYPE           2
 #define USE_FLOPPY_DISK                4
 #define USE_HARD_DISK          7
-#define OPEN_HARD_DISK_IN_RESET
 #define NOTIFY_KEY_DOWN
 #define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
@@ -97,6 +96,7 @@
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -130,23 +130,25 @@ class SCSI_HDD;
 class SCSI_HOST;
 class UPD71071;
 
-class BIOS;
-class CMOS;
-class FLOPPY;
-class KEYBOARD;
-class MEMORY;
-//class SERIAL;
-class SCSI;
-class TIMER;
+namespace FMR50 {
+       class BIOS;
+       class CMOS;
+       class FLOPPY;
+       class KEYBOARD;
+       class MEMORY;
+       //class SERIAL;
+       class SCSI;
+       class TIMER;
+}
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
-       csp_state_utils *state_entry;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        HD46505* crtc;
 #if defined(_FMR60)
@@ -169,21 +171,14 @@ protected:
        SCSI_HOST* scsi_host;
        UPD71071* dma;
        
-       BIOS* bios;
-       CMOS* cmos;
-       FLOPPY* floppy;
-       KEYBOARD* keyboard;
-       MEMORY* memory;
-       SCSI* scsi;
-//     SERIAL* serial;
-       TIMER* timer;
-       
-#if defined(OPEN_HARD_DISK_IN_RESET)
-       _TCHAR hd_file_path[USE_HARD_DISK][_MAX_PATH];
-#endif
-       void open_hard_disk_tmp(int drv, const _TCHAR* file_path);
-       void close_hard_disk_tmp(int drv);
-       bool is_hard_disk_inserted_tmp(int drv);
+       FMR50::BIOS* bios;
+       FMR50::CMOS* cmos;
+       FMR50::FLOPPY* floppy;
+       FMR50::KEYBOARD* keyboard;
+       FMR50::MEMORY* memory;
+       FMR50::SCSI* scsi;
+//     FMR50::SERIAL* serial;
+       FMR50::TIMER* timer;
        
 public:
        // ----------------------------------------
@@ -235,9 +230,7 @@ public:
        bool is_frame_skippable();
        
        void update_config();
-       void decl_state();
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // ----------------------------------------
        // for each device
@@ -245,9 +238,9 @@ public:
        
        // devices
        DEVICE* get_device(int id);
-       DEVICE* dummy;
-       DEVICE* first_device;
-       DEVICE* last_device;
+       //DEVICE* dummy;
+       //DEVICE* first_device;
+       //DEVICE* last_device;
 };
 
 #endif