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

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

diff --git a/source/src/vm/x1/x1.h b/source/src/vm/x1/x1.h
index 37acbe5..a80c06b 100644 (file)
--- a/source/src/vm/x1/x1.h
+++ b/source/src/vm/x1/x1.h
@@ -2,6 +2,7 @@
        SHARP X1 Emulator 'eX1'
        SHARP X1twin Emulator 'eX1twin'
        SHARP X1turbo Emulator 'eX1turbo'
+       SHARP X1turboZ Emulator 'eX1turboZ'
 
        Author : Takeda.Toshiya
        Date   : 2009.03.11-
@@ -59,6 +60,7 @@
 #define DATAREC_FAST_FWD_SPEED 16
 #define DATAREC_FAST_REW_SPEED 16
 #define PRINTER_STROBE_RISING_EDGE
+#define SCSI_HOST_AUTO_ACK
 #define SUPPORT_VARIABLE_TIMING
 
 #ifdef _X1TURBO_FEATURE
@@ -88,15 +90,15 @@
 #define USE_KEYBOARD_TYPE      2
 // Keyboard mode B
 #define KEYBOARD_TYPE_DEFAULT  1
-#define USE_DRIVE_TYPE         2
+#define USE_DRIVE_TYPE         3
 #endif
-#define USE_FD1
-#define USE_FD2
-#define FD_BASE_NUMBER         0
-#define USE_TAPE1
+#define USE_FLOPPY_DISK                2
+#define BASE_FLOPPY_DISK_NUM   0
+#define USE_HARD_DISK          4
+#define USE_TAPE               1
 #define USE_TAPE_BUTTON
 #ifdef _X1TWIN
-#define USE_CART1
+#define USE_CART               1
 #endif
 #define NOTIFY_KEY_DOWN
 #define USE_KEY_LOCKED
@@ -111,7 +113,6 @@
 #define USE_SOUND_TYPE         3
 // ToDo
 //#define DATAREC_SOUND
-#define SUPPORT_ROMA_KANA_CONVERSION
 // CZ-8BS1 x1
 #define SOUND_TYPE_DEFAULT     1
 # if defined(_X1TWIN)
@@ -131,9 +132,12 @@
 #define USE_PRINTER_TYPE       4
 #define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_Z80
+#define USE_CPU_MCS48
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -256,6 +260,8 @@ class HD46505;
 class I8255;
 class IO;
 class MB8877;
+class SASI_HDD;
+class SCSI_HOST;
 class YM2151;
 //class YM2203;
 class AY_3_891X;
@@ -271,9 +277,10 @@ class EMM;
 class FLOPPY;
 class IOBUS;
 class JOYSTICK;
-class MEMORY;
+class X1_MEMORY;
 class MOUSE;
 class PSUB;
+class SASI;
 
 class MCS48;
 class UPD1990A;
@@ -283,14 +290,15 @@ class KEYBOARD;
 #ifdef _X1TWIN
 class HUC6280;
 class PCE;
+#define USE_CPU_HUC6280
 #endif
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
        
        // devices for x1
-       EVENT* event;
+       //EVENT* event;
        
        DATAREC* drec;
        DEVICE* printer;
@@ -298,6 +306,8 @@ protected:
        I8255* pio;
        IO* io;
        MB8877* fdc;
+       SASI_HDD* sasi_hdd[(USE_HARD_DISK >> 1) + (USE_HARD_DISK & 1)];
+       SCSI_HOST* sasi_host;
        YM2151* opm1;
        YM2151* opm2;
 //     YM2203* psg;
@@ -315,9 +325,10 @@ protected:
        FLOPPY* floppy;
        IOBUS* iobus;
        JOYSTICK* joy;
-       MEMORY* memory;
+       X1_MEMORY* memory;
        MOUSE* mouse;
        PSUB* psub;
+       SASI* sasi;
        
        MCS48* cpu_sub;
        UPD1990A* rtc_sub;
@@ -385,6 +396,10 @@ public:
        void is_floppy_disk_protected(int drv, bool value);
        bool is_floppy_disk_protected(int drv);
        uint32_t is_floppy_disk_accessed();
+       void open_hard_disk(int drv, const _TCHAR* file_path);
+       void close_hard_disk(int drv);
+       bool is_hard_disk_inserted(int drv);
+       uint32_t is_hard_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);
@@ -410,8 +425,7 @@ public:
 #ifdef _X1TURBO_FEATURE
        void update_dipswitch();
 #endif
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // ----------------------------------------
        // for each device
@@ -419,9 +433,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