Changeset 369 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Boot

Timestamp:

Mar 29, 2012, 9:29:28 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Removed align directives for initalization code and added define for align in boot-time calls to the assembly library (defaulting to 1), resulting in a significant savings for the AT and 386 builds. Fixed a bug with switch command line handling in the serial server. Put in CR characters in licesnse.txt, so that it properly displays on Windows. In the configurator, added default values for user supplied CHS and LBA values, defaulting to values within range when those features are enabled. Updated the copyright message in the configurator as the literal word Copyright is important.

Location:

trunk/XTIDE_Universal_BIOS/Src/Boot

Files:

• BootMenu.asm (modified) (12 diffs)
• BootMenuEvent.asm (modified) (8 diffs)
• BootMenuInfo.asm (modified) (1 diff)
• BootMenuPrint.asm (modified) (10 diffs)
• BootPrint.asm (modified) (2 diffs)
• BootSector.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenu.asm

@@ -16 +16 @@
 ;       All General Purpose Registers
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_DisplayAndReturnSelectionInDX:
     call    DriveXlate_Reset
@@ -39 +38 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetDriveToDXforMenuitemInCX_And_RamVars_GetSegmentToDS:
     call    RamVars_GetSegmentToDS
 ;;; fall-through
 
-ALIGN JUMP_ALIGN
 BootMenu_GetDriveToDXforMenuitemInCX:
     cmp     cl, NO_ITEM_HIGHLIGHTED
@@ -73 +70 @@
 ;       AX, BX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_Enter:
     mov     bx, BootMenuEvent_Handler
@@ -92 +88 @@
 ;       CX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetMenuitemCountToAX:
     call    RamVars_GetHardDiskCountFromBDAtoAX
@@ -110 +105 @@
 ;       AL, CX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetHeightToAHwithItemCountInAL:
     add     al, BOOT_MENU_HEIGHT_WITHOUT_ITEMS
@@ -119 +113 @@
     jb      SHORT .Return
     mov     ah, cl
-ALIGN JUMP_ALIGN, ret
+
 .Return:
     ret
@@ -133 +127 @@
 ;       CX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetMenuitemToAXforAsciiHotkeyInAL:
     call    Char_ALtoUpperCaseLetter
@@ -144 +137 @@
     sub     al, 'A'                     ; Letter to Floppy Drive menuitem
     ret
-ALIGN JUMP_ALIGN
+
 .StartFromHardDiskLetter:
     sub     cl, al                      ; Hard Disk index
@@ -165 +158 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetLetterForFirstHardDiskToAL:
     call    FloppyDrive_GetCountToAX
@@ -172 +164 @@
     ja      .Return
     mov     al, 'C'
-ALIGN JUMP_ALIGN, ret
+        
 .Return:
     ret
@@ -186 +178 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_GetMenuitemToDXforDriveInDL:
     xor     dh, dh                      ; Drive number now in DX
@@ -211 +202 @@
 ;       AX, CX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenu_IsDriveInSystem:
     test    dl, dl                              ; Floppy drive?

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm

@@ -16 +16 @@
 ;       All
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuEvent_Handler:
 
@@ -66 +65 @@
 ; Returns:
 ;   DS:SI:      Ptr to initialized MENUINIT struct
-ALIGN JUMP_ALIGN
 .FirstEvent:    
 .InitializeMenuinitFromDSSI:
@@ -85 +83 @@
     ret
 
-ALIGN JUMP_ALIGN
 .GetDefaultMenuitemToDX:
     mov     dl, [cs:ROMVARS.bBootDrv]   ; Default boot drive
@@ -92 +89 @@
     call    DriveXlate_SetDriveToSwap
     jmp     BootMenu_GetMenuitemToDXforDriveInDL
-ALIGN JUMP_ALIGN
+
 .DoNotSetDefaultMenuitem:
     xor     dx, dx                      ; Whatever appears first on boot menu
@@ -101 +98 @@
 ;   CX:         Index of new highlighted item
 ;   DX:         Index of previously highlighted item or NO_ITEM_HIGHLIGHTED
-ALIGN JUMP_ALIGN
 .ItemHighlightedFromCX:
     push    cx
@@ -124 +120 @@
 ;   AL:         ASCII character for the key
 ;   AH:         Keyboard library scan code for the key
-ALIGN JUMP_ALIGN
 .KeyStrokeInAX:
     cmp     ah, ROM_BOOT_HOTKEY_SCANCODE
@@ -130 +125 @@
     ;; NOTE: carry flag will be clear after compare above that resulted in zero
     jmp     Int19hMenu_JumpToBootSector_or_RomBoot      
-ALIGN JUMP_ALIGN
+
 .CheckDriveHotkeys:
     call    BootMenu_GetMenuitemToAXforAsciiHotkeyInAL
@@ -147 +142 @@
 ; Parameters:
 ;   CX:         Index of selected item
-ALIGN JUMP_ALIGN
 .ItemSelectedFromCX:
     CALL_MENU_LIBRARY Close

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuInfo.asm

@@ -55 +55 @@
 ;       CX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuInfo_GetTotalSectorCount:
     test    BYTE [di+DPT.bFlagsLow], FLG_DRVNHEAD_LBA

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm

@@ -15 +15 @@
 ;       AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_RefreshItem:
     call    BootMenu_GetDriveToDXforMenuitemInCX_And_RamVars_GetSegmentToDS
@@ -59 +58 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_TitleStrings:
     mov     si, ROMVARS.szTitle
@@ -76 +74 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_NullTerminatedStringFromCSSIandSetCF:
 ;
@@ -99 +96 @@
 ;       AX, BX, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_RefreshInformation:
     CALL_MENU_LIBRARY ClearInformationArea
@@ -188 +184 @@
 ;       BX, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 .HardDiskRefreshInformation:
     jc      .HardDiskMenuitemInfoForForeignDrive        ; Based on CF from FindDPT_ForDriveNumberInDL (way) above
@@ -229 +224 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_FormatCSSIfromParamsInSSBP:
     CALL_DISPLAY_LIBRARY FormatNullTerminatedStringFromCSSI
@@ -246 +240 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_ClearScreen:
     call    BootMenuPrint_InitializeDisplayContext
@@ -265 +258 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_TheBottomOfScreen:
     call    FloppyDrive_GetCountToAX
@@ -351 +343 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 PushHotkeyParamsAndFormat:
     push    bp
@@ -378 +369 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootMenuPrint_InitializeDisplayContext:
     CALL_DISPLAY_LIBRARY InitializeDisplayContext

trunk/XTIDE_Universal_BIOS/Src/Boot/BootPrint.asm

@@ -14 +14 @@
 ;       AX, CX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootPrint_FailedToLoadFirstSector:
     push    bp
@@ -35 +34 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootPrint_TryToBootFromDL:
     push    bp

trunk/XTIDE_Universal_BIOS/Src/Boot/BootSector.asm

@@ -17 +17 @@
 ;       AX, CX, DH, SI, DI, (DL if failed to read boot sector)
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 BootSector_TryToLoadFromDriveDL:
     call    BootPrint_TryToBootFromDL
@@ -52 +51 @@
 ;       AL, CX, DH, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 LoadFirstSectorFromDriveDL:
     LOAD_BDA_SEGMENT_TO es, bx              ; ES:BX now points to...
     mov     bx, BOOTVARS.rgbBootSect        ; ...boot sector location
     mov     di, BOOT_READ_RETRY_TIMES       ; Initialize retry counter
-ALIGN JUMP_ALIGN
+
 .ReadRetryLoop:
     call    .ResetBootDriveFromDL
@@ -78 +76 @@
 ;       AL
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 .ResetBootDriveFromDL:
     xor     ax, ax                          ; AH=0h, Disk Controller Reset
@@ -101 +98 @@
 ;       AL, CX, DH
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 .LoadFirstSectorFromDLtoESBX:
     mov     ax, 0201h                       ; Read 1 sector