Kernel version 0.8 : Fixed bug in Event Mgr

This commit is contained in:
Rémy GIBERT 2016-10-06 08:23:20 +02:00
parent f76268fe93
commit bbf65b74e5
5 changed files with 28 additions and 31 deletions

Binary file not shown.

Binary file not shown.

View File

@ -10,7 +10,7 @@ echo Env:
SET
# Main Screen
INSDRV CONSOLE.DRV
#STARTPROC GETTY CON ${A2OSX}SBIN/LOGIN
STARTPROC GETTY CON ${A2OSX}SBIN/LOGIN
# Serial Login
#INSDRV SSC.I.DRV 9600 N 8 1 X
#STARTPROC GETTY COM2 LOGIN

View File

@ -103,43 +103,41 @@ OPEN stz CURON
clc
rts
*--------------------------------------
GETEVENT lda A2osX.TIMER16
GETEVENT jsr Char.Out.Get
bcc .7 no char in output buffer...
lda A2osX.ASCREEN
cmp #1 is CON active?
bne .9 no....exit
lda A2osX.TIMER16
and #CURSOR.BLINK.SPEED
eor CURON
beq .1
jsr CURBLNK
.1 jsr Char.Out.Get
bcc .7
>DEBUG
>SYSCALL SYS.GetKeyboardEvent
bcs .9
.1 lda OPENAPPLE
bmi .9 Open apple key, not for us...
ldy #S.EVT.DATAHI
lda (pEvent),y
bne .8
lda KBD
bpl .9
sta KBDSTROBE
lda A2osX.ASCREEN
cmp #1
bne .9
dey
lda (pEvent),y
and #$7F
ldx KeyRemapped
.2 cmp KeyRemapped,x
beq .3
dex
bne .2
clc
rts
bra .7
.3 lda KeyRemappedIdx,x
tay
.4 lda KeyRemappedTbl,y
beq .6
jsr Char.Out
jsr Char.Out.Put
iny
bra .4
@ -147,7 +145,7 @@ GETEVENT lda A2osX.TIMER16
.7 ldy #S.EVT.DATALO
sta (pEvent),y
iny
iny S.EVT.DATAHI
lda #0
sta (pEvent),y
lda #S.EVT.F.KEY
@ -531,19 +529,19 @@ Esc.Query ldx EscSeqParamCnt
bne .8
lda #$1B
jsr Char.Out
jsr Char.Out.Put
lda #$5B
jsr Char.Out
jsr Char.Out.Put
lda CV
inc
jsr Decimal.Out
jsr Decimal.Out
lda #';'
jsr Char.Out
jsr Char.Out.Put
lda CH
inc
jsr Decimal.Out
lda #'R'
jsr Char.Out
jsr Char.Out.Put
.8 clc
rts
@ -733,7 +731,7 @@ Decimal.Out stz DecimalBuffer
beq .2
ora #$30
dec bDecimal0Out
jsr Char.Out
jsr Char.Out.Put
.2 lda DecimalBuffer
lsr
@ -744,12 +742,12 @@ Decimal.Out stz DecimalBuffer
bit bDecimal0Out
bpl .4
.3 ora #$30
jsr Char.Out
jsr Char.Out.Put
.4 lda DecimalBuffer
and #$0f
ora #$30
*--------------------------------------
Char.Out pha
Char.Out.Put pha
lda OutPtr
clc
adc OutCnt

View File

@ -163,12 +163,11 @@ DevMgr.SYS.GetEvent
.1 stx DevMgr.SYS.CPULOADI
jsr K.GetKeyboardEvent
bcs .9
rts
bcc .8
.9 lda #0 Error = no event
sec
rts
.8 rts
*--------------------------------------
DevMgr.SYS.COut phx
phy