Changeset 254 in xtideuniversalbios for trunk

Timestamp:

Feb 18, 2012, 2:51:54 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Changed BOOTNFO to BOOTMENUINFO and moved it to BootMenu.inc.

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/BootMenu.inc (modified) (2 diffs)
• Inc/BootVars.inc (modified) (1 diff)
• Src/Boot/BootMenuInfo.asm (moved) (moved from trunk/XTIDE_Universal_BIOS/Src/Boot/BootInfo.asm ) (5 diffs)
• Src/Boot/BootMenuPrint.asm (modified) (2 diffs)
• Src/Initialization/DetectDrives.asm (modified) (1 diff)
• Src/Initialization/DetectPrint.asm (modified) (3 diffs)
• Src/Main.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Inc/BootMenu.inc

@@ -1 +1 @@
 ; Project name  :   XTIDE Universal BIOS
-; Description   :   Equates used in Boot Menu.
+; Description   :   Equates and structs used in Boot Menu.
 %ifndef BOOTMENU_INC
 %define BOOTMENU_INC
@@ -17 +17 @@
 
 
+; Boot Menu Information Table. These are generated for all XTIDE Universal
+; BIOS drives. Available only until boot is successfull.
+MAX_HARD_DISK_NAME_LENGTH               EQU     26      ; Bytes reserved for drive name
+
+struc BOOTMENUINFO
+    .szDrvName      resb    MAX_HARD_DISK_NAME_LENGTH
+                    resb    2       ; Zero word (ensures string terminates)
+                    resb    8       ; padding to make BOOTMENUINFO size an even multiple of DPT size
+endstruc
+
+DPT_BOOTMENUINFO_SIZE_MULTIPLIER  equ   BOOTMENUINFO_size / LARGEST_DPT_SIZE
+
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS                
+
+%if BOOTMENUINFO_size % LARGEST_DPT_SIZE <> 0
+%error "BOOTMENUINFO's size must be an even multiple of DPT's size.  Add or remove padding at the bottom of BOOTMENUINFO to bring the two sizes into alignment.  As BOOTMENUINFO is only used at boot time, with plenty of memory to consume, it is OK to waste some space here."
+%endif
+
+%if BOOTMENUINFO.szDrvName <> 0
+%error "BOOTMENUINFO.szDrvName is assumed to be the first member of struc BOOTMENUINFO, in BootMenuPrint_RefreshItem"
+%endif
+
+%endif
+
+
 %endif ; BOOTMENU_INC

trunk/XTIDE_Universal_BIOS/Inc/BootVars.inc

@@ -8 +8 @@
 BOOT_READ_RETRY_TIMES       EQU     3
 
-
-; Boot Menu Information Table. These are generated for all XTIDE Universal
-; BIOS drives. Available only until boot is successfull.
-LEN_BOOTNFO_DRV     EQU     26      ; Bytes reserved for drive name
-struc BOOTNFO
-    .szDrvName      resb    LEN_BOOTNFO_DRV     ; Drive name
-                    resb    2       ; Zero word (ensures string terminates)
-                    resb    8       ; padding to make BOOTNFO size an even multiple of DPT size
-endstruc
-
-DPT_BOOTNFO_SIZE_MULTIPLIER  equ    BOOTNFO_size / LARGEST_DPT_SIZE
-
-%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS                
-
-%if BOOTNFO_size % LARGEST_DPT_SIZE <> 0
-%error "BOOTNFO's size must be an even multiple of DPT's size.  Add or remove padding at the bottom of BOOTNFO to bring the two sizes into alignment.  As BOOTNFO is only used at boot time, with plenty of memory to consume, it is OK to waste some space here."
-%endif
-
-%if BOOTNFO.szDrvName <> 0
-%error "BOOTNFO.szDrvName is assumed to be the first member of struc BOOTNFO, in BootMenuPrint_RefreshItem"
-%endif
-
-%endif
 
 

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuInfo.asm

@@ -7 +7 @@
 
 ;--------------------------------------------------------------------
-; Creates new BOOTNFO struct for detected hard disk.
+; Creates new BOOTMENUINFO struct for detected hard disk.
 ;
-; BootInfo_CreateForHardDisk
+; BootMenuInfo_CreateForHardDisk
 ;   Parameters:
 ;       DL:     Drive number
@@ -15 +15 @@
 ;       ES:SI:  Ptr to 512-byte ATA information read from the drive
 ;   Returns:
-;       ES:BX:  Ptr to BOOTNFO (if successful)
+;       ES:BX:  Ptr to BOOTMENUINFO (if successful)
 ;   Corrupts registers:
-;       AX, BX, CX, DX, DI, SI
+;       AX, BX, CX, DX, DI
 ;--------------------------------------------------------------------
-BootInfo_CreateForHardDisk:
-    call    BootInfo_ConvertDPTtoBX     ; ES:BX now points to new BOOTNFO
-    push    bx                          ; Preserve for return
+BootMenuInfo_CreateForHardDisk:
+    call    BootMenuInfo_ConvertDPTtoBX         ; ES:BX now points to new BOOTMENUINFO
+    push    bx                                  ; Preserve for return
 
-    mov     di, bx                      ; Starting pointer at beginning of structure
+    mov     di, bx                              ; Starting pointer at beginning of structure
 
-;
-; Store Drive Name
-;       
-    push    ds                          ; Preserve RAMVARS
-    push    si                          ; Preserve SI for call to GetTotalSectorCount...
+    ; Store Drive Name
+    push    ds                                  ; Preserve RAMVARS
+    push    si
 
-    push    es                          ; ES copied to DS
+    push    es                                  ; ES copied to DS
     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 / 2     ; Max number of WORDs allowed
+    add     si, BYTE ATA1.strModel              ; DS:SI now points drive name
+    lea     di, [bx+BOOTMENUINFO.szDrvName]     ; ES:DI now points to name destination
+    mov     cx, MAX_HARD_DISK_NAME_LENGTH / 2   ; Max number of WORDs allowed
 .CopyNextWord:
     lodsw
-    xchg    al, ah                      ; Change endianness
+    xchg    al, ah                              ; Change endianness
     stosw
     loop    .CopyNextWord
-    xor     ax, ax                      ; Zero AX and clear CF
-    stosw                               ; Terminate with NULL
+    xor     ax, ax                              ; Zero AX and clear CF
+    stosw                                       ; Terminate with NULL
 
     pop     si
@@ -53 +51 @@
 
 ;--------------------------------------------------------------------
-; BootInfo_GetTotalSectorCount
+; BootMenuInfo_GetTotalSectorCount
 ;   Parameters:
 ;       DS:DI:      DPT Pointer
@@ -62 +60 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-BootInfo_GetTotalSectorCount:
+BootMenuInfo_GetTotalSectorCount:
     test    BYTE [di+DPT.bFlagsLow], FLG_DRVNHEAD_LBA
     jnz     SHORT .ReturnFullCapacity
@@ -71 +69 @@
 
 ;--------------------------------------------------------------------
-; Returns offset to BOOTNFO based on DPT pointer.
+; Returns offset to BOOTMENUINFO based on DPT pointer.
 ;
-; BootInfo_ConvertDPTtoBX
+; BootMenuInfo_ConvertDPTtoBX
 ;   Parameters:
 ;       DS:DI:  DPT Pointer
 ;   Returns:
-;       BX:     Offset to BOOTNFO struct
+;       BX:     Offset to BOOTMENUINFO struct
 ;   Corrupts registers:
 ;       AX
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-BootInfo_ConvertDPTtoBX:
+BootMenuInfo_ConvertDPTtoBX:
     mov     ax, di
-    sub     ax, RAMVARS_size                ; subtract off base of DPTs
-    mov     bl, DPT_BOOTNFO_SIZE_MULTIPLIER ; BOOTNFO's are a whole number multiple of DPT size
+    sub     ax, RAMVARS_size                        ; subtract off base of DPTs
+    mov     bl, DPT_BOOTMENUINFO_SIZE_MULTIPLIER    ; BOOTMENUINFO's are a whole number multiple of DPT size
     mul     bl                              
-    add     ax, BOOTVARS.rgBootNfo          ; add base of BOOTNFO
+    add     ax, BOOTVARS.rgBootNfo                  ; add base of BOOTMENUINFO
     xchg    ax, bx
     ret         

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm

@@ -27 +27 @@
 
     call    FindDPT_ForDriveNumber                  ; if it is one of ours, print the string in bootnfo
-    call    BootInfo_ConvertDPTtoBX
+    call    BootMenuInfo_ConvertDPTtoBX
     mov     si, g_szDriveNumBOOTNFO                 ; special g_szDriveNum that prints from BDA
     jmp     .go
@@ -197 +197 @@
 
     ; Get and push total LBA size
-    call    BootInfo_GetTotalSectorCount
+    call    BootMenuInfo_GetTotalSectorCount
     call    ConvertSectorCountInBXDXAXtoSizeAndPushForFormat        
     jmp     BootMenuPrintCfg_ForOurDrive

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -143 +143 @@
     call    CreateDPT_FromAtaInformation
     jc      SHORT DetectDrives_DriveNotFound
-    call    BootInfo_CreateForHardDisk
+    call    BootMenuInfo_CreateForHardDisk
     jmp     short DetectPrint_DriveNameFromBootnfoInESBX
 

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm

@@ -105 +105 @@
 ; DetectPrint_DriveNameFromBootnfoInESBX
 ;   Parameters:
-;       ES:BX:  Ptr to BOOTNFO (if drive found)
+;       ES:BX:  Ptr to BOOTMENUINFO (if drive found)
 ;   Returns:
 ;       Nothing
@@ -115 +115 @@
     push    bx
 
-    lea     si, [bx+BOOTNFO.szDrvName]
+    lea     si, [bx+BOOTMENUINFO.szDrvName]
     mov     bx, es
     CALL_DISPLAY_LIBRARY PrintNullTerminatedStringFromBXSI
@@ -123 +123 @@
     pop     di
     ret
-

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -29 +29 @@
     %include "RomVars.inc"          ; For ROMVARS and IDEVARS structs
     %include "RamVars.inc"          ; For RAMVARS struct
-    %include "BootVars.inc"         ; For BOOTVARS and BOOTNFO structs
+    %include "BootVars.inc"         ; For BOOTVARS struct
     %include "BootMenu.inc"         ; For Boot Menu
     %include "IDE_8bit.inc"         ; For IDE 8-bit data port macros
@@ -167 +167 @@
     %include "FindDPT.asm"          ; For finding DPTs
     %include "AccessDPT.asm"        ; For accessing DPTs
-    %include "BootInfo.asm"         ; For creating BOOTNFO structs
+    %include "BootMenuInfo.asm"     ; For creating BOOTMENUINFO structs
     %include "AtaID.asm"            ; For ATA Identify Device information
     %include "DetectDrives.asm"     ; For detecting IDE drives