X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fz80sio.h;h=5814dfba234411f31a210ea5acde5f5a69656213;hb=819fa469d52bdcb178aa6aa717e8c982e4cc0667;hp=91ce83bbb9ebd8f0911ff11ece1c9f3ce84c00de;hpb=6b3e6fc721c95cc9e7f8eb941f9139f711a2205e;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/z80sio.h b/source/src/vm/z80sio.h
index 91ce83bbb..5814dfba2 100644
--- a/source/src/vm/z80sio.h
+++ b/source/src/vm/z80sio.h
@@ -87,8 +87,8 @@ private:
 		outputs_t outputs_rxdone;
 	} port[2];
 	
-	void update_tx_timing(int ch);
-	void update_rx_timing(int ch);
+	void __FASTCALL update_tx_timing(int ch);
+	void __FASTCALL update_rx_timing(int ch);
 	
 	// daisy chain
 	DEVICE *d_cpu, *d_child;
@@ -97,10 +97,10 @@ private:
 
 	bool __HAS_UPD7201;
 	bool __SIO_DEBUG;
-	void update_intr();
+	void __FASTCALL update_intr();
 	
 public:
-	Z80SIO(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+	Z80SIO(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
 	{
 		memset(port, 0, sizeof(port));
 		for(int i = 0; i < 2; i++) {
@@ -126,12 +126,11 @@ public:
 	void initialize();
 	void reset();
 	void release();
-	void write_io8(uint32_t addr, uint32_t data);
-	uint32_t read_io8(uint32_t addr);
-	void write_signal(int id, uint32_t data, uint32_t mask);
+	void __FASTCALL write_io8(uint32_t addr, uint32_t data);
+	uint32_t __FASTCALL read_io8(uint32_t addr);
+	void __FASTCALL write_signal(int id, uint32_t data, uint32_t mask);
 	void event_callback(int event_id, int err);
-	void save_state(FILEIO* state_fio);
-	bool load_state(FILEIO* state_fio);
+	bool process_state(FILEIO* state_fio, bool loading);
 	// interrupt common functions
 	void set_context_intr(DEVICE* device, uint32_t bit)
 	{
@@ -142,6 +141,10 @@ public:
 	{
 		d_child = device;
 	}
+	DEVICE *get_context_child()
+	{
+		return d_child;
+	}
 	void set_intr_iei(bool val);
 	uint32_t get_intr_ack();
 	void notify_intr_reti();