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

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

diff --git a/source/src/vm/mz2500/mz80b.h b/source/src/vm/mz2500/mz80b.h
index 1775155..d113386 100644 (file)
--- a/source/src/vm/mz2500/mz80b.h
+++ b/source/src/vm/mz2500/mz80b.h
@@ -31,6 +31,7 @@
 #define FRAMES_PER_SEC         60
 #define LINES_PER_FRAME                262
 #define CPU_CLOCKS             4000000
+#define CPU_CLOCKS_HIGH                6000000
 #define SCREEN_WIDTH           640
 #define SCREEN_HEIGHT          400
 #define WINDOW_HEIGHT_ASPECT   480
@@ -50,20 +51,19 @@
 
 // device informations for win32
 #define USE_SPECIAL_RESET
-#define USE_FD1
-#define USE_FD2
-#define USE_FD3
-#define USE_FD4
+#define USE_CPU_TYPE           2
+#define USE_FLOPPY_DISK                4
 #ifdef SUPPORT_QUICK_DISK
-#define USE_QD1
+#define USE_QUICK_DISK         1
 #endif
-#define USE_TAPE1
+#define USE_TAPE               1
 #define USE_TAPE_BUTTON
 #define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6
 #define USE_AUTO_KEY_CAPS
+#define USE_AUTO_KEY_NUMPAD
 #define USE_MONITOR_TYPE       4
 #ifndef _MZ80B
 #define USE_SCREEN_FILTER
@@ -74,10 +74,11 @@
 #define USE_PRINTER_TYPE       4
 #define USE_DEBUGGER
 #define USE_STATE
-#define SUPPORT_ROMA_KANA_CONVERSION
+#define USE_CPU_Z80
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -85,6 +86,7 @@ static const _TCHAR *sound_device_caption[] = {
 };
 #endif
 
+class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -97,34 +99,42 @@ class MB8877;
 class PCM1BIT;
 class Z80;
 class Z80PIO;
-
-class CMT;
-class FLOPPY;
-class KEYBOARD;
-class MEMORY;
-class MZ1R12;
-class MZ1R13;
-class PRINTER;
-class TIMER;
-
 #ifdef SUPPORT_QUICK_DISK
 class Z80SIO;
-class QUICKDISK;
 #endif
-
+#ifdef SUPPORT_QUICK_DISK
+namespace MZ700 {
+       class QUICKDISK;
+}
+#endif
+#ifdef SUPPORT_16BIT_BOARD
+       class I286;
+       class I8259;
+#endif
+namespace MZ2500 {
+       class CMT;
+       class FLOPPY;
+       class KEYBOARD;
+       class MZ1R12;
+       class MZ1R13;
+       class PRINTER;
+       class TIMER;
+}
+namespace MZ80B {
+       class MEMORY;
 #ifdef SUPPORT_16BIT_BOARD
-class I286;
-class I8259;
-class MZ1M01;
+       class MZ1M01;
 #endif
+}
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils* state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        DATAREC* drec;
        I8253* pit;
@@ -135,25 +145,25 @@ protected:
        Z80* cpu;
        Z80PIO* pio;
        
-       CMT* cmt;
-       FLOPPY* floppy;
-       KEYBOARD* keyboard;
-       MEMORY* memory;
-       MZ1R12* mz1r12;
-       MZ1R13* mz1r13;
-       PRINTER* printer;
-       TIMER* timer;
+       MZ2500::CMT* cmt;
+       MZ2500::FLOPPY* floppy;
+       MZ2500::KEYBOARD* keyboard;
+       MZ80B::MEMORY* memory;
+       MZ2500::MZ1R12* mz1r12;
+       MZ2500::MZ1R13* mz1r13;
+       MZ2500::PRINTER* printer;
+       MZ2500::TIMER* timer;
        
 #ifdef SUPPORT_QUICK_DISK
        Z80SIO* sio;
-       QUICKDISK* qd;
+       MZ700::QUICKDISK* qd;
 #endif
        
 #ifdef SUPPORT_16BIT_BOARD
        Z80PIO* pio_to16;
        I286* cpu_16;
        I8259* pic_16;
-       MZ1M01* mz1m01;
+       MZ80B::MZ1M01* mz1m01;
 #endif
        
 public:
@@ -219,8 +229,7 @@ public:
        bool is_frame_skippable();
        
        void update_config();
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // ----------------------------------------
        // for each device
@@ -228,9 +237,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