Feature/fix weird kermit thing (#396)

* We've been lucky - it won't last. Fix it 😅 * Also include header
rosco-m68k · Dec 16, 2023 · 74e8686 · 74e8686
1 parent 1b23994
commit 74e8686
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/code/firmware/rosco_m68k_firmware/include/serial.h b/code/firmware/rosco_m68k_firmware/include/serial.h
@@ -24,7 +24,7 @@ void DISABLE_XMIT();
 void ENABLE_XMIT();
 
 uint8_t RECVCHAR();
-void SENDCHAR(uint8_t);
+void SENDCHAR_C(uint8_t);
 
 
 #endif

diff --git a/code/firmware/rosco_m68k_firmware/stage2/kermit/kermit_support.c b/code/firmware/rosco_m68k_firmware/stage2/kermit/kermit_support.c
@@ -6,7 +6,7 @@
  * |_| |___|___|___|___|_____|_|_|_|___|___|_,_|
  *                     |_____|       firmware v2
  * ------------------------------------------------------------
- * Copyright (c)2019-2021 Ross Bamford and contributors
+ * Copyright (c)2019-2023 Ross Bamford and contributors
  * See top-level LICENSE.md for licence information.
  *
  * Stage 2 Kermit loader
@@ -70,7 +70,7 @@ static int readpkt(struct k_data * k, UCHAR *p, int len) {
 
 static int tx_data(struct k_data * k, UCHAR *p, int n) {
     for (int i = 0; i < n; i++) {
-        SENDCHAR(*p++);
+        SENDCHAR_C(*p++);
     }
 
     return(X_OK);                                   /* Success */

diff --git a/code/firmware/rosco_m68k_firmware/stage2/serial.asm b/code/firmware/rosco_m68k_firmware/stage2/serial.asm
@@ -5,7 +5,7 @@
 ; |_| |___|___|___|___|_____|_|_|_|___|___|_,_| 
 ;                     |_____|       firmware v2
 ;------------------------------------------------------------
-; Copyright (c)2019-2021 Ross Bamford and contributors
+; Copyright (c)2019-2023 Ross Bamford and contributors
 ; See top-level LICENSE.md for licence information.
 ;
 ; This is low-level UART stuff and exception handlers for the
@@ -16,6 +16,10 @@
 
     section .text
 
+; Send a single character via UART from C
+SENDCHAR_C::
+    move.l  4(A7),D0
+
 ; Send a single character via UART
 ;
 ; Trashes: MFP_UDR