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

Timestamp:

Jan 31, 2011, 11:27:17 AM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• Even more initialization code inlining.

File:

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

trunk/XTIDE_Universal_BIOS/Src/Initialization/FloppyDrive.asm

@@ -18 +18 @@
 ;       BX, CX, DI
 ;--------------------------------------------------------------------
-;ALIGN JUMP_ALIGN
 FloppyDrive_IsInt40hInstalled:
     cmp     WORD [es:INTV_FLOPPY_FUNC*4+2], 0C000h  ; Any ROM segment?
     jb      SHORT .Int40hHandlerIsNotInstalled
+%ifdef USE_AT
     call    .VerifyInt40hHandlerSinceSomeBiosesSimplyReturnFromInt40h
+%else
+    clc     ; INT 40h installed. No need to verify on XT systems.
+%endif
 .Int40hHandlerIsNotInstalled:
     cmc
@@ -37 +40 @@
 ;       BX, CX, DI
 ;--------------------------------------------------------------------
-;ALIGN JUMP_ALIGN
+%ifdef USE_AT
 .VerifyInt40hHandlerSinceSomeBiosesSimplyReturnFromInt40h:
     push    es
@@ -45 +48 @@
     call    .LoadInt40hVerifyParameters
     int     INTV_DISK_FUNC
-    jc      SHORT .AH08hNotSupported    ; AH=08h not supported on XTs but that doesn't
-    push    es                          ; matter since INT 40h does not need to be verified
-    push    di                          ; on XTs
+    jc      SHORT .Int40hIsInstalled    ; Maybe there are not any floppy drives at all
+    push    es
+    push    di
 
     call    .LoadInt40hVerifyParameters
@@ -58 +61 @@
     mov     dx, es
     cmp     cx, dx                      ; Difference in segments?
-    jne     SHORT .Int40hNotInstalled
-.AH08hNotSupported:
-    clc
-    jmp     SHORT .Int40hIsInstalled
+    je      SHORT .Int40hIsInstalled
 .Int40hNotInstalled:
     stc
@@ -81 +81 @@
 ;       DH
 ;--------------------------------------------------------------------
-;ALIGN JUMP_ALIGN
 .LoadInt40hVerifyParameters:
     mov     ah, 08h             ; Get Drive Parameters
@@ -88 +87 @@
     mov     es, dx              ; ES:DI = 0000:0000h to guard against BIOS bugs
     ret
+%endif
 
 
@@ -133 +133 @@
 FloppyDrive_GetCount:
     push    es
+%ifdef USE_AT
     call    FloppyDrive_GetCountFromBIOS
-    jnc     SHORT .CompareToUserMinimum
+%else
     call    FloppyDrive_GetCountFromBDA
-ALIGN JUMP_ALIGN
-.CompareToUserMinimum:
+%endif
     MAX_U   cl, [cs:ROMVARS.bMinFddCnt]
     xor     ch, ch
@@ -159 +159 @@
 ;       CH, ES
 ;--------------------------------------------------------------------
+%ifdef USE_AT
 ALIGN JUMP_ALIGN
 FloppyDrive_GetCountFromBIOS:
@@ -176 +177 @@
     pop     di
     ret
+%endif
 
 
@@ -190 +192 @@
 ;       CH, ES
 ;--------------------------------------------------------------------
+%ifndef USE_AT
 ALIGN JUMP_ALIGN
 FloppyDrive_GetCountFromBDA:
@@ -199 +202 @@
     add     cl, ch                          ; CL = Floppy Drive count
     ret
+%endif