From 6374a070ea083b9254fbdffe9a341f3b7f1840c9 Mon Sep 17 00:00:00 2001
From: Joppe Blondel <joppe@joppeb.nl>
Date: Sat, 10 Oct 2026 11:20:42 +0200
Subject: [PATCH] removed MC_ bios calls from basic

---
 apps/basic/basic.asm | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/apps/basic/basic.asm b/apps/basic/basic.asm
index 0cc7d6f..ddf7a5c 100644
--- a/apps/basic/basic.asm
+++ b/apps/basic/basic.asm
@@ -42,13 +42,7 @@
 #include "../../bios.inc"
 
 ; MACHINE CONFIG
-MC_BIOS_PUTC            .EQU    BIOS_PUTC
-MC_BIOS_TRY_GETC        .EQU    BIOS_TRY_GETC
-MC_BIOS_GETC            .EQU    BIOS_GETC
-MC_BIOS_FLUSH           .EQU    BIOS_FLUSH
 MC_BIOS_MONITOR         .EQU    BIOS_RAM_START
-MC_BIOS_ROM             .EQU    BIOS_ROM
-MC_BIOS_BANK            .EQU    BIOS_BANK
 MC_CODE_START           .EQU    BASIC_RAM_START
 MC_RAM_START            .EQU    BASIC_RAM_START + BASIC_ROM_SIZE
 MC_RAM_END              .EQU    0FFFFH
@@ -1364,7 +1358,7 @@ UPDATA: LD      (NXTDAT),HL     ; Update DATA pointer
 
 
 TSTBRK: ;RST     18H             ; Check input status
-        CALL    MC_BIOS_TRY_GETC
+        CALL    BIOS_TRY_GETC
         OR      A
         RET     Z               ; No key, go back
         ;RST     10H             ; Get the key into A
@@ -1377,7 +1371,7 @@ TSTBRK: ;RST     18H             ; Check input status
 
 
 STALL:  ;RST     10H             ; Wait for key
-        CALL    MC_BIOS_GETC
+        CALL    BIOS_GETC
         CP      CTRLQ           ; Resume scrolling?
         RET      Z              ; Release the chokehold
         CP      CTRLC           ; Second break?
@@ -4218,7 +4212,7 @@ ATNTAB: .BYTE   9                       ; Table used by ATN
 
 ARET:   RET                     ; A RETurn instruction
 
-GETINP: JP      MC_BIOS_GETC    ;input a character
+GETINP: JP      BIOS_GETC    ;input a character
 
 CLS: 
         LD      A,CS            ; ASCII Clear screen
@@ -4430,12 +4424,12 @@ BINERR: LD      E,BN            ; ?BIN Error
 JJUMP1: LD      IX,-1           ; Flag cold start
         JP      CSTART          ; Go and initialise
 
-MONOUT: JP      MC_BIOS_PUTC    ; output a char
+MONOUT: JP      BIOS_PUTC    ; output a char
 
 
-MONITR: CALL    MC_BIOS_FLUSH
+MONITR: CALL    BIOS_FLUSH
         LD      A,1             ; enable rom
-        call    MC_BIOS_ROM
+        call    BIOS_ROM
         JP      0               ; reboot
 
 INITST: LD      A,0             ; Clear break flag
@@ -4523,7 +4517,7 @@ DROM:                           ; disable ROM
         CP      0C0H
         JP      C,FCERR         ; Return error in full mode
         LD      A,0
-        call    MC_BIOS_ROM
+        call    BIOS_ROM
         RET
 
 EROM:                           ; enable ROM
@@ -4532,7 +4526,7 @@ EROM:                           ; enable ROM
         CP      0C0H
         JP      C,FCERR         ; Return error in full mode
         LD      A,1
-        call    MC_BIOS_ROM
+        call    BIOS_ROM
         RET
 
 BANK0:                          ; Bank 0
@@ -4541,7 +4535,7 @@ BANK0:                          ; Bank 0
         CP      0C0H
         JP      C,FCERR         ; Return error in full mode
         LD      A,0
-        call    MC_BIOS_BANK
+        call    BIOS_BANK
         RET
 
 BANK1:                          ; Bank 1
@@ -4550,7 +4544,7 @@ BANK1:                          ; Bank 1
         CP      0C0H
         JP      C,FCERR         ; Return error in full mode
         LD      A,1
-        call    MC_BIOS_BANK
+        call    BIOS_BANK
         RET
 
 FULL:                           ; New entry. exposes full 48k ram to basic
@@ -4559,7 +4553,7 @@ FULL:                           ; New entry. exposes full 48k ram to basic
         ; FULL BOOT SEQUENCE
         ; ------------------
         LD      A,0
-        CALL    MC_BIOS_ROM     ; Expose RAM below the ROM
+        CALL    BIOS_ROM     ; Expose RAM below the ROM
 
         LD      HL,WRKSPC       ; Start of workspace RAM
         LD      SP,HL           ; Set up a temporary stack