From ee3616eee2ea9f75f894af637d8b0c502cabca8f Mon Sep 17 00:00:00 2001 From: wayne Date: Fri, 23 Nov 2012 14:21:38 +0000 Subject: [PATCH] Reintegrate wbw -> trunk --- trunk/Source/dbgmon.asm | 1 - trunk/Source/uart.asm | 22 ++++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/trunk/Source/dbgmon.asm b/trunk/Source/dbgmon.asm index 19bd88c1..5eb60c9f 100644 --- a/trunk/Source/dbgmon.asm +++ b/trunk/Source/dbgmon.asm @@ -757,7 +757,6 @@ HEXINS: RET ; DONE NIBLS: CALL KIN ; GET K B. DATA - INC HL ; INC KB POINTER CP 40H ; TEST FOR ALPHA JR NC,ALPH ; AND 0FH ; GET THE BITS diff --git a/trunk/Source/uart.asm b/trunk/Source/uart.asm index 6b544879..d8f1bcb9 100644 --- a/trunk/Source/uart.asm +++ b/trunk/Source/uart.asm @@ -131,8 +131,9 @@ UART0_IST1: ; CHECK FOR STAT0.RDRF (DATA READY) IN A,(SIO_LSR) ; READ LINE STATUS REGISTER AND $01 ; TEST IF DATA IN RECEIVE BUFFER #ENDIF - JP Z,CIO_IDLE ; DO IDLE PROCESSING - LD A,$01 ; SIGNAL DATA PENDING + JP Z,CIO_IDLE ; DO IDLE PROCESSING AND RETURN + XOR A + INC A ; SIGNAL CHAR READY, A = 1 RET ; ; @@ -153,14 +154,13 @@ UART0_OST: #IF (PLATFORM == PLT_N8) IN0 A,(CPU_STAT0) AND $02 - JR Z,UART0_OST #ELSE IN A,(SIO_LSR) ; READ LINE STATUS REGISTER AND $20 - JR Z,UART0_OST ; IF NOT REPEAT #ENDIF - JP Z,CIO_IDLE ; DO IDLE PROCESSING - LD A,$01 ; SIGNAL DATA PENDING + JP Z,CIO_IDLE ; DO IDLE PROCESSING AND RETURN + XOR A + INC A ; SIGNAL BUFFER EMPTY, A = 1 RET ; ; @@ -205,8 +205,9 @@ UART1_IST: UART1_IST1: ; CHECK FOR STAT0.RDRF (DATA READY) IN0 A,(CPU_STAT1) ; READ LINE STATUS REGISTER AND $80 ; TEST IF DATA IN RECEIVE BUFFER - JP Z,CIO_IDLE ; DO IDLE PROCESSING - LD A,$01 ; SIGNAL DATA PENDING + JP Z,CIO_IDLE ; DO IDLE PROCESSING AND RETURN + XOR A + INC A ; SIGNAL CHAR READY, A = 1 RET ; ; @@ -223,7 +224,8 @@ UART1_OST: IN0 A,(CPU_STAT1) AND $02 JR Z,UART1_OST - JP Z,CIO_IDLE ; DO IDLE PROCESSING - LD A,$01 ; SIGNAL DATA PENDING + JP Z,CIO_IDLE ; DO IDLE PROCESSING AND RETURN + XOR A + INC A ; SIGNAL BUFFER EMPTY, A = 1 RET #ENDIF