[VM][General] Apply Upstream 2018-10-07.Still WIP.

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

diff --git a/source/src/vm/mz80k/mz80k.h b/source/src/vm/mz80k/mz80k.h
index 69fa6c7..530c5bc 100644 (file)
--- a/source/src/vm/mz80k/mz80k.h
+++ b/source/src/vm/mz80k/mz80k.h
@@ -51,11 +51,7 @@
 // device informations for win32
 #define USE_DIPSWITCH
 #define USE_TAPE               1
-#define USE_TAPE_BUTTON
-#define NOTIFY_KEY_DOWN
 #define USE_KEY_LOCKED
-#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_NO_CAPS
@@ -93,7 +89,6 @@ static const _TCHAR *sound_device_caption[] = {
 };
 #endif
 
-class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -108,18 +103,23 @@ class LS393;
 class PCM1BIT;
 class Z80;
 
-class KEYBOARD;
-class MEMORY;
-class PRINTER;
-
+namespace MZ80 {
+       class KEYBOARD;
+       class MEMORY;
+       class PRINTER;
+}
 #if defined(SUPPORT_MZ80AIF)
 class MB8877;
 class IO;
-class MZ80AIF;
+namespace MZ80 {
+       class MZ80AIF;
+}
 #elif defined(SUPPORT_MZ80FIO)
-class T3444A;
 class IO;
-class MZ80FIO;
+class T3444A;
+namespace MZ80 {
+       class MZ80FIO;
+}
 #endif
 
 class VM : public VM_TEMPLATE
@@ -141,18 +141,18 @@ protected:
        PCM1BIT* pcm;
        Z80* cpu;
        
-       KEYBOARD* keyboard;
-       MEMORY* memory;
-       PRINTER* printer;
+       MZ80::KEYBOARD* keyboard;
+       MZ80::MEMORY* memory;
+       MZ80::PRINTER* printer;
        
 #if defined(SUPPORT_MZ80AIF)
        MB8877* fdc;
        IO* io;
-       MZ80AIF* mz80aif;
+       MZ80::MZ80AIF* mz80aif;
 #elif defined(SUPPORT_MZ80FIO)
        T3444A* fdc;
        IO* io;
-       MZ80FIO* mz80fio;
+       MZ80::MZ80FIO* mz80fio;
 #endif
        
 public:
@@ -170,6 +170,10 @@ public:
        // drive virtual machine
        void reset();
        void run();
+       double get_frame_rate()
+       {
+               return FRAMES_PER_SEC;
+       }
        
 #ifdef USE_DEBUGGER
        // debugger
@@ -219,9 +223,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