Changeset 547 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs

Timestamp:

Apr 21, 2013, 3:47:11 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Hotkeys were incorrectly initialized to use 'C' as first hard drive letter.
• All CHS translate modes should again work (incorrectly decremented DX instead of DL, it might or might not have caused problems).

Location:

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs

Files:

• AtaGeometry.asm (modified) (2 diffs)
• BootVars.asm (modified) (1 diff)
• CreateDPT.asm (modified) (1 diff)
• RamVars.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/AtaGeometry.asm

@@ -176 +176 @@
 ;       BL:     Number of L-CHS heads (?...240)
 ;       CX:     Number of bits shifted (0...3)
-;       DL:     ADDRESSING_MODE_NORMAL or ADDRESSING_MODE_LARGE
+;       DX:     ADDRESSING_MODE_NORMAL or ADDRESSING_MODE_LARGE
 ;   Corrupts registers:
 ;       Nothing
@@ -218 +218 @@
 ; ConvertPCHfromAXBLtoEnhancedCHinAXBL:
 ;   Parameters:
-;       AX:     Number of P-CHS cylinders (1...8192)
+;       AX:     Number of P-CHS cylinders (1...8192, or up to 17475 if fell from above)
 ;       BL:     Number of P-CHS heads (1...16)
 ;   Returns:
 ;       AX:     Number of L-CHS cylinders (?...1024)
-;       BL:     Number of L-CHS heads (?...128)
+;       BL:     Number of L-CHS heads (?...128, or up to 240 if fell from above)
 ;       CX:     Number of bits shifted (0...3)
-;       DL:     TRANSLATEMODE_NORMAL or TRANSLATEMODE_LARGE
+;       DX:     TRANSLATEMODE_NORMAL or TRANSLATEMODE_LARGE
 ;   Corrupts registers:
 ;       Nothing
 ;--------------------------------------------------------------------
 ConvertPCHfromAXBLtoEnhancedCHinAXBL:
+    cwd                 ; Assume TRANSLATEMODE_NORMAL
     xor     cx, cx      ; No bits to shift initially
-    xor     dl, dl      ; Assume TRANSLATEMODE_NORMAL
 .ShiftIfMoreThan1024Cylinder:
     cmp     ax, MAX_LCHS_CYLINDERS

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/BootVars.asm

@@ -59 +59 @@
 ;--------------------------------------------------------------------
 BootVars_StoreDefaultDriveLettersToHotkeyVars:
-    mov     WORD [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wFddAndHddLetters], DEFAULT_FLOPPY_DRIVE_LETTER | (DEFAULT_HARD_DRIVE_LETTER<<8)
+    call    BootVars_GetLetterForFirstHardDriveToAX
+    mov     ah, DEFAULT_FLOPPY_DRIVE_LETTER
+    xchg    al, ah
+    mov     [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wFddAndHddLetters], ax
     ret
 
 %endif ; MODULE_HOTKEYS
+
+
+;--------------------------------------------------------------------
+; Returns letter for first hard disk. Usually it will be 'C' but it
+; can be higher if more than two floppy drives are found.
+;
+; BootVars_GetLetterForFirstHardDriveToAX
+;   Parameters:
+;       DS:     RAMVARS segment
+;   Returns:
+;       AX:     Upper case letter for first hard disk
+;   Corrupts registers:
+;       Nothing
+;--------------------------------------------------------------------
+BootVars_GetLetterForFirstHardDriveToAX:
+    call    FloppyDrive_GetCountToAX
+    add     al, DEFAULT_FLOPPY_DRIVE_LETTER     ; First Hard Drive letter comes after last floppy drive letter...
+    MAX_U   al, DEFAULT_HARD_DRIVE_LETTER       ; ...but it can never be 'A' or 'B'
+    ret

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/CreateDPT.asm

@@ -109 +109 @@
     ; Store P-CHS and flags
     call    AtaGeometry_GetPCHStoAXBLBHfromAtaInfoInESSI
-    dec     dx                      ; Set ZF if TRANSLATEMODE_LARGE, SF if TRANSLATEMODE_NORMAL
+    dec     dl                      ; Set ZF if TRANSLATEMODE_LARGE, SF if TRANSLATEMODE_NORMAL
     js      SHORT .NothingToChange
     jz      SHORT .LimitHeadsForLargeAddressingMode

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/RamVars.asm

@@ -197 +197 @@
     ret
 %endif
-
-
-%if 0                           ; unused...
-;--------------------------------------------------------------------
-; RamVars_IsDriveDetectionInProgress
-;   Parameters:
-;       DS:     RAMVARS segment
-;   Returns:
-;       ZF:     Set if drive detection is in progress (ROM initialization)
-;   Corrupts registers:
-;       None
-;--------------------------------------------------------------------
-RamVars_IsDriveDetectionInProgress:
-    cmp     WORD [RAMVARS.wSignature], RAMVARS_DRV_DETECT_SIGNATURE
-    ret
-%endif