Changeset 621 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device

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.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device

Files:

• Device.asm (modified) (9 diffs)
• Serial/SerialCommand.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Device/Device.asm

@@ -52 +52 @@
     jne     IdeDPT_Finalize
     jmp     SerialDPT_Finalize
-%else
+%else ; ~USE_386
     je      SHORT .FinalizeDptForSerialPortDevice
     jmp     IdeDPT_Finalize
@@ -100 +100 @@
 ;       AL, BX, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
+%ifndef NO_ATAID_CORRECTION
 Device_IdentifyToBufferInESSIwithDriveSelectByteInBH:
-%ifndef NO_ATAID_CORRECTION
     cmp     cx, XUB_INT13h_SIGNATURE
     je      SHORT .DoNotFixAtaInformation
@@ -108 +108 @@
     ePUSH_T cx, AtaID_PopESSIandFixIllegalValuesFromESSI    ; Here we modify ATA information if necessary
 .DoNotFixAtaInformation:
-%endif
 
 %ifdef MODULE_SERIAL    ; IDE + Serial
@@ -115 +114 @@
     jne     IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
     jmp     SerialCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
-%else
+%else ; ~USE_386
     je      SHORT .IdentifyDriveFromSerialPort
     jmp     IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
@@ -126 +125 @@
 %endif
 
+%else ; NO_ATAID_CORRECTION
+%ifdef MODULE_SERIAL    ; IDE + Serial
+    cmp     BYTE [cs:bp+IDEVARS.bDevice], DEVICE_SERIAL_PORT
+%ifdef USE_386
+    jne     IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
+    jmp     SerialCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
+%else ; ~USE_386
+    je      SHORT .IdentifyDriveFromSerialPort
+    jmp     IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
+.IdentifyDriveFromSerialPort:
+    jmp     SerialCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
+%endif
+
+%else                   ; IDE
+    Device_IdentifyToBufferInESSIwithDriveSelectByteInBH    EQU     IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH
+%endif
+%endif ; NO_ATAID_CORRECTION
+
 
 ;--------------------------------------------------------------------
@@ -149 +166 @@
     jz      IdeCommand_OutputWithParameters
     jmp     SerialCommand_OutputWithParameters
-%else
+%else ; ~USE_386
     jnz     SHORT .OutputCommandToSerialPort
     jmp     IdeCommand_OutputWithParameters
@@ -182 +199 @@
 ;   jz      IdeCommand_ReadLBAlowRegisterToAL
 ;   jmp     SerialCommand_ReadLBAlowRegisterToAL
-;%else
+;%else ; ~USE_386
 ;   jnz     SHORT .ReadFromSerialPort
 ;   jmp     IdeCommand_ReadLBAlowRegisterToAL
@@ -214 +231 @@
     jnz     SHORT ReturnSuccessForSerialPort
     jmp     IdeCommand_SelectDrive
-%else
+%else ; USE_386
     jz      IdeCommand_SelectDrive
     ; Fall to ReturnSuccessForSerialPort
@@ -225 +242 @@
 
 %ifdef MODULE_SERIAL
-ALIGN JUMP_ALIGN
 ReturnSuccessForSerialPort:
     xor     ax, ax

trunk/XTIDE_Universal_BIOS/Src/Device/Serial/SerialCommand.asm

@@ -154 +154 @@
 
     push    si
-    call    FindDPT_ToDSDIforSerialDevice
+    call    FindDPT_ToDSDIforSerialDevice   ; Preserves AX
     pop     si
 %ifdef MODULE_SERIAL_FLOPPY
@@ -162 +162 @@
 ; So, if there was a previously found floppy disk, DI will point to that DPT and we use that value for the slave.
 ;
-    cmp     BYTE [RAMVARS.xlateVars+XLATEVARS.bFlopCntAndFirst], 0
+    cmp     [RAMVARS.xlateVars+XLATEVARS.bFlopCntAndFirst], al  ; Zero?
     je      SHORT .notfounddpt
 .founddpt: