[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 5918886..530c5bc 100644 (file)
--- a/source/src/vm/mz80k/mz80k.h
+++ b/source/src/vm/mz80k/mz80k.h
@@ -49,47 +49,43 @@
 #define PRINTER_STROBE_RISING_EDGE
 
 // device informations for win32
-#define USE_SOUND_FILES 4
-#define USE_SOUND_FILES_FDD
-#define USE_SOUND_FILES_BUTTONS
 #define USE_DIPSWITCH
-#define USE_TAPE
-#define USE_TAPE_BUTTON
-#define NOTIFY_KEY_DOWN
-#define USE_SHIFT_NUMPAD_KEY
-#define USE_ALT_F10_KEY
+#define USE_TAPE               1
+#define USE_KEY_LOCKED
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6
 #define USE_AUTO_KEY_NO_CAPS
-#if defined(USE_SOUND_FILES)
+#if defined(SUPPORT_MZ80AIF) || defined(SUPPORT_MZ80FIO)
 #define USE_SOUND_VOLUME       4
 #else
-#define USE_SOUND_VOLUME       2
+#define USE_SOUND_VOLUME       3
 #endif
 #define USE_PRINTER
 #define USE_PRINTER_TYPE       4
 #define USE_DEBUGGER
 #define USE_STATE
+#if defined(SUPPORT_MZ80AIF)
+#define USE_DRIVE_TYPE         2
+#endif
 #if defined(SUPPORT_MZ80AIF) || defined(SUPPORT_MZ80FIO)
-#define USE_FD1
-#define USE_FD2
-#define USE_FD3
-#define USE_FD4
-#define USE_ACCESS_LAMP
+#define USE_FLOPPY_DISK                4
 #endif
 #if defined(_MZ80K)
 #define USE_MONITOR_TYPE       2
 #endif
+#define USE_CPU_Z80
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
-       _T("Beep"), _T("CMT"),
-#if defined(USE_SOUND_FILES)
-       _T("FDD SEEK"), _T("CMT Buttons"),
+       _T("Beep"), _T("CMT (Signal)"),
+#if defined(SUPPORT_MZ80AIF) || defined(SUPPORT_MZ80FIO)
+       _T("Noise (FDD)"),
 #endif
+       _T("Noise (CMT)"),
 };
 #endif
 
@@ -107,27 +103,33 @@ 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
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils* state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
 #if defined(_MZ1200) || defined(_MZ80A)
        AND* and_int;
@@ -139,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:
@@ -168,6 +170,10 @@ public:
        // drive virtual machine
        void reset();
        void run();
+       double get_frame_rate()
+       {
+               return FRAMES_PER_SEC;
+       }
        
 #ifdef USE_DEBUGGER
        // debugger
@@ -176,9 +182,6 @@ public:
        
        // draw screen
        void draw_screen();
-#if defined(SUPPORT_MZ80AIF) || defined(SUPPORT_MZ80FIO)
-       uint32_t get_access_lamp_status();
-#endif
        
        // sound generation
        void initialize_sound(int rate, int samples);
@@ -191,6 +194,8 @@ public:
        // notify key
        void key_down(int code, bool repeat);
        void key_up(int code);
+       bool get_caps_locked();
+       bool get_kana_locked();
        
        // user interface
 #if defined(SUPPORT_MZ80AIF) || defined(SUPPORT_MZ80FIO)
@@ -199,25 +204,26 @@ public:
        bool is_floppy_disk_inserted(int drv);
        void is_floppy_disk_protected(int drv, bool value);
        bool is_floppy_disk_protected(int drv);
-#endif
-       void play_tape(const _TCHAR* file_path);
-       void rec_tape(const _TCHAR* file_path);
-       void close_tape();
-       bool is_tape_inserted();
-       bool is_tape_playing();
-       bool is_tape_recording();
-       int get_tape_position();
-       void push_play();
-       void push_stop();
-       void push_fast_forward();
-       void push_fast_rewind();
-       void push_apss_forward() {}
-       void push_apss_rewind() {}
+       uint32_t is_floppy_disk_accessed();
+#endif
+       void play_tape(int drv, const _TCHAR* file_path);
+       void rec_tape(int drv, const _TCHAR* file_path);
+       void close_tape(int drv);
+       bool is_tape_inserted(int drv);
+       bool is_tape_playing(int drv);
+       bool is_tape_recording(int drv);
+       int get_tape_position(int drv);
+       const _TCHAR* get_tape_message(int drv);
+       void push_play(int drv);
+       void push_stop(int drv);
+       void push_fast_forward(int drv);
+       void push_fast_rewind(int drv);
+       void push_apss_forward(int drv) {}
+       void push_apss_rewind(int drv) {}
        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
@@ -225,9 +231,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