[VM] MEMORY:: class within some VM will change Foo_MEMORY:: to reduce misundestanding...

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

diff --git a/source/src/vm/fm16pi/fm16pi.h b/source/src/vm/fm16pi/fm16pi.h
index ad4d219..8130d57 100644 (file)
--- a/source/src/vm/fm16pi/fm16pi.h
+++ b/source/src/vm/fm16pi/fm16pi.h
@@ -29,27 +29,29 @@
 #define IO_ADDR_MAX            0x10000
 
 // device informations for win32
-#define USE_FD1
-#define USE_FD2
+#define USE_FLOPPY_DISK                2
 #define NOTIFY_KEY_DOWN
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6
 #define USE_NOTIFY_POWER_OFF
-#define USE_ACCESS_LAMP
-#define USE_SOUND_VOLUME       1
+#define USE_SOUND_VOLUME       2
 #define USE_DEBUGGER
 #define USE_STATE
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
+
+#define USE_CPU_I286
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
-       _T("Beep"),
+       _T("Beep"), _T("Noise (FDD)"),
 };
 #endif
 
+class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -68,13 +70,14 @@ class PCM1BIT;
 
 class SUB;
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        I8251* sio;
        I8253* pit;
@@ -91,9 +94,9 @@ protected:
        SUB* sub;
        
        // memory
-       uint8 ram[0x80000];
-       uint8 kanji[0x40000];
-       uint8 cart[0x40000];
+       uint8_t ram[0x80000];
+       uint8_t kanji[0x40000];
+       uint8_t cart[0x40000];
        
 public:
        // ----------------------------------------
@@ -119,11 +122,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);
@@ -139,11 +141,11 @@ public:
        bool is_floppy_disk_inserted(int drv);
        void is_floppy_disk_protected(int drv, bool value);
        bool is_floppy_disk_protected(int drv);
+       uint32_t is_floppy_disk_accessed();
        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
@@ -151,9 +153,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