Changeset 294 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm

Timestamp:

Mar 4, 2012, 1:35:10 AM (12 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Commit 2/2 (BIOS):

• Fixed a bug in AH1h_HStatus.asm.
• Minor optimizations.
• Fixed spelling and did some cleaning.

File:

• trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm (modified) (6 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm

@@ -127 +127 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-FloppyDrive_GetCountToAX:       
+FloppyDrive_GetCountToAX:
 %ifdef MODULE_SERIAL_FLOPPY
     call    RamVars_UnpackFlopCntAndFirstToAL
     js      .UseBIOSorBDA               ; We didn't add in any drives, counts here are not valid
-        
-    adc     al,1                        ; adds in the drive count bit, and adds 1 for count vs. 0-index, 
+
+    adc     al,1                        ; adds in the drive count bit, and adds 1 for count vs. 0-index,
     jmp     .FinishCalc                 ; need to clear AH on the way out, and add in minimum drive numbers
 
-.UseBIOSorBDA:  
+.UseBIOSorBDA:
 %endif
     call    FloppyDrive_GetCountFromBIOS_or_BDA
 
-.FinishCalc:    
+.FinishCalc:
     mov     ah, [cs:ROMVARS.bMinFddCnt]
     MAX_U   al, ah
     cbw
-        
-    ret
-
-ALIGN JUMP_ALIGN        
+
+    ret
+
+ALIGN JUMP_ALIGN
 FloppyDrive_GetCountFromBIOS_or_BDA:
     push    es
@@ -152 +152 @@
 ;--------------------------------------------------------------------
 ; Reads Floppy Drive Count from BIOS.
-; Does not work on most XT systems. Call FloppyDrive_GetCountFromBDA
+; Does not work on most XT systems. Call .GetCountFromBDA
 ; if this function fails.
 ;
-; GetCountFromBIOS
+; .GetCountFromBIOS
 ;   Parameters:
 ;       Nothing
 ;   Returns:
 ;       AL:     Number of Floppy Drives
-;       CF:     Cleared if successfull
+;       CF:     Cleared if successful
 ;               Set if BIOS function not supported
 ;   Corrupts registers:
@@ -169 +169 @@
 .GetCountFromBIOS:
     push    di
-    push    es
     push    bx
     push    cx
@@ -182 +181 @@
     pop     cx
     pop     bx
-    pop     es
     pop     di
 %endif
@@ -188 +186 @@
 ;--------------------------------------------------------------------
 ; Reads Floppy Drive Count (0...4) from BIOS Data Area.
-; This function should be used only if FloppyDrive_GetCountFromBIOS fails.
-;
-; GetCountFromBDA
-;   Parameters:
-;       Nothing
-;   Returns:
-;       CL:     Number of Floppy Drives
-;   Corrupts registers:
-;       CH, ES
+; This function should be used only if .GetCountFromBIOS fails.
+;
+; .GetCountFromBDA
+;   Parameters:
+;       Nothing
+;   Returns:
+;       AL:     Number of Floppy Drives
+;   Corrupts registers:
+;       AH, ES
 ;--------------------------------------------------------------------
 %ifndef USE_AT
@@ -203 +201 @@
     LOAD_BDA_SEGMENT_TO es, ax
     mov     al, [es:BDA.wEquipment]         ; Load Equipment WORD low byte
-    mov     ah, al                          ; Copy it to CH
+    mov     ah, al                          ; Copy it to AH
     and     ax, 0C001h                      ; Leave bits 15..14 and 0
     eROL_IM ah, 2                           ; EW low byte bits 7..6 to 1..0
-    add     al, ah                          ; CL = Floppy Drive count
+    add     al, ah                          ; AL = Floppy Drive count
 %endif
 
     pop     es
     ret
-