Changeset 262 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization

Timestamp:

Feb 24, 2012, 10:28:31 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

More optimizations. Merged RamVars_IsFunction/DriveHandledByThisBIOS in with FindDPT_ForDriveNumber, since they are often used together, making a returned NULL DI pointer indicate a foreign drive in many places. Revamped the iteration done in the handlers for int13/0dh and int13h/0h. Added serial specific print string during drive detection.

Location:

trunk/XTIDE_Universal_BIOS/Src/Initialization

Files:

• DetectDrives.asm (modified) (5 diffs)
• DetectPrint.asm (modified) (4 diffs)
• Initialize.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -37 +37 @@
 
 %ifdef MODULE_SERIAL
-    jcxz    .done                           ; Set to zero on .ideVarsSerialAuto iteration (if any)
+    jcxz    .AddHardDisks                   ; Set to zero on .ideVarsSerialAuto iteration (if any)
 %endif
 
@@ -48 +48 @@
 ;
     call    FindDPT_ToDSDIforSerialDevice
-    jc      .done
+    jnc     .AddHardDisks
 
     mov     bp, ROMVARS.ideVarsSerialAuto   ; Point to our special IDEVARS structure, just for serial scans
@@ -58 +58 @@
 %endif
 
-.done:  
-%ifdef MODULE_SERIAL_FLOPPY
+.AddHardDisks:
 ;----------------------------------------------------------------------
 ;
-; Add in any emulated serial floppy drives.
-;
-    mov     al, [RAMVARS.xlateVars+XLATEVARS.bFlopCreateCnt]
-    dec     al
-    mov     cl, al
-    js      .NoFloppies                     ; if no drives are present, we store 0ffh
+; Add in hard disks to BDA, finalize our Count and First variables
+;
+    mov     cx, [RAMVARS.wDrvCntAndFlopCnt]     ; Our count of hard disks
+    test    cl, cl
+    jz      .AddFloppies                ; If none, nothing more to do
+
+    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        
+;----------------------------------------------------------------------
+;
+; Add in any emulated serial floppy drives, finalize our packed Count and First variables
+;
+    dec     ch
+    mov     al, ch
+    js      .NoFloppies                     ; if no drives are present, we store 0ffh       
 
     call    FloppyDrive_GetCountFromBIOS_or_BDA
@@ -73 +88 @@
     push    ax
 
-    add     al, cl                          ; Add our drives to existing drive count
+    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
@@ -92 +107 @@
     pop     ax
 
-    shr     cl, 1                           ; number of drives, 1 or 2 only, to CF flag (clear=1, set=2)
+    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:    
     mov     [RAMVARS.xlateVars+XLATEVARS.bFlopCntAndFirst], al
-%endif
+;%endif
         
     ret

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm

@@ -43 +43 @@
     mov     dx, [cs:bp+IDEVARS.bDevice-1]   ; for Serial: AL=port address>>2, AH=baud rate
                                             ;             DL=COM number character, DH=.bDevice
-
+        
+    mov     si, g_szDetectOuter             ; Load SI with default wrapper string "IDE %s at %s: "
+        
     push    bp                              ; setup stack for call to
     mov     bp, sp                          ; BootMenuPrint_FormatCSSIfromParamsInSSBP
@@ -72 +74 @@
 
     test    dl, dl                          ; Check if serial port "Auto"
-    jz      .pushAndPrint                   ; CX = string to print, AX and DX won't be used
+    jz      .pushAndPrintSerial             ; CX = string to print, AX and DX won't be used
 
     mov     cl, (g_szDetectCOMLarge-$$) & 0xff  ; Setup secondary print string for "COMn/xx.yK"
@@ -88 +90 @@
 
     cmp     ax,si                           ; < 10: "2400", "9600", etc.; >= 10: "19.2K", "38.4K", etc.
-    jae     .pushAndPrint
+    jae     .pushAndPrintSerial
 
     mov     cl, (g_szDetectCOMSmall-$$) & 0xff  ; Setup secondary print string for "COMn/XXy00"
+
+.pushAndPrintSerial:    
+    mov     si, g_szDetectOuterSerial       ; Finally load SI with wrapper string "Serial %s on %s: "       
 
 .pushAndPrint:
@@ -96 +101 @@
     push    ax                              ; Push high order digits, or port address, or N/A
     push    dx                              ; Push low order digit, or N/A
-
-    mov     si, g_szDetectOuter             ; Finally load SI with wrapper string "IDE %s at %s: "
 
     jmp     short DetectPrint_BootMenuPrint_FormatCSSIfromParamsInSSBP_Relay

trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm

@@ -72 +72 @@
 .StoreDptPointersToIntVectors:
     mov     dl, 80h
-    call    RamVars_IsDriveHandledByThisBIOS_And_FindDPT_ForDriveNumber   ; DPT to DS:DI
+    call    FindDPT_ForDriveNumberInDL   ; DPT to DS:DI
     jc      SHORT .FindForDrive81h  ; Store nothing if not our drive
     mov     [es:HD0_DPT_POINTER_41h*4], di
@@ -78 +78 @@
 .FindForDrive81h:
     inc     dx
-    call    RamVars_IsDriveHandledByThisBIOS_And_FindDPT_ForDriveNumber
+    call    FindDPT_ForDriveNumberInDL
     jc      SHORT .ResetDetectedDrives
     mov     [es:HD1_DPT_POINTER_46h*4], di