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

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

diff --git a/source/src/vm/pc100/pc100.h b/source/src/vm/pc100/pc100.h
index 1fe3334..f28c603 100644 (file)
--- a/source/src/vm/pc100/pc100.h
+++ b/source/src/vm/pc100/pc100.h
@@ -32,12 +32,9 @@
 #define IO_ADDR_MAX            0x10000
 
 // device informations for win32
-#define USE_FD1
-#define USE_FD2
-#define NOTIFY_KEY_DOWN
+#define USE_DRIVE_TYPE         2
+#define USE_FLOPPY_DISK                2
 #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_NUMPAD
@@ -47,9 +44,11 @@
 #define USE_MOUSE
 #define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_I286
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -73,17 +72,20 @@ class MSM58321;
 class PCM1BIT;
 class UPD765A;
 
-class CRTC;
-class IOCTRL;
-class KANJI;
+namespace PC100 {
+       class CRTC;
+       class IOCTRL;
+       class KANJI;
+}
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        AND* and_drq;
        BEEP* beep;
@@ -98,9 +100,9 @@ protected:
        PCM1BIT* pcm;
        UPD765A* fdc;
        
-       CRTC* crtc;
-       IOCTRL* ioctrl;
-       KANJI* kanji;
+       PC100::CRTC* crtc;
+       PC100::IOCTRL* ioctrl;
+       PC100::KANJI* kanji;
        
        // memory
        uint8_t ram[0xc0000];   // Main RAM 768KB
@@ -121,6 +123,10 @@ public:
        // drive virtual machine
        void reset();
        void run();
+       double get_frame_rate()
+       {
+               return FRAMES_PER_SEC;
+       }
        
 #ifdef USE_DEBUGGER
        // debugger
@@ -154,8 +160,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
@@ -163,9 +168,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