X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fmz5500%2Fmz5500.h;fp=source%2Fsrc%2Fvm%2Fmz5500%2Fmz5500.h;h=28dae8360f69832f49501db7d38274ce6e8dd8de;hb=a2d35b96f05f241703d142a955086ea98081b877;hp=c583d4fc2aaeaa94c26f20f91c4b0a98fbf737a4;hpb=1637e843e464aca450aaf0bf71d5c0a080332ccc;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/mz5500/mz5500.h b/source/src/vm/mz5500/mz5500.h
index c583d4fc2..28dae8360 100644
--- a/source/src/vm/mz5500/mz5500.h
+++ b/source/src/vm/mz5500/mz5500.h
@@ -33,11 +33,9 @@
 #define SCREEN_HEIGHT		400
 #define WINDOW_HEIGHT_ASPECT	480
 #define MAX_DRIVE		4
-#define I8259_MAX_CHIPS		2
 #define UPD7220_HORIZ_FREQ	24860
 #define Z80CTC_CLOCKS		2457600
 #define SINGLE_MODE_DMA
-#define IO_ADDR_MAX		0x400
 #define HAS_AY_3_8912
 #define PRINTER_STROBE_RISING_EDGE
 
@@ -86,6 +84,7 @@ class I86;
 #endif
 class IO;
 class LS393;
+class MEMORY;
 class NOT;
 class RP5C01;
 class UPD7220;
@@ -98,7 +97,7 @@ class Z80SIO;
 namespace MZ5500 {
 	class DISPLAY;
 	class KEYBOARD;
-	class MEMORY;
+	class MEMBUS;
 	class SYSPORT;
 }
 
@@ -107,10 +106,10 @@ class VM : public VM_TEMPLATE
 protected:
 	//EMU* emu;
 	//csp_state_utils *state_entry;
-	
+
 	// devices
 	//EVENT* event;
-	
+
 	DEVICE* printer;
 	I8237* dma;
 	I8255* pio;
@@ -141,38 +140,38 @@ protected:
 	Z80CTC* ctc1;
 #endif
 	Z80SIO* sio;
-	
+
 	MZ5500::DISPLAY* display;
 	MZ5500::KEYBOARD* keyboard;
-	MZ5500::MEMORY* memory;
+	MZ5500::MEMBUS* memory;
 	MZ5500::SYSPORT* sysport;
-	
+
 public:
 	// ----------------------------------------
 	// initialize
 	// ----------------------------------------
-	
+
 	VM(EMU_TEMPLATE* parent_emu);
 	~VM();
-	
+
 	// ----------------------------------------
 	// for emulation class
 	// ----------------------------------------
-	
+
 	// drive virtual machine
 	void reset();
 	void special_reset(int num);
 	void run();
 	double get_frame_rate();
-	
+
 #ifdef USE_DEBUGGER
 	// debugger
 	DEVICE *get_cpu(int index);
 #endif
-	
+
 	// draw screen
 	void draw_screen();
-	
+
 	// sound generation
 	void initialize_sound(int rate, int samples);
 	uint16_t* create_sound(int* extra_frames);
@@ -180,13 +179,13 @@ public:
 #ifdef USE_SOUND_VOLUME
 	void set_sound_device_volume(int ch, int decibel_l, int decibel_r);
 #endif
-	
+
 	// notify key
 	void key_down(int code, bool repeat);
 	void key_up(int code);
 	bool get_caps_locked();
 	bool get_kana_locked();
-	
+
 	// user interface
 	void open_floppy_disk(int drv, const _TCHAR* file_path, int bank);
 	void close_floppy_disk(int drv);
@@ -195,17 +194,17 @@ public:
 	bool is_floppy_disk_protected(int drv);
 	uint32_t is_floppy_disk_accessed();
 	bool is_frame_skippable();
-	
+
 	double get_current_usec();
 	uint64_t get_current_clock_uint64();
-	
+
 	void update_config();
 	bool process_state(FILEIO* state_fio, bool loading);
-	
+
 	// ----------------------------------------
 	// for each device
 	// ----------------------------------------
-	
+
 	// devices
 	DEVICE* get_device(int id);
 	//DEVICE* dummy;