From a1a858a701cf215c001693e5669077a974ac114f Mon Sep 17 00:00:00 2001
From: Daniele Verducci su MatissePenguin <daniele.verducci@gmail.com>
Date: Sun, 7 Feb 2021 11:01:58 +0100
Subject: [PATCH] Reading ps/2 keyboard, but somehow, keycodes are decremented
 by 1

---
 assets/misc/ps2_modeset_2_to_ascii.ods        | Bin 0 -> 15076 bytes
 .../z80-assembly/os/drivers/ps2_keyboard.asm  |  21 +-
 .../os/drivers/ps2_keyboard_scancodeset2.asm  | 264 +++++++++---------
 .../software/z80-assembly/os/main.asm         |  16 +-
 4 files changed, 156 insertions(+), 145 deletions(-)
 create mode 100644 assets/misc/ps2_modeset_2_to_ascii.ods

diff --git a/assets/misc/ps2_modeset_2_to_ascii.ods b/assets/misc/ps2_modeset_2_to_ascii.ods
new file mode 100644
index 0000000000000000000000000000000000000000..03f3b89278bcc358007c5a808a53e65da2928cfb
GIT binary patch
literal 15076
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
F{{dAZrV;=E

literal 0
HcmV?d00001

diff --git a/pat80-computer/software/z80-assembly/os/drivers/ps2_keyboard.asm b/pat80-computer/software/z80-assembly/os/drivers/ps2_keyboard.asm
index be469d6..d5fcd57 100644
--- a/pat80-computer/software/z80-assembly/os/drivers/ps2_keyboard.asm
+++ b/pat80-computer/software/z80-assembly/os/drivers/ps2_keyboard.asm
@@ -3,9 +3,9 @@
 ; Based on PS/2 protocol as documented on http://www.lucadavidian.com/2017/11/15/interfacing-ps2-keyboard-to-a-microcontroller/
 ;
 ; The CLK and Data pin of the PS/2 keyboard are fed into two cascated serial-in parallel-out shift registers.
-; Their outputs are connected to the Pat80 data bus via a buffer activated by the selected 
-; I/O EN signal and their RESET is connected to I/O Address line 0 of the keyboard I/O port. 
-; Being RESET active low, they will be erased when the PAT80 reads (or writes) anything at address 0 
+; Their outputs are connected to the Pat80 data bus via a buffer activated by the selected
+; I/O EN signal and their RESET is connected to I/O Address line 0 of the keyboard I/O port.
+; Being RESET active low, they will be erased when the PAT80 reads (or writes) anything at address 0
 ; of the keyboard I/0 port.
 ;
 ; Thus, the read cycle is:
@@ -20,7 +20,7 @@
 ; behave strangely (will drop next pressed key). This is not a problem, as the computer, once completed, will
 ; have a 60% keyboard, without any of the unusable keys.
 
-include 'ps2_keyboard_scancodeset2.asm'    ; PS/2 Scan Codeset 2 mappings
+include 'drivers/ps2_keyboard_scancodeset2.asm'    ; PS/2 Scan Codeset 2 mappings
 
 ; config (IO port 1)
 PS2KEYB_CLEAR_REG: EQU IO_2
@@ -35,19 +35,20 @@ PS2KEYB_BREAK: EQU 0xF0 - %10000000    ; The MSB is dropped: see NOTE on intro a
 PS2Keyb_readc:
     in a, (PS2KEYB_DATA_REG)    ; reads a character
     add a, 0
-    jp z, Term_readc     ; if char is 0 (NULL), user didn't press any key: wait for character
-	; we found something, allow the keyboard to complete data transmission
+    jp z, PS2Keyb_readc     ; if char is 0 (NULL), user didn't press any key: wait for character
+	; we found something, but it may still be shifting in bits. Allow the keyboard to complete data transmission
 	ld a, PS2KEYB_TRANSMISSION_DURATION/5    ; every cycle is 5 CPU cycles
 	ps2keyb_readc_waitloop:
 		sub 1
 		jr nz, ps2keyb_readc_waitloop
 	; data transmission should now be complete.
 	; check if code is a Break Code. If it is, discard next key as it is a released key
-	ld c, a    ; save a
+	in a, (PS2KEYB_DATA_REG)    ; re-reads the character (it should now be complete)
+	ld c, a    ; save a, because it will be modified by next compare
 	cp PS2KEYB_BREAK    ; compare a with Break Code
 	jp z, ps2keyb_readc_discard    ; if it is a Break Code, jump to discarder routine
 	; we read a valid character: clean key registers
-	in a, PS2KEYB_CLEAR_REG
+	in a, (PS2KEYB_CLEAR_REG)
 	; now we will convert keycode in c to ASCII code
 	ld hl, PS2KEYB_SCANCODESET_ASCII_MAP    ; load start of codeset to ascii map
 	ld b, 0    ; reset b, as we are going to do a sum with bc (where c contains the read scancode)
@@ -56,7 +57,7 @@ PS2Keyb_readc:
     ret ; returns in the a register
 	ps2keyb_readc_discard:
 		; clean key registers
-		in a, PS2KEYB_CLEAR_REG
+		in a, (PS2KEYB_CLEAR_REG)
 		ps2keyb_readc_discard_waitfordata:
 			; wait for next non-0 keycode and discards it (it is the code of the released key)
 			in a, (PS2KEYB_DATA_REG)    ; reads a character
@@ -68,5 +69,5 @@ PS2Keyb_readc:
 				sub 1
 				jr nz, ps2keyb_readc_discard_waitloop
 			; data transmission should now be complete, throw away key code
-			in a, PS2KEYB_CLEAR_REG
+			in a, (PS2KEYB_CLEAR_REG)
 	jp PS2Keyb_readc    ; go back and wait for another keycode
diff --git a/pat80-computer/software/z80-assembly/os/drivers/ps2_keyboard_scancodeset2.asm b/pat80-computer/software/z80-assembly/os/drivers/ps2_keyboard_scancodeset2.asm
index c5ead3e..443cc21 100644
--- a/pat80-computer/software/z80-assembly/os/drivers/ps2_keyboard_scancodeset2.asm
+++ b/pat80-computer/software/z80-assembly/os/drivers/ps2_keyboard_scancodeset2.asm
@@ -2,136 +2,136 @@
 ;
 ; Keycodes 0 to 83
 
-.db PS2KEYB_SCANCODESET_ASCII_MAP: .db 0	; (Unused)
-.db 0	; F9
-.db 0	; (Control key)
-.db 0	; F5
-.db 0	; F3
-.db 0	; F1
-.db 0	; F2
-.db 0	; F12
-.db 0	; (Control key)
-.db 0	; F10
-.db 0	; F8
-.db 0	; F6
-.db 0	; F4
-.db 9	; TAB
-.db 96	; `
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; L ALT
-.db 0	; L SHFT
-.db 0	; (Control key)
-.db 0	; L CTRL
-.db 1	; Q
-.db 2	; 1
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 3	; Z
-.db 4	; S
-.db 65	; A
-.db 66	; W
-.db 67	; 2
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 68	; C
-.db 69	; X
-.db 70	; D
-.db 71	; E
-.db 72	; 4
-.db 73	; 3
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 32	; SPACE
-.db 33	; V
-.db 34	; F
-.db 35	; T
-.db 36	; R
-.db 37	; 5
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 38	; N
-.db 39	; B
-.db 40	; H
-.db 41	; G
-.db 42	; Y
-.db 43	; 6
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 44	; M
-.db 45	; J
-.db 46	; U
-.db 47	; 7
-.db 48	; 8
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 44	; ,
-.db 45	; K
-.db 46	; I
-.db 47	; O
-.db 48	; 0
-.db 49	; 9
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 46	; .
-.db 47	; /
-.db 48	; L
-.db 59	; ;
-.db 60	; P
-.db 45	; -
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 39	; '
-.db 0	; (Unused)
-.db 91	; [
-.db 61	; =
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; CAPS
-.db 0	; R SHFT
-.db 10	; ENTER
-.db 93	; ]
-.db 0	; (Unused)
-.db 92	; \
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 8	; BKSP
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 9	; KP 1
-.db 0	; (Unused)
-.db 10	; KP 4 -- NOTE: shadowed by break code (see the NOTE in ps2_keyboard.asm)
-.db 11	; KP 7
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 0	; (Unused)
-.db 48	; KP 0
-.db 46	; KP .
-.db 47	; KP 2
-.db 48	; KP 5
-.db 49	; KP 6
-.db 50	; KP 8
-.db 27	; ESC
-.db 0	; NUM
-.db 0	; F11
-.db 43	; KP +
-.db 44	; KP 3
+PS2KEYB_SCANCODESET_ASCII_MAP: DB 0	; (Unused)
+DB 0	; F9
+DB 0	; (Control key)
+DB 0	; F5
+DB 0	; F3
+DB 0	; F1
+DB 0	; F2
+DB 0	; F12
+DB 0	; (Control key)
+DB 0	; F10
+DB 0	; F8
+DB 0	; F6
+DB 0	; F4
+DB 9	; TAB
+DB 96	; `
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; L ALT
+DB 0	; L SHFT
+DB 0	; (Control key)
+DB 0	; L CTRL
+DB 1	; Q
+DB 2	; 1
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 3	; Z
+DB 4	; S
+DB 65	; A
+DB 66	; W
+DB 67	; 2
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 68	; C
+DB 69	; X
+DB 70	; D
+DB 71	; E
+DB 72	; 4
+DB 73	; 3
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 32	; SPACE
+DB 33	; V
+DB 34	; F
+DB 35	; T
+DB 36	; R
+DB 37	; 5
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 38	; N
+DB 39	; B
+DB 40	; H
+DB 41	; G
+DB 42	; Y
+DB 43	; 6
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 44	; M
+DB 45	; J
+DB 46	; U
+DB 47	; 7
+DB 48	; 8
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 44	; ,
+DB 45	; K
+DB 46	; I
+DB 47	; O
+DB 48	; 0
+DB 49	; 9
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 46	; .
+DB 47	; /
+DB 48	; L
+DB 59	; ;
+DB 60	; P
+DB 45	; -
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 39	; '
+DB 0	; (Unused)
+DB 91	; [
+DB 61	; =
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; CAPS
+DB 0	; R SHFT
+DB 10	; ENTER
+DB 93	; ]
+DB 0	; (Unused)
+DB 92	; \
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 8	; BKSP
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 9	; KP 1
+DB 0	; (Unused)
+DB 10	; KP 4 -- NOTE: shadowed by break code (see the NOTE in ps2_keyboard.asm)
+DB 11	; KP 7
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 0	; (Unused)
+DB 48	; KP 0
+DB 46	; KP .
+DB 47	; KP 2
+DB 48	; KP 5
+DB 49	; KP 6
+DB 50	; KP 8
+DB 27	; ESC
+DB 0	; NUM
+DB 0	; F11
+DB 43	; KP +
+DB 44	; KP 3
 ; The following codes are unrecognized by PAT80, as it uses only 7 bits (see the NOTE in ps2_keyboard.asm)
-; .db 45	; KP -
-; .db 42	; KP *
-; .db 43	; KP 9
-; .db 0	; SCROLL
-; .db 0	; (Control key)
-; .db 0	; (Control key)
-; .db 0	; (Control key)
-; .db 0	; (Control key)
-; .db 0	; F7
\ No newline at end of file
+; DB 45	; KP -
+; DB 42	; KP *
+; DB 43	; KP 9
+; DB 0	; SCROLL
+; DB 0	; (Control key)
+; DB 0	; (Control key)
+; DB 0	; (Control key)
+; DB 0	; (Control key)
+; DB 0	; F7
\ No newline at end of file
diff --git a/pat80-computer/software/z80-assembly/os/main.asm b/pat80-computer/software/z80-assembly/os/main.asm
index 3ef0ea5..0680b6e 100644
--- a/pat80-computer/software/z80-assembly/os/main.asm
+++ b/pat80-computer/software/z80-assembly/os/main.asm
@@ -116,9 +116,19 @@ Sysinit:
     call Sys_Beep
 
 	; Run memory monitor
-	ei ; enable maskabpe interrupts
-	im 1 ; set interrupt mode 1 (on interrupt jumps to 0x38)
-	rst 0x38 ; throw fake interrupt: jump to interrupt routine to start monitor
+	; ei ; enable maskabpe interrupts
+	; im 1 ; set interrupt mode 1 (on interrupt jumps to 0x38)
+	; rst 0x38 ; throw fake interrupt: jump to interrupt routine to start monitor
+
+    ; Keyboard test
+    ld a, 0x3E
+    call Sys_Printc
+    ktestloop:
+        call Sys_Readc
+        call Sys_Printc
+        ld a, 46
+        call Sys_Printc
+        jp ktestloop
 
 	; User exited from memory monitor without loading a program. Do nothing.
 	mloop: