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

Timestamp:

Mar 4, 2012, 1:35:10 AM (13 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/DetectDrives.asm (modified) (7 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -26 +26 @@
     mov     cx, g_szDetectMaster
     mov     bh, MASK_DRVNHEAD_SET                               ; Select Master drive
-    call    StartDetectionWithDriveSelectByteInBHandStringInAX  ; Detect and create DPT + BOOTNFO
+    call    StartDetectionWithDriveSelectByteInBHandStringInCX  ; Detect and create DPT + BOOTNFO
 
     mov     cx, g_szDetectSlave
     mov     bh, MASK_DRVNHEAD_SET | FLG_DRVNHEAD_DRV
-    call    StartDetectionWithDriveSelectByteInBHandStringInAX
+    call    StartDetectionWithDriveSelectByteInBHandStringInCX
 
     pop     cx
@@ -72 +72 @@
     mov     al, [es:BDA.bHDCount]
     add     cl, al                      ; Add our drives to the system count
-    mov     [es:BDA.bHDCount], cl       
-    or      al, 80h                     ; Or in hard disk flag      
-    mov     [RAMVARS.bFirstDrv], al     ; Store first drive number      
-
-.AddFloppies:       
-%ifdef MODULE_SERIAL_FLOPPY     
+    mov     [es:BDA.bHDCount], cl
+    or      al, 80h                     ; Or in hard disk flag
+    mov     [RAMVARS.bFirstDrv], al     ; Store first drive number
+
+.AddFloppies:
+%ifdef MODULE_SERIAL_FLOPPY
 ;----------------------------------------------------------------------
 ;
@@ -84 +84 @@
     dec     ch
     mov     al, ch
-    js      .NoFloppies                     ; if no drives are present, we store 0ffh       
+    js      .NoFloppies                     ; if no drives are present, we store 0ffh
 
     call    FloppyDrive_GetCountFromBIOS_or_BDA
@@ -92 +92 @@
     add     al, ch                          ; Add our drives to existing drive count
     cmp     al, 3                           ; For BDA, max out at 4 drives (ours is zero based)
-    jl      .MaxBDAFloppiesExceeded
-    mov     al, 3                           
+    jb      .MaxBDAFloppiesExceeded
+    mov     al, 3
 .MaxBDAFloppiesExceeded:
     eROR_IM al, 2                           ; move to bits 6-7
     inc     ax                              ; low order bit, indicating floppy drive exists
 
-    mov     ah, [es:BDA.wEquipment]         ; Load Equipment WORD low byte  
+    mov     ah, [es:BDA.wEquipment]         ; Load Equipment WORD low byte
     and     ah, 03eh                        ; Mask off drive number and drives present bit
     or      al, ah                          ; Or in new values
@@ -111 +111 @@
     shr     ch, 1                           ; number of drives, 1 or 2 only, to CF flag (clear=1, set=2)
     rcl     al, 1                           ; starting drive number in upper 7 bits, number of drives in low bit
-.NoFloppies:    
+.NoFloppies:
     mov     [RAMVARS.xlateVars+XLATEVARS.bFlopCntAndFirst], al
 %endif
-        
+
     ret
 
-%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS        
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
     %if FLG_ROMVARS_SERIAL_SCANDETECT != 8
         %error "DetectDrives is currently coded to assume that FLG_ROMVARS_SERIAL_SCANDETECT is the same bit as the ALT key code in the BDA.  Changes in the code will be needed if these values are no longer the same."
@@ -125 +125 @@
 
 ;--------------------------------------------------------------------
-; StartDetectionWithDriveSelectByteInBHandStringInAX
+; StartDetectionWithDriveSelectByteInBHandStringInCX
 ;   Parameters:
 ;       BH:     Drive Select byte for Drive and Head Register
@@ -137 +137 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-StartDetectionWithDriveSelectByteInBHandStringInAX:
-    call    DetectPrint_StartDetectWithMasterOrSlaveStringInAXandIdeVarsInCSBP
+StartDetectionWithDriveSelectByteInBHandStringInCX:
+    call    DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
     ; Fall to .ReadAtaInfoFromHardDisk