Changeset 594 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS

Timestamp:

Jul 4, 2018, 6:40:02 PM (6 years ago)

Author:

Tomi Tilli

Message:

Previosly committed flash fix for configurator was incomplete. Now fixed properly.
Added MODULE_MFM_COMPATIBILITY.

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/RamVars.inc (modified) (1 diff)
• Src/Handlers/Int13hMFMcompatibility.asm (added)
• Src/Initialization/DetectDrives.asm (modified) (2 diffs)
• Src/Initialization/Interrupts.asm (modified) (2 diffs)
• Src/Main.asm (modified) (1 diff)
• makefile (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Inc/RamVars.inc

@@ -69 +69 @@
     .rgbTopOfStack:                     ; 256 bytes of stack
     .fpInt13hEntryStack     resb    4
+%endif
+%ifdef MODULE_MFM_COMPATIBILITY
+    .fpMFMint13h            resb    4
 %endif
     .fpOldI13h              resb    4   ; Far pointer to old INT 13h handler

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -115 +115 @@
         test    al, al
         jnz     SHORT .ContinueInitialization   ; CMOS byte 12h is ready for Windows 95
-        call    CMOS_Verify10hTo2Dh
+        call    CMOS_Verify10hTo2Dh             ; Can we modify CMOS?
         jnz     SHORT .ClearBdaDriveCount       ; Unsupported BIOS, use plan B
     
@@ -123 +123 @@
         call    CMOS_WriteALtoIndexInDL
         call    CMOS_StoreNewChecksumFor10hto2Dh
-    %endif
+.ClearBdaDriveCount:
+    %endif  ; MODULE_WIN95_CMOS_HACK
 
     test    BYTE [cs:ROMVARS.wFlags], FLG_ROMVARS_IGNORE_MOTHERBOARD_DRIVES
     jz      SHORT .ContinueInitialization
-.ClearBdaDriveCount:
     mov     BYTE [es:BDA.bHDCount], 0   ; Set hard disk count to zero
 .ContinueInitialization:

trunk/XTIDE_Universal_BIOS/Src/Initialization/Interrupts.asm

@@ -59 +59 @@
 ;--------------------------------------------------------------------
 .InitializeInt13hAnd40h:
+%ifdef MODULE_MFM_COMPATIBILITY
+    mov     ax, [es:BIOS_DISK_INTERRUPT_13h*4+2]; Load old INT 13h segment
+    mov     [RAMVARS.fpMFMint13h+2], ax         ; Store old INT 13h segment
+    xchg    dx, ax
+    mov     ax, [es:BIOS_DISK_INTERRUPT_13h*4]  ; Load old INT 13h offset
+    mov     [RAMVARS.fpMFMint13h], ax           ; Store old INT 13h offset
+    
+    mov     [RAMVARS.fpOldI13h+2], cs
+    mov     WORD [RAMVARS.fpOldI13h], Int13hMFMcompatibilityHandler 
+%else
     mov     ax, [es:BIOS_DISK_INTERRUPT_13h*4+2]; Load old INT 13h segment
     mov     [RAMVARS.fpOldI13h+2], ax           ; Store old INT 13h segment
@@ -64 +74 @@
     mov     ax, [es:BIOS_DISK_INTERRUPT_13h*4]  ; Load old INT 13h offset
     mov     [RAMVARS.fpOldI13h], ax             ; Store old INT 13h offset
+%endif
 
     ; Only store INT 13h handler to 40h if 40h is not already installed.

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -280 +280 @@
 
     ; INT 13h Hard Disk BIOS functions
+%ifdef MODULE_MFM_COMPATIBILITY
+    %include "Int13hMFMcompatibility.asm"
+%endif
     %include "Int13h.asm"           ; For Int 13h, Disk functions
     %include "AH0h_HReset.asm"

trunk/XTIDE_Universal_BIOS/makefile

@@ -30 +30 @@
 # MODULE_POWER_MANAGEMENT     Power Management support                                             #
 # MODULE_WIN95_CMOS_HACK      Hack for Windows 95 compatibility                                    #
+# MODULE_MFM_COMPATIBILITY    Restores BDA drive count for MFM controllers that expect to be the   #
+#                             only hard drive controller on the system                             #
 #                                                                                                  #
 # Not modules but these affect the assembly:                                                       #
@@ -121 +123 @@
 
 DEFINES_ALL_FEATURES = MODULE_8BIT_IDE MODULE_8BIT_IDE_ADVANCED MODULE_ADVANCED_ATA MODULE_EBIOS MODULE_BOOT_MENU MODULE_HOTKEYS MODULE_IRQ MODULE_SERIAL MODULE_SERIAL_FLOPPY MODULE_STRINGS_COMPRESSED MODULE_POWER_MANAGEMENT MODULE_COMPATIBLE_TABLES
-DEFINES_ALL_FEATURES += ELIMINATE_CGA_SNOW RELOCATE_INT13H_STACK RESERVE_DIAGNOSTIC_CYLINDER MODULE_WIN95_CMOS_HACK
+DEFINES_ALL_FEATURES += ELIMINATE_CGA_SNOW RELOCATE_INT13H_STACK RESERVE_DIAGNOSTIC_CYLINDER MODULE_WIN95_CMOS_HACK MODULE_MFM_COMPATIBILITY