[General][VM] Merge upstream 2015-08-09.

[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 0525afa..53e1b80 100644 (file)
--- a/source/src/vm/mz80k/mz80k.h
+++ b/source/src/vm/mz80k/mz80k.h
@@ -36,15 +36,19 @@
 #define CPU_CLOCKS             2000000
 #define SCREEN_WIDTH           320
 #define SCREEN_HEIGHT          200
-#define PCM1BIT_HIGH_QUALITY
-//#define LOW_PASS_FILTER
 #ifdef SUPPORT_MZ80AIF
-#define HAS_MB8876
+#define HAS_MB8866
 #define MAX_DRIVE              4
 #endif
 
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
+
 // device informations for win32
 #define USE_TAPE
+#define USE_TAPE_PTR
 #define USE_TAPE_BUTTON
 #define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
@@ -59,9 +63,11 @@
 #define USE_FD3
 #define USE_FD4
 #define USE_ACCESS_LAMP
+#define USE_DISK_WRITE_PROTECT
 #endif
 
 #include "../../common.h"
+#include "../../fileio.h"
 
 class EMU;
 class DEVICE;
@@ -87,8 +93,6 @@ class FLOPPY;
 class IO;
 #endif
 
-class FILEIO;
-
 class VM
 {
 protected:
@@ -151,19 +155,26 @@ public:
        
        // user interface
 #ifdef SUPPORT_MZ80AIF
-       void open_disk(int drv, _TCHAR* file_path, int offset);
+       void open_disk(int drv, _TCHAR* file_path, int bank);
        void close_disk(int drv);
        bool disk_inserted(int drv);
-       void write_protect_fd(int drv, bool flag);
-       bool is_write_protect_fd(int drv);
+       void set_disk_protected(int drv, bool value);
+       bool get_disk_protected(int drv);
 #endif
        void play_tape(_TCHAR* file_path);
        void rec_tape(_TCHAR* file_path);
        void close_tape();
        bool tape_inserted();
+#if defined(USE_TAPE_PTR)
         int get_tape_ptr(void);
+#endif
+       bool get_tape_play(void);
        void push_play();
        void push_stop();
+       void push_fast_forward();
+       void push_fast_rewind();
+       void push_apss_forward() {}
+       void push_apss_rewind() {}
        bool now_skip();
        
        void update_config();