[VM][WIP] Use namespace to devices per VMs.

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

diff --git a/source/src/vm/hc20/hc20.h b/source/src/vm/hc20/hc20.h
index 19b4c0e..c0a4814 100644 (file)
--- a/source/src/vm/hc20/hc20.h
+++ b/source/src/vm/hc20/hc20.h
@@ -27,9 +27,8 @@
 #define WINDOW_MODE_BASE       3
 #define USE_DIPSWITCH
 #define DIPSWITCH_DEFAULT      0x0f
-#define USE_FD1
-#define USE_FD2
-#define USE_TAPE
+#define USE_FLOPPY_DISK                2
+#define USE_TAPE               1
 #define TAPE_BINARY_ONLY
 #define NOTIFY_KEY_DOWN
 #define USE_ALT_F10_KEY
@@ -38,29 +37,23 @@
 #define USE_AUTO_KEY_CAPS
 #define DONT_KEEEP_KEY_PRESSED
 #define USE_NOTIFY_POWER_OFF
-#define USE_ACCESS_LAMP
-#define USE_SOUND_FILES                        1
-#define USE_SOUND_FILES_FDD
-#if defined(USE_SOUND_FILES)
 #define USE_SOUND_VOLUME               2
-#else
-#define USE_SOUND_VOLUME               1
-#endif
 #define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_HD6301
+#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"),
-#if defined(USE_SOUND_FILES)
-       _T("FDD Seek"),
-#endif
+       _T("Beep"), _T("Noise (FDD)"),
 };
 #endif
 
+class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -68,25 +61,29 @@ class EVENT;
 class BEEP;
 class HD146818P;
 class I8255;
-class MC6800;
+//class MC6800;
+class HD6301;
 class TF20;
 class UPD765A;
 class Z80;
 class Z80SIO;
 
-class MEMORY;
-
-class VM
+namespace HC20 {
+       class MEMORY;
+}
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        BEEP* beep;
        HD146818P* rtc;
-       MC6800* cpu;
+       //MC6800* cpu;
+       HD6301* cpu;
        
        TF20* tf20;
        I8255* pio_tf20;
@@ -94,7 +91,7 @@ protected:
        Z80* cpu_tf20;
        Z80SIO* sio_tf20;
        
-       MEMORY* memory;
+       HC20::MEMORY* memory;
        
 public:
        // ----------------------------------------
@@ -120,7 +117,6 @@ public:
        
        // draw screen
        void draw_screen();
-       uint32_t get_access_lamp_status();
        
        // sound generation
        void initialize_sound(int rate, int samples);
@@ -140,15 +136,15 @@ 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();
+       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_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
@@ -156,9 +152,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