From d8c794f11a1cf05691144ea295d50a7bf883cd79 Mon Sep 17 00:00:00 2001 From: jgharston Date: Tue, 6 Dec 2022 01:33:31 +0000 Subject: [PATCH] Moved *KEY to CHARIO.S with rest of keyboard stuff --- auxmem.chario.s | 23 +++++++++++++++++++++++ auxmem.oscli.s | 5 +---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/auxmem.chario.s b/auxmem.chario.s index 11bffa5..fba1410 100644 --- a/auxmem.chario.s +++ b/auxmem.chario.s @@ -32,6 +32,7 @@ * 23-Oct-2022 Escape: BYTE7E needed to ESCPOLL, INKEYESC unbalanced stack. * 03-Nov-2022 Escape: Fixed INKEY loop failing if entering with previous Escape, * combined with EscAck clearing keyboard. +* 06-Dec-2022 Moved *KEY into here. * Hardware locations @@ -51,12 +52,34 @@ FXKEYBASE EQU BYTEVARBASE+221 FXESCON EQU BYTEVARBASE+229 FXESCEFFECT EQU BYTEVARBASE+230 FX200VAR EQU BYTEVARBASE+200 +FXSOFTLEN EQU BYTEVARBASE+216 +FXSOFTOK EQU BYTEVARBASE+244 + FX254VAR EQU BYTEVARBASE+254 FX2VAR EQU BYTEVARBASE+$B1 FX3VAR EQU BYTEVARBASE+$EC FX4VAR EQU BYTEVARBASE+$ED +* *KEY +* --------------------------- +STARKEY LDA FXSOFTLEN + BNE ERRKEYUSED ; Key being expanded + JSR SCANDEC + CMP #$10 + BCC STARKEY1 +ERRBADKEY BRK + DB $FB + ASC 'Bad key' +ERRKEYUSED BRK + DB $FA + ASC 'Key in use' + BRK +STARKEY1 JSR SKIPCOMMA +* nothing yet + RTS + + * OSWRCH handler **************** * Send a character to current output diff --git a/auxmem.oscli.s b/auxmem.oscli.s index cbebc12..b98323c 100644 --- a/auxmem.oscli.s +++ b/auxmem.oscli.s @@ -15,6 +15,7 @@ * Optimised CLILOOK dispatcher. * 05-Nov-2022 Added ROM, TAPE, TV to command table -> OSBYTE calls. * 06-Nov-2022 Rewrote *BUILD, avoids using code memory. +* Moved *KEY into CHARIO.S * COMMAND TABLE @@ -508,10 +509,6 @@ STARHELP4 LDA #$08 JSR OSWRCH JMP FORCENL -* *KEY -* --------------------------- -STARKEY RTS - * *QUIT command * ------------- STARQUIT >>> XF2MAIN,QUIT