From bdb3192456d92c4fecf80493e02ac0a2e5459165 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Mon, 21 Oct 2019 15:51:34 -0400 Subject: [PATCH] More cleanup --- SOFTCARD80.ASM#040000 | 32 +++++++++----------------------- SOFTCARD80.BIN#041000 | Bin 32771 -> 32771 bytes zapple2.po | Bin 819200 -> 819200 bytes 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/SOFTCARD80.ASM#040000 b/SOFTCARD80.ASM#040000 index 0d37ce5..b78e6a1 100644 --- a/SOFTCARD80.ASM#040000 +++ b/SOFTCARD80.ASM#040000 @@ -1233,20 +1233,14 @@ FUNS1 LD A,(CURDRV) ; Contains user number & current drive ; 0 success, 1 reading unwritten data, 4 reading unwritten extent, ; 6 rec number out of range, 9 invalid FCB, 10 media changed, 0FFH h/w err ; TODO Update sequential record number & extent -F_READRAND PUSH DE ; Preserve pointer to FCB - LD H,D ; Pointer to FCB ... - LD L,E ; ... into HL - LD BC,0EH ; Offset to S2 field (reserved field) - ADD HL,BC ; Compute address - LD A,(HL) ; Obtain file reference num from FCB S2 +F_READRAND PUSH DE ; Copy pointer to FCB ... + POP IX ; ... + LD A,(IX+0EH) ; Obtain file reference num from FCB S2 LD (SMMLIN),A ; Store in parameter list for SET_MARK LD (FRMLIN),A ; Store in parameter list for READ - LD BC,21H-0EH ; Skip ahead to random record num in FCB - ADD HL,BC ; ... - LD B,(HL) ; Load LSB of random record number - INC HL ; Load MSB of random record number - LD C,(HL) ; ... + LD B,(IX+21H) ; Load LSB of random record number + LD C,(IX+22H) ; ... LD H,B ; Leave it in HL LD L,C ; ... CALL RECS2LN2 ; Leaves the length in bytes in HL @@ -1275,27 +1269,19 @@ F_READRAND PUSH DE ; Preserve pointer to FCB CP 0 ; See if there was some other error JP NZ,FRRERR ; If so, return code 0FFH (h/w error) - POP DE ; Get pointer to FCB back - LD H,D ; Pointer to FCB ... - LD L,E ; ... into HL - LD BC,20H ; Advance to sequential rec number field - ADD HL,BC ; ... ;;;;TODO Should copy random record number to seq -;; INC (HL) ; Increment sequential record number +;; INC (IX+20H) ; Increment sequential record number XOR A ; Zero for success LD L,A ; Return code in L also RET ; Done -FRREOF POP DE ; Fix up stack - LD A,1 ; EOF return code +FRREOF LD A,1 ; EOF return code LD L,A ; Return code in L also RET ; Done (EOF) -FRRBFCB POP DE ; Fix up stack - LD A,9 ; Invalid FCB return code +FRRBFCB LD A,9 ; Invalid FCB return code LD L,A ; Return code in L also RET ; Done (Bad FCB) -FRRERR POP DE ; Fix up stack - LD A,0FFH ; All other errors are 0FFH +FRRERR LD A,0FFH ; All other errors are 0FFH LD L,A ; Return code in L aslo RET ; Done (error) diff --git a/SOFTCARD80.BIN#041000 b/SOFTCARD80.BIN#041000 index 1f3dd24297e279c17a9d8a14336dfa61aaf6acad..fd237fbcac762015999a4baf22b3111c8b07a712 100644 GIT binary patch delta 1171 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