[VM][STATE] Use namespace {VMNAME} to separate per VMs.

[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 61a2432..1cc870d 100644 (file)
--- a/source/src/vm/pc9801/cmt.h
+++ b/source/src/vm/pc9801/cmt.h
@@ -19,12 +19,12 @@
 #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
 
+namespace PC9801 {
+
 class CMT : public DEVICE
 {
 private:
@@ -32,23 +32,25 @@ private:
        
        FILEIO* fio;
        int bufcnt;
-       uint8 buffer[BUFFER_SIZE];
-   
+       uint8_t buffer[BUFFER_SIZE];
        bool play, rec, remote;
+       
        void release_tape();
        
 public:
-       CMT(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       CMT(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       {
+               set_device_name(_T("CMT I/F"));
+       }
        ~CMT() {}
        
        // common functions
        void initialize();
        void release();
        void reset();
-       void write_io8(uint32 addr, uint32 data);
-       void write_signal(int id, uint32 data, uint32 mask);
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       void write_io8(uint32_t addr, uint32_t data);
+       void write_signal(int id, uint32_t data, uint32_t mask);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // unique functions
        void set_context_sio(DEVICE* device)
@@ -58,11 +60,12 @@ 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);
        }
 };
 
+}
 #endif