Changeset 100 in xtideuniversalbios

Timestamp:

Jan 31, 2011, 11:43:26 AM (13 years ago)

Author:

aitotat

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• BootInfo.asm had initialization functions that were not yet inlined.

File:

• trunk/XTIDE_Universal_BIOS/Src/Boot/BootInfo.asm (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootInfo.asm

@@ -1 @@
-; File name     :   BootInfo.asm
 ; Project name  :   XTIDE Universal BIOS
 ; Description   :   Functions for generating and accessing drive
@@ -22 +21 @@
 ;       AX, BX, CX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootInfo_CreateForHardDisk:
     call    BootInfo_GetOffsetToBX      ; ES:BX now points to new BOOTNFO
-    call    BootInfo_StoreSectorCount
-    jmp     SHORT BootInfo_StoreDriveName
+    ; Fall to .StoreSectorCount
+
+;--------------------------------------------------------------------
+; .StoreSectorCount
+;   Parameters:
+;       ES:BX:  Ptr to BOOTNFO
+;       ES:SI:  Ptr to 512-byte ATA information read from the drive
+;       DS:DI:  Ptr to Disk Parameter Table
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, CX, DX
+;--------------------------------------------------------------------
+.StoreSectorCount:
+    push    bx
+    call    AtaID_GetTotalSectorCount       ; Get to BX:DX:AX
+    mov     cx, bx                          ; Now in CX:DX:AX
+    pop     bx
+    mov     [es:bx+BOOTNFO.twSectCnt], ax
+    mov     [es:bx+BOOTNFO.twSectCnt+2], dx
+    mov     [es:bx+BOOTNFO.twSectCnt+4], cx
+    ; Fall to .StoreDriveName
+
+;--------------------------------------------------------------------
+; .StoreDriveName
+;   Parameters:
+;       ES:BX:  Ptr to BOOTNFO
+;       ES:SI:  Ptr to 512-byte ATA information read from the drive
+;       DS:DI:  Ptr to Disk Parameter Table
+;   Returns:
+;       CF:     Cleared if variables stored succesfully
+;               Set if any error
+;   Corrupts registers:
+;       AX, CX
+;--------------------------------------------------------------------
+.StoreDriveName:
+    push    ds
+    push    si
+    push    di
+
+    push    es
+    pop     ds
+    add     si, BYTE ATA1.strModel      ; DS:SI now points drive name
+    lea     di, [bx+BOOTNFO.szDrvName]  ; ES:DI now points to name destination
+    mov     cx, LEN_BOOTNFO_DRV
+    call    Memory_CopyCXbytesFromDSSItoESDI
+    xor     ax, ax
+    stosb                               ; Terminate with NULL
+
+    pop     di
+    pop     si
+    pop     ds
+    clc
+    ret
+
+
+;--------------------------------------------------------------------
+; Finds BOOTNFO for drive and returns total sector count.
+;
+; BootInfo_GetTotalSectorCount
+;   Parameters:
+;       DL:     Drive number
+;       DS:     RAMVARS segment
+;   Returns:
+;       BX:DX:AX:   48-bit sector count
+;   Corrupts registers:
+;       Nothing
+;--------------------------------------------------------------------   
+ALIGN JUMP_ALIGN
+BootInfo_GetTotalSectorCount:
+    push    ds
+    call    BootInfo_GetOffsetToBX
+    LOAD_BDA_SEGMENT_TO ds, ax
+    mov     ax, [bx+BOOTNFO.twSectCnt]
+    mov     dx, [bx+BOOTNFO.twSectCnt+2]
+    mov     bx, [bx+BOOTNFO.twSectCnt+4]
+    pop     ds
+    ret
 
 
@@ -50 +124 @@
     xchg    bx, ax                      ; Copy result to BX
     ret
-
-
-;--------------------------------------------------------------------
-; Stores total sector count to BOOTNFO.
-;
-; BootInfo_StoreSectorCount
-;   Parameters:
-;       ES:BX:  Ptr to BOOTNFO
-;       ES:SI:  Ptr to 512-byte ATA information read from the drive
-;       DS:DI:  Ptr to Disk Parameter Table
-;   Returns:
-;       CF:     Cleared if variables stored succesfully
-;               Set if any error
-;   Corrupts registers:
-;       AX, CX, DX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BootInfo_StoreSectorCount:
-    push    bx
-    call    AtaID_GetTotalSectorCount       ; Get to BX:DX:AX
-    mov     cx, bx                          ; Now in CX:DX:AX
-    pop     bx
-    mov     [es:bx+BOOTNFO.twSectCnt], ax
-    mov     [es:bx+BOOTNFO.twSectCnt+2], dx
-    mov     [es:bx+BOOTNFO.twSectCnt+4], cx
-    clc
-    ret
-
-
-;--------------------------------------------------------------------
-; Stores drive name to BOOTNFO.
-;
-; BootInfo_StoreDriveName
-;   Parameters:
-;       ES:BX:  Ptr to BOOTNFO
-;       ES:SI:  Ptr to 512-byte ATA information read from the drive
-;       DS:DI:  Ptr to Disk Parameter Table
-;   Returns:
-;       CF:     Cleared if variables stored succesfully
-;               Set if any error
-;   Corrupts registers:
-;       AX, CX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BootInfo_StoreDriveName:
-    push    ds
-    push    si
-    push    di
-
-    ; DS:SI to ATA source string
-    push    es
-    pop     ds
-    add     si, BYTE ATA1.strModel
-
-    ; ES:DI to BOOTNFO destination string
-    lea     di, [bx+BOOTNFO.szDrvName]
-
-    ; Read string
-    mov     cx, LEN_BOOTNFO_DRV>>1
-    call    BootInfo_StoreAtaString
-    pop     di
-    pop     si
-    pop     ds
-    clc
-    ret
-
-;--------------------------------------------------------------------
-; Stores ATA string.
-; Byte ordering will be corrected and string will be STOP terminated.
-;
-; BootInfo_StoreAtaString
-;   Parameters:
-;       CX:     Maximum number of WORDs to copy (without STOP)
-;       DS:SI:  Ptr to ATA string
-;       ES:DI:  Ptr to destination string
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, CX, SI, DI
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BootInfo_StoreAtaString:
-    lodsw                           ; Load WORD from DS:SI to AX
-    xchg    al, ah                  ; Change byte order
-    call    BootInfo_StoreAtaChar
-    jc      SHORT .Return           ; Return if invalid character
-    mov     al, ah                  ; Write next char
-    call    BootInfo_StoreAtaChar
-    jc      SHORT .Return           ; Return if invalid character
-    loop    BootInfo_StoreAtaString ; Loop while words left
-.Return:
-    xor     ax, ax                  ; Terminate string with NULL
-    stosb
-    ret
-
-;--------------------------------------------------------------------
-; Stores ATA character.
-;
-; BootInfo_StoreAtaChar
-;   Parameters:
-;       AL:     Character to store
-;       ES:DI:  Ptr to destination character
-;   Returns:
-;       DI:     Incremented to next character
-;       CF:     Set if non writable ASCII character
-;   Corrupts registers:
-;       Nothing
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-BootInfo_StoreAtaChar:
-    cmp     al, 20h                 ; First allowed ASCII char?
-    jb      SHORT .SkipStoring      ;  If below, end string
-    cmp     al, 7Eh                 ; Last allowed ASCII char?
-    ja      SHORT .SkipStoring      ;  If above, end string
-    stosb                           ; Store character
-    clc                             ; Clear CF to continue with next char
-    ret
-.SkipStoring:
-    stc
-    ret
-
-
-;--------------------------------------------------------------------
-; Finds BOOTNFO for drive and return total sector count.
-;
-; BootInfo_GetTotalSectorCount
-;   Parameters:
-;       DL:     Drive number
-;       DS:     RAMVARS segment
-;   Returns:
-;       BX:DX:AX:   48-bit sector count
-;   Corrupts registers:
-;       Nothing
-;--------------------------------------------------------------------   
-ALIGN JUMP_ALIGN
-BootInfo_GetTotalSectorCount:
-    push    ds
-    call    BootInfo_GetOffsetToBX
-    LOAD_BDA_SEGMENT_TO ds, ax
-    mov     ax, [bx+BOOTNFO.twSectCnt]
-    mov     dx, [bx+BOOTNFO.twSectCnt+2]
-    mov     bx, [bx+BOOTNFO.twSectCnt+4]
-    pop     ds
-    ret