Changeset 621 in xtideuniversalbios for trunk/Assembly_Library/Src/File

Timestamp:

Nov 21, 2021, 2:15:32 PM (3 years ago)

Author:

Krister Nordvall

Message:

Changes:

• Fixed three different bugs all causing the boot menu to show drives using IRQs even though the BIOS had been built without MODULE_IRQ.
• Fixed two bugs in XTIDECFG where loading a BIOS from file and then loading the old settings from EEPROM would
  • overwrite ROMVARS.wFlags in the loaded BIOS file (in RAM). The possibly resulting mismatch of module flags could make it impossible to change settings for modules included in the BIOS or allow changing settings for modules not included in the BIOS.
  • not copy the color theme over to the loaded BIOS.
• Also fixed two very minor bugs in XTIDECFG in BiosFile_LoadFileFromDSSItoRamBuffer and BiosFile_SaveRamBufferToFileInDSSI where the error handling in these routines would close whatever file handle that happened to match the error code returned by DOS in AX.
• Made significant changes to the new flash ROM programming routines to reduce the size. Also fixed a minor bug that would cause the second verification to be skipped and return success when programming a 64 KB block of data.
• Changed the custom BIOS build file names to the 8.3 format.
• Changed some help strings in XTIDECFG to clarify things.
• Other minor optimizations and fixes.

File:

• trunk/Assembly_Library/Src/File/FileIO.asm (modified) (6 diffs)

trunk/Assembly_Library/Src/File/FileIO.asm

@@ -66 +66 @@
 
 ;--------------------------------------------------------------------
-; FileIO_ReadDXCXbytesToDSSIusingHandleFromBX
-;   Parameters:
-;       BX:     File handle
-;       DX:CX:  Number of bytes to read
-;       DS:SI:  Ptr to destination buffer
-;   Returns:
-;       AX:     DOS error code if CF set
-;       CF:     Clear if successful
-;               Set if error
-;   Corrupts registers:
-;       AX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-FileIO_ReadDXCXbytesToDSSIusingHandleFromBX:
-    push    bp
-    mov     bp, FileIO_ReadCXbytesToDSSIusingHandleFromBX
-    call    SplitLargeReadOrWritesToSmallerBlocks
-    pop     bp
-    ret
-
-
-;--------------------------------------------------------------------
-; FileIO_WriteDXCXbytesFromDSSIusingHandleFromBX
-;   Parameters:
-;       BX:     File handle
-;       DX:CX:  Number of bytes to write
-;       DS:SI:  Ptr to source buffer
-;   Returns:
-;       AX:     DOS error code if CF set
-;       CF:     Clear if successful
-;               Set if error
-;   Corrupts registers:
-;       AX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-FileIO_WriteDXCXbytesFromDSSIusingHandleFromBX:
-    push    bp
-    mov     bp, FileIO_WriteCXbytesFromDSSIusingHandleFromBX
-    call    SplitLargeReadOrWritesToSmallerBlocks
-    pop     bp
-    ret
-
-
-;--------------------------------------------------------------------
 ; File position is updated so next read will start where
 ; previous read stopped.
@@ -158 +114 @@
 
 ;--------------------------------------------------------------------
-; SplitLargeReadOrWritesToSmallerBlocks
-;   Parameters:
+; FileIO_ReadDXCXbytesToDSSIusingHandleFromBX
+;   Parameters:
+;       BX:     File handle
+;       DX:CX:  Number of bytes to read
+;       DS:SI:  Ptr to destination buffer
+;   Returns:
+;       AX:     DOS error code if CF set
+;       CF:     Clear if successful
+;               Set if error
+;   Corrupts registers:
+;       AX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+FileIO_ReadDXCXbytesToDSSIusingHandleFromBX:
+    push    bp
+    mov     bp, FileIO_ReadCXbytesToDSSIusingHandleFromBX
+    jmp     SHORT SplitLargeReadOrWriteToSmallerBlocks
+
+
+;--------------------------------------------------------------------
+; FileIO_WriteDXCXbytesFromDSSIusingHandleFromBX
+;   Parameters:
+;       BX:     File handle
+;       DX:CX:  Number of bytes to write
+;       DS:SI:  Ptr to source buffer
+;   Returns:
+;       AX:     DOS error code if CF set
+;       CF:     Clear if successful
+;               Set if error
+;   Corrupts registers:
+;       AX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+FileIO_WriteDXCXbytesFromDSSIusingHandleFromBX:
+    push    bp
+    mov     bp, FileIO_WriteCXbytesFromDSSIusingHandleFromBX
+    ; Fall to SplitLargeReadOrWriteToSmallerBlocks
+
+;--------------------------------------------------------------------
+; SplitLargeReadOrWriteToSmallerBlocks
+;   Parameters:
+;       [SP]:   Saved BP (restored on return)
 ;       BX:     File handle
 ;       BP:     Ptr to transfer function
@@ -171 +167 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-SplitLargeReadOrWritesToSmallerBlocks:
+SplitLargeReadOrWriteToSmallerBlocks:
     push    ds
     push    si
@@ -199 +194 @@
     call    NormalizeDSSI
     call    bp
+    SKIP1B  dl
+.ErrorOccurredDuringTransfer:
+    pop     cx                      ; Remove bytes for last transfer
 .ReturnErrorCodeInAX:
     pop     cx
@@ -204 +202 @@
     pop     si
     pop     ds
-    ret
-.ErrorOccurredDuringTransfer:
-    pop     cx                      ; Remove bytes for last transfer
-    jmp     SHORT .ReturnErrorCodeInAX
+    pop     bp                      ; Restore BP saved to stack by "caller"
+    ret
+
 
 ;--------------------------------------------------------------------
@@ -279 +276 @@
 FileIO_CloseUsingHandleFromBX:
     mov     ah, CLOSE_FILE
-    SKIP2B  f   ; cmp ax, <next instruction>
+    SKIP2B  f
     ; Fall to FileIO_SeekFromOriginInALtoOffsetInDXAXusingHandleFromBX
-
 
 ;--------------------------------------------------------------------