[VM][STATE] Apply new framework to some VMs.

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

diff --git a/source/src/vm/pasopia7/pasopia7.h b/source/src/vm/pasopia7/pasopia7.h
index 459f826..ac28962 100644 (file)
--- a/source/src/vm/pasopia7/pasopia7.h
+++ b/source/src/vm/pasopia7/pasopia7.h
@@ -23,12 +23,12 @@
 #define FRAMES_PER_SEC         74.38
 #define LINES_PER_FRAME        32
 #define CHARS_PER_LINE         94
-#define HD46505_HORIZ_FREQ     2380
+#define HD46505_HORIZ_FREQ     (1789780.0 / 752.0)
 #else
 #define FRAMES_PER_SEC         59.92
 #define LINES_PER_FRAME        262
 #define CHARS_PER_LINE         57
-#define HD46505_HORIZ_FREQ     15700
+#define HD46505_HORIZ_FREQ     (14318180.0 / 912.0)
 #endif
 #define CPU_CLOCKS             3993600
 #ifdef _LCD
@@ -38,42 +38,40 @@
 #define SCREEN_WIDTH           640
 #define SCREEN_HEIGHT          400
 #define WINDOW_HEIGHT_ASPECT   480
-#define USE_CRT_MONITOR_4_3 1
 #endif
 #define MAX_DRIVE              4
 #define IO_ADDR_MAX            0x100
 #define SUPPORT_VARIABLE_TIMING
 
 // device informations for win32
-#define USE_TAPE
-#define USE_FD1
-#define USE_FD2
-//#define USE_FD3
-//#define USE_FD4
-#define USE_BINARY_FILE1
-#define USE_BINARY_FILE2
+#define USE_TAPE               1
+#define USE_TAPE_BUTTON
+#define USE_FLOPPY_DISK                2
+#define USE_BINARY_FILE                2
 #define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6
-#define USE_CRT_FILTER
+#define USE_AUTO_KEY_NUMPAD
+#define USE_SCREEN_FILTER
 #define USE_SCANLINE
-#define USE_ACCESS_LAMP
-#define USE_SOUND_VOLUME       4
-#define USE_DEBUGGER
+#define USE_SOUND_VOLUME       6
 #define USE_JOYSTICK
-#define USE_MOUSE
+#define USE_DEBUGGER
 #define USE_STATE
+#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("PSG #1"), _T("PSG #2"), _T("Beep"), _T("CMT"),
+       _T("PSG #1"), _T("PSG #2"), _T("Beep"), _T("CMT (Signal)"), _T("Noise (FDD)"), _T("Noise (CMT)"),
 };
 #endif
 
+class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -96,16 +94,17 @@ class DISPLAY;
 class IOBUS;
 class IOTRAP;
 class KEYBOARD;
-class MEMORY;
+class PASOPIA7_MEMORY;
 class PAC2;
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        DATAREC* drec;
        HD46505* crtc;
@@ -128,7 +127,7 @@ protected:
        IOBUS* iobus;
        IOTRAP* iotrap;
        KEYBOARD* key;
-       MEMORY* memory;
+       PASOPIA7_MEMORY* memory;
        PAC2* pac2;
        
 public:
@@ -155,11 +154,10 @@ public:
        
        // draw screen
        void draw_screen();
-       int get_access_lamp_status();
        
        // sound generation
        void initialize_sound(int rate, int samples);
-       uint16* create_sound(int* extra_frames);
+       uint16_t* create_sound(int* extra_frames);
        int get_sound_buffer_ptr();
 #ifdef USE_SOUND_VOLUME
        void set_sound_device_volume(int ch, int decibel_l, int decibel_r);
@@ -171,20 +169,27 @@ public:
        bool is_floppy_disk_inserted(int drv);
        void is_floppy_disk_protected(int drv, bool value);
        bool is_floppy_disk_protected(int drv);
-       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();
+       uint32_t is_floppy_disk_accessed();
+       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) {}
        void load_binary(int drv, const _TCHAR* file_path);
        void save_binary(int drv, const _TCHAR* file_path) {}
        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
@@ -192,9 +197,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