X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fx1%2Fkeyboard.cpp;h=783049cf15485691fdc6264e3ba7b3fb0b9576a3;hb=2fc1443c0f411167f1b61ff87e13fee36cd5876b;hp=6a3e901fc18e0205435512fbd1395af09509231a;hpb=2fc3688fce9d88e48aebd26b694fd2bb143a2574;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/x1/keyboard.cpp b/source/src/vm/x1/keyboard.cpp
index 6a3e901fc..783049cf1 100644
--- a/source/src/vm/x1/keyboard.cpp
+++ b/source/src/vm/x1/keyboard.cpp
@@ -2,6 +2,7 @@
 	SHARP X1 Emulator 'eX1'
 	SHARP X1twin Emulator 'eX1twin'
 	SHARP X1turbo Emulator 'eX1turbo'
+	SHARP X1turboZ Emulator 'eX1turboZ'
 
 	Author : Takeda.Toshiya
 	Date   : 2013.05.01-
@@ -16,7 +17,9 @@
 #define CAPS	0xfe
 #define KANA	0xff
 
-static const uint8 matrix[15][8] = {
+namespace X1 {
+
+static const uint8_t matrix[15][8] = {
 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, //	(CMT buttons ???)
 	{0x1b, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37}, //	ESC	1	2	3	4	5	6	7
 	{0x51, 0x57, 0x45, 0x52, 0x54, 0x59, 0x55, 0x49}, //	Q	W	E	R	T	Y	U	I
@@ -34,9 +37,14 @@ static const uint8 matrix[15][8] = {
 	{0x11, 0x10, KANA, CAPS, 0x12, 0x00, 0x00, 0x00}, //	CTRL	SHIFT	KANA	CAPS	GRAPH			
 };
 
+static const uint8_t diode[15] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x1f, //	CTRL	SHIFT	KANA	CAPS	GRAPH
+};
+
 void KEYBOARD::initialize()
 {
-	key_stat = emu->key_buffer();
+	key_stat = emu->get_key_buffer();
 	caps_locked = kana_locked = 0;
 	column = 0;
 }
@@ -51,7 +59,7 @@ void KEYBOARD::initialize()
 	INT	<-- H
 */
 
-void KEYBOARD::write_io8(uint32 addr, uint32 data)
+void KEYBOARD::write_io8(uint32_t addr, uint32_t data)
 {
 	switch(addr) {
 	case MCS48_PORT_P1:
@@ -64,10 +72,10 @@ void KEYBOARD::write_io8(uint32 addr, uint32 data)
 			static bool prev_signal = true;
 			bool cur_signal = ((data & 0x80) != 0);
 			if(prev_signal != cur_signal) {
-				static uint32 prev_clk = 0;
-				int us = (int)((double)passed_clock(prev_clk) * 1000.0 * 1000.0 / 4000000 + 0.5);
-				prev_clk = current_clock();
-				emu->out_debug_log(_T("%d\t%d\n"), prev_signal, us);
+				static uint32_t prev_clk = 0;
+				int us = (int)((double)get_passed_clock(prev_clk) * 1000.0 * 1000.0 / 4000000 + 0.5);
+				prev_clk = get_current_clock();
+				this->out_debug_log(_T("%d\t%d\n"), prev_signal, us);
 				prev_signal = cur_signal;
 			}
 		}
@@ -77,12 +85,12 @@ void KEYBOARD::write_io8(uint32 addr, uint32 data)
 	}
 }
 
-uint32 KEYBOARD::read_io8(uint32 addr)
+uint32_t KEYBOARD::read_io8(uint32_t addr)
 {
 	switch(addr) {
 	case MCS48_PORT_T0:
 #ifdef _X1TURBO_FEATURE
-		if(config.device_type == 0) {
+		if(config.keyboard_type == 0) {
 			return 1;	// mode A
 		} else
 #endif
@@ -91,10 +99,10 @@ uint32 KEYBOARD::read_io8(uint32 addr)
 		return 1;
 	default:
 		{
-			uint32 value = 0;
+			uint32_t value = 0;
 			
 			// update key status
-			uint8 key_buf[256];
+			uint8_t key_buf[256];
 			memcpy(key_buf, key_stat, sizeof(key_buf));
 			
 			if(key_buf[VK_INSERT]) {
@@ -106,13 +114,36 @@ uint32 KEYBOARD::read_io8(uint32 addr)
 			key_buf[CAPS] = caps_locked;
 			key_buf[KANA] = kana_locked;
 			
-			for(int i = 1; i < 15; i++) {
+			// get key status of all column
+			uint8_t key_map[15];
+			memset(key_map, 0, sizeof(key_map));
+			
+			for(int i = 0; i < 15; i++) {
+				for(int j = 0; j < 8; j++) {
+					if(key_buf[matrix[i][j]]) {
+						key_map[i] |= 1 << j;
+					}
+				}
+			}
+			
+			// check phantom keys (thanks Mr.Sato)
+			for(int i = 0; i < 15; i++) {
 				if(!(column & (1 << i))) {
-					for(int j = 0; j < 8; j++) {
-						if(key_buf[matrix[i][j]]) {
-							value |= 1 << j;
+					uint8_t row_hold;
+					uint8_t row_reak = key_map[i] & (~diode[i]);
+					do {
+						row_hold = row_reak;
+						for(int c = 0; c < 15; c++) {
+							if(c != i){
+								uint8_t row_bridge = key_map[c] & (~diode[c]);
+								if(row_reak & row_bridge) {
+									row_reak |= row_bridge;
+								}
+								if(row_hold != row_reak) break;
+							}
 						}
-					}
+					} while(row_hold != row_reak);
+					value |= key_map[i] | row_reak;
 				}
 			}
 			return ~value;
@@ -135,27 +166,18 @@ void KEYBOARD::key_down(int code, bool repeat)
 
 #define STATE_VERSION	1
 
-void KEYBOARD::save_state(FILEIO* state_fio)
+bool KEYBOARD::process_state(FILEIO* state_fio, bool loading)
 {
-	state_fio->FputUint32(STATE_VERSION);
-	state_fio->FputInt32(this_device_id);
-	
-	state_fio->FputUint8(caps_locked);
-	state_fio->FputUint8(kana_locked);
-	state_fio->FputUint16(column);
+	if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+ 		return false;
+ 	}
+	if(!state_fio->StateCheckInt32(this_device_id)) {
+ 		return false;
+ 	}
+	state_fio->StateUint8(caps_locked);
+	state_fio->StateUint8(kana_locked);
+	state_fio->StateUint16(column);
+ 	return true;
 }
 
-bool KEYBOARD::load_state(FILEIO* state_fio)
-{
-	if(state_fio->FgetUint32() != STATE_VERSION) {
-		return false;
-	}
-	if(state_fio->FgetInt32() != this_device_id) {
-		return false;
-	}
-	caps_locked = state_fio->FgetUint8();
-	kana_locked= state_fio->FgetUint8();
-	column = state_fio->FgetUint16();
-	return true;
 }
-