[VM][General] Merge Upstream 20180530.

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

diff --git a/source/src/vm/pc9801/cmt.h b/source/src/vm/pc9801/cmt.h
index 4e912f3..338396f 100644 (file)
--- a/source/src/vm/pc9801/cmt.h
+++ b/source/src/vm/pc9801/cmt.h
@@ -19,8 +19,6 @@
 #define SIG_CMT_TXRDY  1
 #define SIG_CMT_RXRDY  2
 #define SIG_CMT_TXEMP  3
-#define SIG_CMT_MIX     4
-#define SIG_CMT_VOLUME  5
 
 // max 256kbytes
 #define BUFFER_SIZE    0x40000
@@ -32,22 +30,15 @@ private:
        
        FILEIO* fio;
        int bufcnt;
-       int buffer_size;
-       uint8 buffer[BUFFER_SIZE];
-   
+       uint8_t buffer[BUFFER_SIZE];
        bool play, rec, remote;
-#ifdef DATAREC_SOUND
-       bool cmt_mix;
-       int  cmt_volume;
-#endif
+       
        void release_tape();
        
 public:
-       CMT(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {
-#ifdef DATAREC_SOUND
-               cmt_mix = false;
-               cmt_volume = 0x1800;
-#endif
+       CMT(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       {
+               set_device_name(_T("CMT I/F"));
        }
        ~CMT() {}
        
@@ -55,11 +46,8 @@ public:
        void initialize();
        void release();
        void reset();
-       void write_io8(uint32 addr, uint32 data);
-       void write_signal(int id, uint32 data, uint32 mask);
-#ifdef DATAREC_SOUND
-       void mix(int32 *buffer, int cnt);
-#endif
+       void write_io8(uint32_t addr, uint32_t data);
+       void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
        
@@ -71,7 +59,7 @@ public:
        void play_tape(const _TCHAR* file_path);
        void rec_tape(const _TCHAR* file_path);
        void close_tape();
-       bool tape_inserted()
+       bool is_tape_inserted()
        {
                return (play || rec);
        }