From 6cf8ee8eb563f50ceef74605a95e202054e2991c Mon Sep 17 00:00:00 2001
From: Alex Thissen <alex.thissen@xebia.com>
Date: Sat, 10 Feb 2024 21:15:05 +0000
Subject: [PATCH] Removed baud rates from 150 and lower. Fixed tab Replaced
 uploader references to SERIAL_INTERRUPT

---
 libsrc/lynx/ser/lynx-comlynx.s | 31 ++-----------------------------
 libsrc/lynx/uploader.s         |  6 +++---
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/libsrc/lynx/ser/lynx-comlynx.s b/libsrc/lynx/ser/lynx-comlynx.s
index 3b6f18af6..486981184 100644
--- a/libsrc/lynx/ser/lynx-comlynx.s
+++ b/libsrc/lynx/ser/lynx-comlynx.s
@@ -158,33 +158,6 @@ SER_OPEN:
         cmp     #SER_BAUD_300
         beq     setbaudrate
 
-        ldx     #103
-        cmp     #SER_BAUD_150
-        beq     setbaudrate
-
-        ldx     #115
-        cmp     #SER_BAUD_134_5
-        beq     setbaudrate
-
-        ldx     #141
-        cmp     #SER_BAUD_110
-        beq     setbaudrate
-
-        ; Source period is 32 us
-        ldy     #%00011101 ; ENABLE_RELOAD|ENABLE_COUNT|AUD_32
-
-        ldx     #51
-        cmp     #SER_BAUD_75
-        beq     setbaudrate
-
-        ldx     #68
-        cmp     #SER_BAUD_56_875
-        beq     setbaudrate
-
-        ldx     #77
-        cmp     #SER_BAUD_50
-        beq     setbaudrate
-
         lda     #SER_ERR_BAUD_UNAVAIL
         ldx     #0 ; return value is char
         rts
@@ -342,8 +315,8 @@ SER_IRQ:
         lda     contrl
         and     #PAREN      ; Parity enabled implies SER_PAR_EVEN or SER_PAR_ODD
         tay
-        ora 	#OVERRUN|FRAMERR|RXBRK
-        bit     SERCTL      ; Check error flags in SERCTL
+        ora     #OVERRUN|FRAMERR|RXBRK
+        bit     SERCTL      ; Check presence of relevant error flags in SERCTL
 
         beq     @rx_irq     ; No errors so far
 
diff --git a/libsrc/lynx/uploader.s b/libsrc/lynx/uploader.s
index df3e5df40..5ce21b489 100644
--- a/libsrc/lynx/uploader.s
+++ b/libsrc/lynx/uploader.s
@@ -40,14 +40,14 @@ cont1:
         bra     loop1
 
 read_byte:
-        bit     SERCTL
+        bit     SERCTL         ; Check for RXRDY ($40)
         bvc     read_byte
         lda     SERDAT
         rts
 
 _UpLoaderIRQ:
         lda     INTSET
-        and     #$10
+        and     #SERIAL_INTERRUPT
         bne     @L0
         clc
         rts
@@ -69,7 +69,7 @@ again:
 ; last action : clear interrupt
 ;
 exit:
-        lda     #$10
+        lda     #SERIAL_INTERRUPT
         sta     INTRST
         clc
         rts