From e415afa5d03748309182521111be421e060ca297 Mon Sep 17 00:00:00 2001 From: b1ackmai1er Date: Wed, 16 Dec 2020 22:26:35 +0800 Subject: [PATCH] Update md.asm cleanup after inlining --- Source/HBIOS/md.asm | 65 +++++++-------------------------------------- 1 file changed, 9 insertions(+), 56 deletions(-) diff --git a/Source/HBIOS/md.asm b/Source/HBIOS/md.asm index f08f39ba..0db43b10 100644 --- a/Source/HBIOS/md.asm +++ b/Source/HBIOS/md.asm @@ -315,9 +315,8 @@ MD_RDSECF: ; CALLED FROM MD_RW ; WHICH WAS SETUP BY MD_IOSETUPF ; LD IX,MD_F4KBUF ; SET DESTINATION ADDRESS - LD BC,MD_FREAD_R - CALL FF_FNCALL -; CALL MD_FREAD ; READ 4K SECTOR + LD BC,MD_FREAD_R ; PUT ROUTINE TO CALL + CALL FF_FNCALL ; EXECUTE: READ 4K SECTOR ; MD_SECM: LD A,(IY+MD_LBA+0) ; GET SECTOR WITHIN 4K BLOCK @@ -377,14 +376,12 @@ MD_WRSECF: ; CALLED FROM MD_RW LD (MD_LBA4K),BC ; SAVE 4K LBA ; LD IX,MD_F4KBUF ; SET DESTINATION ADDRESS - LD BC,MD_FREAD_R - CALL FF_FNCALL -; CALL MD_FREAD ; READ 4K SECTOR + LD BC,MD_FREAD_R ; PUT ROUTINE TO CALL + CALL FF_FNCALL ; EXECUTE: READ 4K SECTOR ; MD_SECM1: ; DESIRED SECTOR IS IN BUFFER LD BC,MD_FERAS_R ; PUT ROUTINE TO CALL - CALL FF_FNCALL ; EXECUTE -; CALL MD_FERAS ; ERASE 4K SECTOR + CALL FF_FNCALL ; EXECUTE: ERASE 4K SECTOR OR A RET NZ ; RETURN IF ERROR ; @@ -410,10 +407,9 @@ MD_SECM1: ; DESIRED SECTOR IS IN BUFFER POP DE POP HL ; - LD IX,MD_F4KBUF ; WRITE THE SECTOR + LD IX,MD_F4KBUF ; SET SOURCE ADDRESS LD BC,MD_FWRIT_R ; PUT ROUTINE TO CALL - CALL FF_FNCALL ; EXECUTE -; CALL MD_FWRIT + CALL FF_FNCALL ; EXECUTE: WRITE 4K SECTOR ; XOR A ; @@ -655,9 +651,8 @@ FF_PROBE: LD A,'=' ; NUMBER CALL COUT #ENDIF -; CALL MD_FIDENT ; GET ID AT THIS ADDRESS LD BC,MD_FIDENT_R ; PUT ROUTINE TO CALL - CALL FF_FNCALL ; EXECUTE + CALL FF_FNCALL ; EXECUTE: IDENTIFY FLASH CHIP PUSH HL LD HL,MD_TGTDEV ; IF WE MATCH WITH @@ -738,6 +733,7 @@ FF_NXT2: #ENDIF RET ;====================================================================== +; ;COMMON FUNCTION CALL ; ;====================================================================== @@ -839,14 +835,6 @@ FF_CALCA: ; ON EXIT BC CONTAINS THE CHIP ID BYTES. ; NO STATUS IS RETURNED ;====================================================================== -; -;MD_FIDENT: -; PUSH HL -; PUSH DE -; -; LD BC,MD_FIDENT_R ; PUT ROUTINE TO CALL -; JP FF_FNCALL ; EXECUTE -; ;====================================================================== ; FLASH IDENTIFY ; SELECT THE APPROPRIATE BANK / ADDRESS @@ -906,14 +894,6 @@ MD_I_SZ .EQU $-MD_FIDENT_R ; SIZE OF RELOCATABLE CODE BUFFER REQUIRED ; ON ENTRY DE:HL POINTS TO AN ADDRESS IDENTIFYING THE CHIP ; ON EXIT A RETURNS STATUS 0=SUCCESS NZ=FAIL ;====================================================================== -; -;MD_FERAS: -; PUSH HL -; PUSH DE -; -; LD BC,MD_FERAS_R ; PUT ROUTINE TO CALL -; JP FF_FNCALL ; EXECUTE -; ;====================================================================== ; ERASE FLASH SECTOR. ; @@ -1002,20 +982,6 @@ MD_S_SZ .EQU $-MD_FERAS_R ; SIZE OF RELOCATABLE CODE BUFFER REQUIRED ; IX POINTS TO WHERE TO SAVE DATA ; ON EXIT NO STATUS IS RETURNED ;====================================================================== -; -;MD_FREAD: -; PUSH HL -; PUSH DE -; -; LD L,0 ; CHANGE ADDRESS -; LD A,H ; TO SECTOR BOUNDARY -; AND $F0 ; BY MASKING OFF -; LD H,A ; LOWER 12 BITS -; -; LD BC,MD_FREAD_R ; PUT ROUTINE TO CALL -; JP FF_FNCALL ; EXECUTE -; -; RET ;====================================================================== ; FLASH READ SECTOR. ; @@ -1082,19 +1048,6 @@ MD_R_SZ .EQU $-MD_FREAD_R ; SIZE OF RELOCATABLE CODE BUFFER REQUIRED ; IX POINTS TO DATA TO BE WRITTEN ; ON EXIT NO STATUS IS RETURNED ;====================================================================== -; -;MD_FWRIT: -; PUSH HL -; PUSH DE -; -; LD L,0 ; CHANGE ADDRESS -; LD A,H ; TO SECTOR BOUNDARY -; AND $F0 ; BY MASKING OFF -; LD H,A ; LOWER 12 BITS -; -; LD BC,MD_FWRIT_R ; PUT ROUTINE TO CALL -; JP FF_FNCALL ; EXECUTE -; ;====================================================================== ; FLASH WRITE SECTOR. ;