[BUILD] Set SOVERSION and GIT hash automatically.

[csp-qt/common_source_project-fm7.git] / source / src / vm / msx / msx_ex.cpp

diff --git a/source/src/vm/msx/msx_ex.cpp b/source/src/vm/msx/msx_ex.cpp
index 9a26549..e85bad8 100644 (file)
--- a/source/src/vm/msx/msx_ex.cpp
+++ b/source/src/vm/msx/msx_ex.cpp
@@ -74,7 +74,7 @@ private:
        uint8_t port;
        
 public:
-       PORT_F4(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {
+       PORT_F4(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {
                port = 0;
        }
        ~PORT_F4() {}
@@ -96,7 +96,7 @@ public:
 // initialize
 // ----------------------------------------------------------------------------
 
-VM::VM(EMU* parent_emu) : emu(parent_emu)
+VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
 {
        // create devices
        first_device = last_device = NULL;
@@ -337,9 +337,13 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
 #endif
 
        // initialize all devices
+#if defined(__GIT_REPO_VERSION)
+       strncpy(_git_revision, __GIT_REPO_VERSION, sizeof(_git_revision) - 1);
+#endif
        for(DEVICE* device = first_device; device; device = device->next_device) {
                device->initialize();
        }
+       decl_state();
 }
 
 VM::~VM()
@@ -507,16 +511,21 @@ bool VM::is_cart_inserted(int drv)
 void VM::play_tape(int drv, const _TCHAR* file_path)
 {
        drec->play_tape(file_path);
+//     drec->set_remote(true);
 }
 
 void VM::rec_tape(int drv, const _TCHAR* file_path)
 {
        drec->rec_tape(file_path);
+//     drec->set_remote(true);
 }
 
 void VM::close_tape(int drv)
 {
+       emu->lock_vm();
        drec->close_tape();
+       emu->unlock_vm();
+//     drec->set_remote(false);
 }
 
 bool VM::is_tape_inserted(int drv)
@@ -544,18 +553,41 @@ const _TCHAR* VM::get_tape_message(int drv)
        return drec->get_message();
 }
 
+void VM::push_play(int drv)
+{
+       drec->set_ff_rew(0);
+       drec->set_remote(true);
+}
+
+void VM::push_stop(int drv)
+{
+       drec->set_remote(false);
+}
+
+void VM::push_fast_forward(int drv)
+{
+       drec->set_ff_rew(1);
+       drec->set_remote(true);
+}
+
+void VM::push_fast_rewind(int drv)
+{
+       drec->set_ff_rew(-1);
+       drec->set_remote(true);
+}
+
 #if defined(LDC_SLOT)
-void VM::open_laser_disc(const _TCHAR* file_path)
+void VM::open_laser_disc(int drv, const _TCHAR* file_path)
 {
        ldp->open_disc(file_path);
 }
 
-void VM::close_laser_disc()
+void VM::close_laser_disc(int drv)
 {
        ldp->close_disc();
 }
 
-bool VM::is_laser_disc_inserted()
+bool VM::is_laser_disc_inserted(int drv)
 {
        return ldp->is_disc_inserted();
 }
@@ -610,12 +642,26 @@ void VM::update_config()
        }
 }
 
-#define STATE_VERSION  4
+#define STATE_VERSION  5
+
+#include "../../statesub.h"
+#include "../../qt/gui/csp_logger.h"
+extern CSP_Logger DLL_PREFIX_I *csp_logger;
+
+void VM::decl_state(void)
+{
+       state_entry = new csp_state_utils(STATE_VERSION, 0, (_TCHAR *)(_T("CSP::MSX_SERIES_HEAD")), csp_logger);
+       for(DEVICE* device = first_device; device; device = device->next_device) {
+               device->decl_state();
+       }
+}
 
 void VM::save_state(FILEIO* state_fio)
 {
-       state_fio->FputUint32(STATE_VERSION);
-       
+       //state_fio->FputUint32(STATE_VERSION);
+       if(state_entry != NULL) {
+               state_entry->save_state(state_fio);
+       }
        for(DEVICE* device = first_device; device; device = device->next_device) {
                device->save_state(state_fio);
        }
@@ -623,7 +669,15 @@ void VM::save_state(FILEIO* state_fio)
 
 bool VM::load_state(FILEIO* state_fio)
 {
-       if(state_fio->FgetUint32() != STATE_VERSION) {
+       //if(state_fio->FgetUint32() != STATE_VERSION) {
+       //      return false;
+       //}
+       bool mb = false;
+       if(state_entry != NULL) {
+               mb = state_entry->load_state(state_fio);
+       }
+       if(!mb) {
+               emu->out_debug_log("INFO: HEADER DATA ERROR");
                return false;
        }
        for(DEVICE* device = first_device; device; device = device->next_device) {