Changeset 294 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.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/Boot/BootMenuPrint.asm (modified) (18 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm

@@ -7 +7 @@
 ;--------------------------------------------------------------------
 ; BootMenuPrint_RefreshItem
-; 
+;
 ;   Parameters:
 ;       DL:     Untranslated Floppy Drive number
@@ -19 +19 @@
     call    BootMenu_GetDriveToDXforMenuitemInCX_And_RamVars_GetSegmentToDS
     jnc     BootMenuEvent_EventCompleted            ; if no menu item selected, out we go
-        
+
     push    bp
     mov     bp, sp
@@ -29 +29 @@
     mov     si, g_szDriveNumBOOTNFO                 ; special g_szDriveNum that prints from BDA
     jmp     .go
-        
+
 .notOurs:
-    mov     si,g_szDriveNum                                 
+    mov     si,g_szDriveNum
     mov     bx,g_szForeignHD                        ; assume a hard disk for the moment
-        
-    test    dl,80h                                          
+
+    test    dl, dl
     js      .go
     mov     bl,((g_szFloppyDrv)-$$ & 0xff)          ; and revisit the earlier assumption...
-        
+
 .go:
     mov     ax, dx                                  ; preserve DL for the floppy drive letter addition
@@ -45 +45 @@
     add     al, 'A'                                 ; floppy drive letter (we always push this although
     push    ax                                      ; the hard disks don't ever use it, but it does no harm)
-        
+
     jmp     short BootMenuPrint_RefreshInformation.FormatRelay
 
@@ -88 +88 @@
     jmp     short BootMenuPrint_RefreshInformation.FormatRelay
 
-        
+
 ;--------------------------------------------------------------------
 ; BootMenuPrint_FloppyMenuitemInformation
@@ -101 +101 @@
 ALIGN JUMP_ALIGN
 BootMenuPrint_RefreshInformation:
-    CALL_MENU_LIBRARY ClearInformationArea      
-        
+    CALL_MENU_LIBRARY ClearInformationArea
+
     call    BootMenu_GetDriveToDXforMenuitemInCX_And_RamVars_GetSegmentToDS
     jnc     BootMenuEvent_EventCompleted                ; if no menu selection, abort
@@ -115 +115 @@
     inc     dl                                          ; are we a hard disk?
     dec     dl                                          ; inc/dec will set SF, without modifying CF or DL
-    js      .HardDiskRefreshInformation 
+    js      .HardDiskRefreshInformation
 
     jnc     .ours                                       ; Based on CF from FindDPT_ForDriveNumberInDL above
@@ -122 +122 @@
 .ours:
     call    AH8h_GetDriveParameters
-.around:                
+.around:
 
     mov     ax, g_szFddSizeOr                           ; .PrintXTFloppyType
-    test    bl, bl                                      ; Two possibilities? (FLOPPY_TYPE_525_OR_35_DD)     
+    test    bl, bl                                      ; Two possibilities? (FLOPPY_TYPE_525_OR_35_DD)
     jz      SHORT .PushAXAndOutput
 
@@ -131 +131 @@
     cmp     bl, FLOPPY_TYPE_35_ED
     ja      SHORT .PushAXAndOutput
-        
+
     ; Fall to .PrintKnownFloppyType
 
@@ -142 +142 @@
 ;   Corrupts registers:
 ;       AX, BX, SI, DI
-; 
+;
 ; Floppy Drive Types:
 ;
-;   0  Handled above 
+;   0  Handled above
 ;   1  FLOPPY_TYPE_525_DD          5 1/4   360K
 ;   2  FLOPPY_TYPE_525_HD          5 1/4   1.2M
@@ -153 +153 @@
 ;   6  FLOPPY_TYPE_35_ED           3 1/2   2.88M
 ;   >6 Unknwon, handled above
-; 
+;
 ;--------------------------------------------------------------------
 .PrintKnownFloppyType:
     mov     al, (g_szFddSize - $$) & 0xff
     push    ax
-        
+
     mov     al, (g_szFddThreeHalf - $$) & 0xff
     cmp     bl, FLOPPY_TYPE_525_HD
     ja      .ThreeHalf
     mov     al, (g_szFddFiveQuarter - $$) & 0xff
-.ThreeHalf:     
+.ThreeHalf:
     push    ax                                          ; "5 1/4" or "3 1/2"
 
@@ -170 +170 @@
     mul     byte [cs:bx+FloppyTypes.rgbCapacity - 1]    ; -1 since 0 is handled above and not in the table
 
-.PushAXAndOutput:                   
+.PushAXAndOutput:
     push    ax
 
@@ -189 +189 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-.HardDiskRefreshInformation:        
+.HardDiskRefreshInformation:
     jc      .HardDiskMenuitemInfoForForeignDrive        ; Based on CF from FindDPT_ForDriveNumberInDL (way) above
 
@@ -196 +196 @@
     call    BootMenuInfo_GetTotalSectorCount            ; Get Total LBA Size
     jmp     .ConvertSectorCountInBXDXAXtoSizeAndPushForFormat
-        
+
 .HardDiskMenuitemInfoForForeignDrive:
     call    DriveXlate_ToOrBack
@@ -208 +208 @@
     push    ax                      ; Size in magnitude
     push    cx                      ; Tenths
-    push    dx                      ; Magnitude character       
-                
+    push    dx                      ; Magnitude character
+
     test    di,di
     jz      short BootMenuPrint_FormatCSSIfromParamsInSSBP
@@ -225 +225 @@
 ;   Returns:
 ;       BP:     Popped from stack
-;       CF:     Set since menu event was handled successfully       
+;       CF:     Set since menu event was handled successfully
 ;   Corrupts registers:
 ;       AX, DI
@@ -232 +232 @@
 BootMenuPrint_FormatCSSIfromParamsInSSBP:
     CALL_DISPLAY_LIBRARY FormatNullTerminatedStringFromCSSI
-    stc             ; Successfull return from menu event
+    stc             ; Successful return from menu event
     pop     bp
     ret
-        
-        
+
+
 ;--------------------------------------------------------------------
 ; BootMenuPrint_ClearScreen
@@ -364 +364 @@
     push    cx          ; Key attribute for last space
     mov     si, g_szHotkey
-        
-BootMenuPrint_FormatCSSIfromParamsInSSBP_Relay: 
+
+BootMenuPrint_FormatCSSIfromParamsInSSBP_Relay:
     jmp     SHORT BootMenuPrint_FormatCSSIfromParamsInSSBP