X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fphc20%2Fmemory.h;h=e4d3b3f19ac71d8f49ac4e94b0be9bad47c0ccfd;hb=8639d5f3a215d3d68dceb1a6c0e4291d1bfa17cf;hp=5ea99ec73cd731e96a7705424ceb26de8b79cad1;hpb=d6af4811979d66a273cc41018ddedc8dd20d74bb;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/phc20/memory.h b/source/src/vm/phc20/memory.h
index 5ea99ec73..e4d3b3f19 100644
--- a/source/src/vm/phc20/memory.h
+++ b/source/src/vm/phc20/memory.h
@@ -7,8 +7,8 @@
 	[ memory ]
 */
 
-#ifndef _MEMORY_H_
-#define _MEMORY_H_
+#ifndef _PHC20_MEMORY_H_
+#define _PHC20_MEMORY_H_
 
 #include "../vm.h"
 #include "../../emu.h"
@@ -16,7 +16,7 @@
 
 #define SIG_MEMORY_SYSPORT	0
 
-class MEMORY : public DEVICE
+class PHC20_MEMORY : public DEVICE
 {
 private:
 	DEVICE *d_drec;
@@ -35,10 +35,11 @@ private:
 	uint8_t sysport;
 	
 public:
-	MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {
-		set_device_name(_T("MEMORY"));
+	PHC20_MEMORY(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+	{
+		set_device_name(_T("Memory Bus"));
 	}
-	~MEMORY() {}
+	~PHC20_MEMORY() {}
 	
 	// common functions
 	void initialize();
@@ -47,8 +48,7 @@ public:
 	uint32_t read_data8(uint32_t addr);
 	void event_frame();
 	void write_signal(int id, uint32_t data, uint32_t mask);
-	void save_state(FILEIO* state_fio);
-	bool load_state(FILEIO* state_fio);
+	bool process_state(FILEIO* state_fio, bool loading);
 	
 	// unique functions
 	void set_context_drec(DEVICE* device)