X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fmz80k%2Fmz80k.cpp;h=6a9dee0fa720b8642c7fa9fae6db9184cd0e469a;hb=2fc1443c0f411167f1b61ff87e13fee36cd5876b;hp=948a6a433d3f3321a74381920a1897c9c6bd65a0;hpb=e75fa7f5dc5e881500b30cba136483bd10f303b6;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/mz80k/mz80k.cpp b/source/src/vm/mz80k/mz80k.cpp
index 948a6a433..6a9dee0fa 100644
--- a/source/src/vm/mz80k/mz80k.cpp
+++ b/source/src/vm/mz80k/mz80k.cpp
@@ -50,11 +50,20 @@
 #include "mz80fio.h"
 #endif
 
+using MZ80::KEYBOARD;
+using MZ80::MEMORY;
+using MZ80::PRINTER;
+#if defined(SUPPORT_MZ80AIF)
+using MZ80::MZ80AIF;
+#elif defined(SUPPORT_MZ80FIO)
+using MZ80::MZ80FIO;
+#endif
+
 // ----------------------------------------------------------------------------
 // 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;
@@ -179,6 +188,9 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
 	io->set_iomap_range_rw(0xfe, 0xff, printer);
 	
 	// 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();
 	}
@@ -193,6 +205,20 @@ VM::~VM()
 		delete device;
 		device = next_device;
 	}
+#if defined(SUPPORT_MZ80AIF)
+	for(int drv = 0; drv < MAX_DRIVE; drv++) {
+//		if(config.drive_type) {
+			fdc->set_drive_type(drv, DRIVE_TYPE_2DD);
+//		} else {
+//			fdc->set_drive_type(drv, DRIVE_TYPE_2D);
+//		}
+	}
+#elif defined(SUPPORT_MZ80FIO)
+	for(int drv = 0; drv < MAX_DRIVE; drv++) {
+		fdc->set_drive_type(drv, DRIVE_TYPE_2D);
+//		fdc->set_drive_mfm(drv, false);
+	}
+#endif
 }
 
 DEVICE* VM::get_device(int id)
@@ -215,20 +241,6 @@ void VM::reset()
 	for(DEVICE* device = first_device; device; device = device->next_device) {
 		device->reset();
 	}
-#if defined(SUPPORT_MZ80AIF)
-	for(int i = 0; i < MAX_DRIVE; i++) {
-		if(config.drive_type) {
-			fdc->set_drive_type(i, DRIVE_TYPE_2DD);
-		} else {
-			fdc->set_drive_type(i, DRIVE_TYPE_2D);
-		}
-	}
-#elif defined(SUPPORT_MZ80FIO)
-	for(int i = 0; i < MAX_DRIVE; i++) {
-		fdc->set_drive_type(i, DRIVE_TYPE_2D);
-//		fdc->set_drive_mfm(i, false);
-	}
-#endif
 #if defined(_MZ1200) || defined(_MZ80A)
 	and_int->write_signal(SIG_AND_BIT_0, 0, 1);	// CLOCK = L
 	and_int->write_signal(SIG_AND_BIT_1, 1, 1);	// INTMASK = H
@@ -341,6 +353,18 @@ bool VM::get_kana_locked()
 void VM::open_floppy_disk(int drv, const _TCHAR* file_path, int bank)
 {
 	fdc->open_disk(drv, file_path, bank);
+	
+#if defined(SUPPORT_MZ80AIF)
+	if(fdc->get_media_type(drv) == MEDIA_TYPE_2DD) {
+		if(fdc->get_drive_type(drv) == DRIVE_TYPE_2D) {
+			fdc->set_drive_type(drv, DRIVE_TYPE_2DD);
+		}
+	} else if(fdc->get_media_type(drv) == MEDIA_TYPE_2D) {
+		if(fdc->get_drive_type(drv) == DRIVE_TYPE_2DD) {
+			fdc->set_drive_type(drv, DRIVE_TYPE_2D);
+		}
+	}
+#endif
 }
 
 void VM::close_floppy_disk(int drv)
@@ -452,43 +476,36 @@ void VM::update_config()
 
 #define STATE_VERSION	7
 
-#include "../../statesub.h"
-
-void VM::decl_state(void)
-{
-	state_entry = new csp_state_utils(STATE_VERSION, 0, (_TCHAR *)(_T("CSP::MZ80_SERIES_HEAD")));
-
-	for(DEVICE* device = first_device; device; device = device->next_device) {
-		device->decl_state();
-	}
-}
-
-void VM::save_state(FILEIO* state_fio)
+bool VM::process_state(FILEIO* state_fio, bool loading)
 {
-	//state_fio->FputUint32(STATE_VERSION);
-	if(state_entry != NULL) {
-		state_entry->save_state(state_fio);
+	if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+		return false;
 	}
-	for(DEVICE* device = first_device; device; device = device->next_device) {
-		device->save_state(state_fio);
-	}
-}
-
-bool VM::load_state(FILEIO* state_fio)
-{
-	bool mb = false;
-	if(state_entry != NULL) {
-		mb = state_entry->save_state(state_fio);
-	}
-	if(!mb) return false;
-	//if(state_fio->FgetUint32() != STATE_VERSION) {
-	//	return false;
-	//}
-	for(DEVICE* device = first_device; device; device = device->next_device) {
-		if(!device->load_state(state_fio)) {
+ 	for(DEVICE* device = first_device; device; device = device->next_device) {
+		// Note: typeid(foo).name is fixed by recent ABI.Not dec 6.
+ 		// const char *name = typeid(*device).name();
+		//       But, using get_device_name() instead of typeid(foo).name() 20181008 K.O
+		const char *name = device->get_device_name();
+		int len = strlen(name);
+		
+		if(!state_fio->StateCheckInt32(len)) {
+			if(loading) {
+				printf("Class name len Error: DEVID=%d EXPECT=%s\n", device->this_device_id, name);
+			}
 			return false;
 		}
-	}
+		if(!state_fio->StateCheckBuffer(name, len, 1)) {
+			if(loading) {
+				printf("Class name Error: DEVID=%d EXPECT=%s\n", device->this_device_id, name);
+			}
+ 			return false;
+ 		}
+		if(!device->process_state(state_fio, loading)) {
+			if(loading) {
+				printf("Data loading Error: DEVID=%d\n", device->this_device_id);
+			}
+ 			return false;
+ 		}
+ 	}
 	return true;
 }
-