Changeset 500 in xtideuniversalbios


Ignore:
Timestamp:
Jan 23, 2013, 7:44:48 PM (9 years ago)
Author:
aitotat@…
google:author:
aitotat@gmail.com
Message:

Changes to XTIDE Universal BIOS:

  • Selected drive is again properly displayed on hotkeybar when MODULE_BOOT_MENU is not available.
Location:
trunk/XTIDE_Universal_BIOS
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/XTIDE_Universal_BIOS/Inc/BootVars.inc

    r493 r500  
    5757struc HOTKEYVARS
    5858    .wTimeToClose       resb    2       ; Earliest system time when Hotkey Bar can be closed
    59     .wHddAndFddLetters:
     59    .wFddAndHddLetters:
    6060    .bFddLetter         resb    1       ; Floppy Drive letter hotkey (upper case)
    6161    .bHddLetter         resb    1       ; Hard Drive letter hotkey (upper case)
  • trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

    r496 r500  
    134134
    135135DEVICE_ATA_TERTIARY_PORT                EQU     1E8h
    136 DEVICE_ATA_TERTIARY_PORTCTRL            EQU     (DEVICE_ATA_TERTIARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
     136DEVICE_ATA_TERTIARY_PORTCTRL            EQU     ((DEVICE_ATA_TERTIARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET) & ~0Fh) ; 3E0h
    137137
    138138DEVICE_ATA_QUATERNARY_PORT              EQU     168h
    139 DEVICE_ATA_QUATERNARY_PORTCTRL          EQU     (DEVICE_ATA_QUATERNARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
     139DEVICE_ATA_QUATERNARY_PORTCTRL          EQU     ((DEVICE_ATA_QUATERNARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET) & ~0Fh)   ; 360h
    140140
    141141
  • trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm

    r492 r500  
    6666;--------------------------------------------------------------------
    6767.PrintFloppyDriveHotkeys:
    68     mov     cx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wHddAndFddLetters]
    69        
    7068    call    FloppyDrive_GetCountToAX
    7169    test    ax, ax      ; Any Floppy Drives?
     
    7371
    7472    mov     ax, (ANGLE_QUOTE_RIGHT << 8) | DEFAULT_FLOPPY_DRIVE_LETTER
     73    mov     cl, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFddLetter]
    7574    mov     di, g_szFDD
    7675    call    FormatDriveHotkeyString
     
    9190    call    DriveXlate_GetLetterForFirstHardDriveToAX
    9291    mov     ah, ANGLE_QUOTE_RIGHT
    93     mov     cl, ch
     92    mov     cl, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bHddLetter]
    9493    mov     di, g_szHDD
    9594    call    FormatDriveHotkeyString
     
    229228    ;;  fall through to PushHotkeyParamsAndFormat
    230229
    231 %else ; MODULE_BOOT_MENU - No boot menu so use simpler attributes
     230
     231%else ; if no MODULE_BOOT_MENU - No boot menu so use simpler attributes
    232232
    233233    mov     dx, (COLOR_ATTRIBUTE(COLOR_YELLOW, COLOR_CYAN) << 8) | MONO_REVERSE_BLINK
     
    238238
    239239SelectAttributeFromDHorDLbasedOnVideoMode:
    240     mov     al, [es:BDA.bVidMode]
    241     shr     al, 1
     240    mov     ch, [es:BDA.bVidMode]       ; We only need to preserve CL
     241    shr     ch, 1
    242242    jnc     SHORT .AttributeLoadedToDL  ; Black & White modes
    243     shr     al, 1
     243    shr     ch, 1
    244244    jnz     SHORT .AttributeLoadedToDL  ; MDA
    245245    mov     dl, dh
     
    253253; PushHotkeyParamsAndFormat
    254254;   Parameters:
    255 ;       BL:         First character
    256 ;       BH:         Second character
     255;       AL:         First character
     256;       AH:         Second character
    257257;       DX:         Description Attribute
    258258;       CX:         Description string parameter
     
    406406;--------------------------------------------------------------------
    407407HotkeyBar_GetBootDriveNumbersToDX:
    408     mov     dx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wHddAndFddLetters]
     408    mov     dx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wFddAndHddLetters]
    409409    test    BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags], FLG_HOTKEY_HD_FIRST       
    410410    jnz     .noflip
  • trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/BootVars.asm

    r493 r500  
    6464;--------------------------------------------------------------------
    6565BootVars_StoreHotkeyForDriveNumberInDL:
    66     mov     WORD [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wHddAndFddLetters], DEFAULT_FLOPPY_DRIVE_LETTER | (DEFAULT_HARD_DRIVE_LETTER<<8)
     66    mov     WORD [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wFddAndHddLetters], DEFAULT_FLOPPY_DRIVE_LETTER | (DEFAULT_HARD_DRIVE_LETTER<<8)
    6767    call    DriveXlate_ConvertDriveNumberFromDLtoDriveLetter
    6868    jmp     HotkeyBar_StoreHotkeyToBootvarsForDriveLetterInDL
Note: See TracChangeset for help on using the changeset viewer.