Commit: 6f654f5fba6c2e909e79556da2fdaca15e544c81 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Revision: 6f654f5fba6c2e909e79556da2fdaca15e544c81 (tree)
• Time: 2019-04-06 12:15:38
• Author: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

Debug INKEY INTERRUPT

Change Summary

• modified: mips/zoea/compiler.h
• modified: mips/zoea/help.txt
• modified: mips/zoea/timer.c

Incremental Difference

--- a/mips/zoea/compiler.h
+++ b/mips/zoea/compiler.h
@@ -490,7 +490,7 @@ char* interrupt_statement();
 #define INTERRUPT_TIMER     0
 #define INTERRUPT_DRAWCOUNT 1
 #define INTERRUPT_KEYS      2
-#define INTERRUPT_KEYINPUT  3
+#define INTERRUPT_INKEY     3
 #define INTERRUPT_MUSIC     4
 #define INTERRUPT_WAVE      5
 

--- a/mips/zoea/help.txt
+++ b/mips/zoea/help.txt
@@ -261,7 +261,7 @@ INTERRUPT xxx,yyy[,z1[,z2 ... ]]
 			1/60秒毎の割り込み。
 		KEYS
 			ボタンの押下状態が変化した時。
-		KEYINPUT
+		INKEY
 			キーボード押下時。
 		MUSIC
 			音楽再生の時、最後の音の再生時に割り込み。

--- a/mips/zoea/timer.c
+++ b/mips/zoea/timer.c
@@ -30,7 +30,7 @@ static const void* interrupt_list[]={
 	"TIMER",    (void*)INTERRUPT_TIMER,
 	"DRAWCOUNT",(void*)INTERRUPT_DRAWCOUNT,
 	"KEYS",     (void*)INTERRUPT_KEYS,
-	"KEYINPUT", (void*)INTERRUPT_KEYINPUT,
+	"INKEY",    (void*)INTERRUPT_INKEY,
 	"MUSIC",    (void*)INTERRUPT_MUSIC,
 	"WAVE",     (void*)INTERRUPT_WAVE,
 	ADDITIONAL_INTERRUPT_FUNCTIONS
@@ -266,14 +266,17 @@ char* interrupt_statement(){
 	1) Call music function if needed.
 		MUSIC interrupt is taken by music.c
 	2) Check buttons for KEYS interrupt
-	3) Check PS/2 for KEYINPUT interrupt
+	3) Check PS/2 for INKEY interrupt
 	4) DRAWCOUNT interrupt
 */
 
+const int* keystatus=(int*)&ps2keystatus[0];
+
 #pragma interrupt CS0Handler IPL3SOFT vector 1
 void CS0Handler(void){
 	static int s_keys=-1;
-	static int s_vkey=0;
+	static char s_inkey=0;
+	int i;
 	IFS0bits.CS0IF=0;
 	// Call music function
 	if (g_music_active) musicint();
@@ -286,12 +289,22 @@ void CS0Handler(void){
 			// Raise KEYS interrupt flag
 			raise_interrupt_flag(INTERRUPT_KEYS);
 		}
-		s_keys!=KEYPORT&(KEYUP|KEYDOWN|KEYLEFT|KEYRIGHT|KEYSTART|KEYFIRE);
+		s_keys=KEYPORT&(KEYUP|KEYDOWN|KEYLEFT|KEYRIGHT|KEYSTART|KEYFIRE);
 		// Check PS/2 keyboard down
-		if ((vkey&0xff) && !s_vkey) {
-			// Raise KEYINPUT interrupt flag
-			raise_interrupt_flag(INTERRUPT_KEYINPUT);
+		if (g_int_vector[INTERRUPT_INKEY]) {
+			for(i=0;i<64;i++){
+				if (keystatus[i]) {
+					// Raise INKEY interrupt flag
+					if (!s_inkey) raise_interrupt_flag(INTERRUPT_INKEY);
+					break;
+				}
+			}
+			s_inkey=(i==64) ? 0:1;
 		}
-		s_vkey=vkey&0xff;
 	}
-}
\ No newline at end of file
+}
+/*
+		for(i=0;i<256;i++){
+			if (ps2keystatus[i]) return i;
+		}
+*/