Changeset 255 in xtideuniversalbios

Timestamp:

Feb 18, 2012, 11:21:30 PM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Bug fix in BootMenuPrint, introduced in r241, where floppy disk information was not being properly displayed.

File:

• trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm

@@ -115 +115 @@
     call    FloppyDrive_GetType                         ; Get Floppy Drive type to BX
 
-    mov     cx, g_szFddSizeOr                           ; .PrintXTFloppyType
+    mov     ax, g_szFddSizeOr                           ; .PrintXTFloppyType
     test    bx, bx                                      ; Two possibilities? (FLOPPY_TYPE_525_OR_35_DD)     
-    jz      SHORT BootMenuPrint_HardDiskRefreshInformation.output
-
-    mov     cl, (g_szFddUnknown - $$) & 0xff            ; .PrintUnknownFloppyType
+    jz      SHORT .PushAXAndOutput
+
+    mov     al, (g_szFddUnknown - $$) & 0xff            ; .PrintUnknownFloppyType
     cmp     bl, FLOPPY_TYPE_35_ED
-    ja      SHORT BootMenuPrint_HardDiskRefreshInformation.output
+    ja      SHORT .PushAXAndOutput
         
     ; Fall to .PrintKnownFloppyType
@@ -147 +147 @@
 ;--------------------------------------------------------------------
 .PrintKnownFloppyType:
-    mov     cl, (g_szFddSize - $$) & 0xff
-    push    cx
-        
-    mov     cl, (g_szFddThreeHalf - $$) & 0xff
+    mov     al, (g_szFddSize - $$) & 0xff
+    push    ax
+        
+    mov     al, (g_szFddThreeHalf - $$) & 0xff
     cmp     bl, FLOPPY_TYPE_525_HD
     ja      .ThreeHalf
-    mov     cl, (g_szFddFiveQuarter - $$) & 0xff
+    mov     al, (g_szFddFiveQuarter - $$) & 0xff
 .ThreeHalf:     
-    push    cx                                          ; "5 1/4" or "3 1/2"
+    push    ax                                          ; "5 1/4" or "3 1/2"
 
     mov     al,FloppyTypes.rgbCapacityMultiplier
     mul     byte [cs:bx+FloppyTypes.rgbCapacity - 1]    ; -1 since 0 is handled above and not in the table
+
+.PushAXAndOutput:                   
     push    ax