Changeset 505 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src


Ignore:
Timestamp:
Feb 25, 2013, 4:23:09 PM (11 years ago)
Author:
krille_n_@…
google:author:
krille_n_@hotmail.com
Message:

Changes:

  • Reverted the changes to MenuEvents.inc done in r492 since they broke the F1 key function in XTIDECFG.
  • Added a tail-call optimized variant of the CALL_DISPLAY_LIBRARY macro (JMP_DISPLAY_LIBRARY).
  • Put a block size limit in AH1Eh_ChangeXTCFmodeBasedOnControlRegisterInAL. I think it's needed but if not, it's easy to remove.
  • Other optimizations and fixes.
Location:
trunk/XTIDE_Universal_BIOS/Src
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeIO.asm

    r503 r505  
    5656    mov     al, [di+DPT_ATA.bDevice]
    5757    cmp     al, DEVICE_8BIT_XTIDE_REV2
     58    jb      SHORT .InputToALfromRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
     59
     60%ifdef MODULE_8BIT_IDE_ADVANCED
    5861    je      SHORT .ReverseA0andA3fromRegisterIndexInDX
    59     jb      SHORT .InputToALfromRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
    60        
    61 %ifdef MODULE_8BIT_IDE_ADVANCED
     62
    6263    cmp     al, DEVICE_8BIT_JRIDE_ISA
    6364    jne     SHORT .ShlRegisterIndexInDX         ; All XT-CF modes
    … …  
    7172    ret
    7273%endif
    73        
     74
    7475.ReverseA0andA3fromRegisterIndexInDX:
    7576    mov     dl, [cs:bx+g_rgbSwapA0andA3fromIdeRegisterIndex]
    … …  
    7778
    7879.ShlRegisterIndexInDX:
    79     shl     dx, 1
     80    eSHL_IM dx, 1
    8081    ; Fall to .InputToALfromRegisterInDX
    8182
    … …  
    102103    mov     bl, [di+DPT_ATA.bDevice]
    103104    cmp     bl, DEVICE_8BIT_XTIDE_REV2
     105    jb      SHORT .OutputALtoControlBlockRegisterInDX   ; Standard IDE controllers and XTIDE rev 1
     106
     107%ifdef MODULE_8BIT_IDE_ADVANCED
    104108    je      SHORT .ReverseA0andA3fromRegisterIndexInDX
    105     jb      SHORT .OutputALtoControlBlockRegisterInDX   ; Standard IDE controllers and XTIDE rev 1
    106 
    107 %ifdef MODULE_8BIT_IDE_ADVANCED
     109
    108110    cmp     bl, DEVICE_8BIT_JRIDE_ISA
    109111    jne     SHORT .ShlRegisterIndexInDX     ; All XT-CF modes
    … …  
    125127
    126128.ShlRegisterIndexInDX:
    127     shl     dx, 1
     129    eSHL_IM dx, 1
    128130    add     dx, BYTE XTCF_CONTROL_BLOCK_OFFSET
    129131    jmp     SHORT OutputALtoRegisterInDX
    … …  
    152154    mov     bl, [di+DPT_ATA.bDevice]
    153155    cmp     bl, DEVICE_8BIT_XTIDE_REV2
     156    jb      SHORT OutputALtoRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
     157
     158%ifdef MODULE_8BIT_IDE_ADVANCED
    154159    je      SHORT .ReverseA0andA3fromRegisterIndexInDX
    155     jb      SHORT OutputALtoRegisterInDX    ; Standard IDE controllers and XTIDE rev 1
    156 
    157 %ifdef MODULE_8BIT_IDE_ADVANCED
     160
    158161    cmp     bl, DEVICE_8BIT_JRIDE_ISA
    159162    jne     SHORT .ShlRegisterIndexInDX     ; All XT-CF modes
    … …  
    177180
    178181.ShlRegisterIndexInDX:
    179     shl     dx, 1
     182    eSHL_IM dx, 1
    180183    ; Fall to OutputALtoRegisterInDX
    181184

  • trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm

    r503 r505  
    3939AH0h_HandlerForDiskControllerReset:
    4040    ; Reset foreign Floppy and Hard Drives (those handled by other BIOSes)
    41     xor     bx, bx                                      ; Zero BH to assume no errors
    42     or      bl, dl                                      ; Copy requested drive to BL
     41    eMOVZX  bx, dl                                      ; Copy requested drive to BL and zero BH to assume no errors
     42
    4343    xor     ah, ah                                      ; Disk Controller Reset
    4444    call    Int13h_CallPreviousInt13hHandler            ; Reset floppy drives only or floppy drives and foreign hard disks

  • trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH1Eh_XTCF.asm

    r491 r505  
    102102    out     dx, al
    103103
     104    ; We always need to enable 8-bit mode since 16-bit mode is restored
     105    ; when controller is reset (AH=00h or 0Dh)
     106    ePUSH_T bx, AH23h_Enable8bitPioMode
     107
    104108    ; Convert Control Register Contents to device code
    105109    test    al, al
    … …  
    108112    jae     SHORT .SetMemoryMappedMode
    109113
     114; We need to limit block size here. Consider this scenario;
     115; 1. While in PIO mode or memory mapped mode, the drive is set to do
     116;    block transfers larger than XTCF_DMA_MODE_MAX_BLOCK_SIZE.
     117; 2. A call is subsequently made to change device mode to DEVICE_8BIT_XTCF_DMA.
     118; 3. The call to AH24h_SetBlockSize fails but the change in device mode has been made.
     119
    110120    ; Set DMA Mode
    111121    mov     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_DMA
    112122    mov     al, [di+DPT_ATA.bBlockSize]
    113     call    AH24h_SetBlockSize  ; AH=24h limits block size if necessary
    114     jmp     SHORT .Enable8bitPioMode
     123    MIN_U   al, XTCF_DMA_MODE_MAX_BLOCK_SIZE
     124    jmp     SHORT AH24h_SetBlockSize    ; Returns via AH23h_Enable8bitPioMode
    115125
    116126.SetMemoryMappedMode:
    117     mov     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_MEMMAP
    118     jmp     SHORT .Enable8bitPioMode
     127    mov     al, DEVICE_8BIT_XTCF_MEMMAP
     128    SKIP2B  bx
    119129
    120130.Set8bitPioMode:
    121     mov     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_XTCF_PIO8
    122     ; Fall to .Enable8bitPioMode
    123 
    124     ; We always need to enable 8-bit mode since 16-bit mode is restored
    125     ; when controller is reset (AH=00h or 0Dh)
    126 .Enable8bitPioMode:
    127     jmp     AH23h_Enable8bitPioMode
     131    mov     al, DEVICE_8BIT_XTCF_PIO8
     132    mov     [di+DPT_ATA.bDevice], al
     133    ret     ; Via AH23h_Enable8bitPioMode
    128134
    129135

  • trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH9h_HInit.asm

    r493 r505  
    101101    call    Device_SelectDrive
    102102    STORE_ERROR_FLAG_TO_DPT     FLG_INITERROR_FAILED_TO_SELECT_DRIVE
     103%ifdef USE_386
     104    jc      .ReturnWithErrorCodeInAH
     105%else
    103106    jnc     SHORT .ContinueInitializationSinceDriveSelectedSuccesfully
    104107    jmp     .ReturnWithErrorCodeInAH
    105108.ContinueInitializationSinceDriveSelectedSuccesfully:
     109%endif
    106110
    107111

  • trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

    r493 r505  
    33
    44;
    5 ; XTIDE Universal BIOS and Associated Tools 
     5; XTIDE Universal BIOS and Associated Tools
    66; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
    77;
    … …  
    1010; the Free Software Foundation; either version 2 of the License, or
    1111; (at your option) any later version.
    12 ; 
     12;
    1313; This program is distributed in the hope that it will be useful,
    1414; but WITHOUT ANY WARRANTY; without even the implied warranty of
    1515; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 ; GNU General Public License for more details.     
     16; GNU General Public License for more details.
    1717; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
    18 ;       
     18;
    1919
    2020; Section containing code
    … …  
    107107; The following macro could be easily inlined below.  Why a macro?  Depending on the combination
    108108; of MODULE_HOTKEYS or MODULE_BOOT_MENU, this code needs to either come before or after the
    109 ; call to the boot menu. 
     109; call to the boot menu.
    110110;
    111111%macro TRY_TO_BOOT_DL_AND_DH_DRIVES 0
    112112    push    dx                                  ; it's OK if this is left on the stack, if we are
    113                                                 ; are successful, the following call does not return
     113                                                ; successful, the following call does not return
    114114    call    TryToBootFromPrimaryOrSecondaryBootDevice_AndBoot
    115115    pop     dx
    … …  
    117117    call    TryToBootFromPrimaryOrSecondaryBootDevice_AndBoot
    118118%endmacro
    119                
    120 %ifdef MODULE_HOTKEYS
    121     call    HotkeyBar_ScanHotkeysFromKeyBufferAndStoreToBootvars       
     119
     120%ifdef MODULE_HOTKEYS
     121    call    HotkeyBar_ScanHotkeysFromKeyBufferAndStoreToBootvars
    122122    cmp     al, ROM_BOOT_HOTKEY_SCANCODE
    123     jz      .RomBoot                            ; CF clear so ROM boot
     123    je      .RomBoot                            ; CF clear so ROM boot
    124124%ifdef MODULE_BOOT_MENU
    125125    cmp     al, BOOT_MENU_HOTKEY_SCANCODE
    126     jz      .BootMenu
     126    je      .BootMenu
    127127%endif
    128128    call    HotkeyBar_GetBootDriveNumbersToDX
    … …  
    130130    TRY_TO_BOOT_DL_AND_DH_DRIVES
    131131    ;; falls through to boot menu, if it is present.  If not present, falls through to rom boot.
    132 %endif
     132%endif ; MODULE_HOTKEYS
    133133
    134134%ifdef MODULE_BOOT_MENU
    135 .BootMenu:     
     135.BootMenu:
    136136    call    BootMenu_DisplayAndReturnDriveInDLRomBootClearCF
    137137    jnc     .RomBoot                            ; CF clear so ROM boot
    138138
    139139    mov     dh, dl                              ; Setup for secondary drive
    140     not     dh                                  ; Floppy goes to HD, or vice veras
    141     and     dh, 080h                            ; Go to first drive of the floppy or HD set
     140    not     dh                                  ; Floppy goes to HD, or vice versa
     141    and     dh, 80h                             ; Go to first drive of the floppy or HD set
    142142
    143143%ifdef MODULE_HOTKEYS
    144144    jmp     .TryUsingHotKeysCode
    145145%else
    146     TRY_TO_BOOT_DL_AND_DH_DRIVES       
     146    TRY_TO_BOOT_DL_AND_DH_DRIVES
    147147    jmp     .BootMenu
    148148%endif
    149 %endif
    150 
    151 %ifndef MODULE_HOTKEYS
    152 %ifndef MODULE_BOOT_MENU
     149%endif ; MODULE_BOOT_MENU
     150
     151%ifndef MODULE_HOTKEYS OR MODULE_BOOT_MENU
    153152    xor     dl, dl          ; Try to boot from Floppy Drive A
    154153    call    TryToBootFromPrimaryOrSecondaryBootDevice_AndBoot
    155154    mov     dl, 80h         ; Try to boot from Hard Drive C
    156155    call    TryToBootFromPrimaryOrSecondaryBootDevice_AndBoot
    157 %endif
    158156%endif
    159157
    … …  
    162160    call    DriveXlate_Reset                    ; Clean up any drive mappings before Rom Boot
    163161%endif
    164     clc     
     162    clc
    165163    ;; fall through to JumpToBootSector_or_RomBoot
    166164
    … …  
    174172;   Parameters:
    175173;       DL:     Drive to boot from (translated, 00h or 80h)
    176 ;       CF:     Set for Boot Sector Boot 
     174;       CF:     Set for Boot Sector Boot
    177175;               Clear for ROM Boot
    178176;       ES:BX:  (if CF set) Ptr to boot sector
    … …  
    187185
    188186; clear segment registers before boot sector or rom call
    189     mov     ds, ax     
     187    mov     ds, ax
    190188    mov     es, ax
    191189%ifdef USE_386
    … …  
    202200; Boot by calling INT 18h (ROM Basic of ROM DOS)
    203201.romboot:
    204     int     BIOS_BOOT_FAILURE_INTERRUPT_18h ; Never returns 
    205 
    206 
    207 ;--------------------------------------------------------------------
    208 ; TryToBootFromPrimaryOrSecondaryBootDevice
     202    int     BIOS_BOOT_FAILURE_INTERRUPT_18h ; Never returns
     203
     204
     205;--------------------------------------------------------------------
     206; TryToBootFromPrimaryOrSecondaryBootDevice_AndBoot
    209207;   Parameters
    210208;       DL:     Drive selected as boot device
    … …  
    229227
    230228TryToBoot_FallThroughTo_BootSector_TryToLoadFromDriveDL_AndBoot:
    231 ; fall through to BootSector_TryToLoadFromDriveDL_AndBoot               
    232 %endif
    233        
    234 
     229; fall through to BootSector_TryToLoadFromDriveDL_AndBoot
     230%endif
     231

  • trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h/BootSector.asm

    r492 r505  
    33
    44;
    5 ; XTIDE Universal BIOS and Associated Tools 
     5; XTIDE Universal BIOS and Associated Tools
    66; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
    77;
    … …  
    1010; the Free Software Foundation; either version 2 of the License, or
    1111; (at your option) any later version.
    12 ; 
     12;
    1313; This program is distributed in the hope that it will be useful,
    1414; but WITHOUT ANY WARRANTY; without even the implied warranty of
    1515; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1616; GNU General Public License for more details.
    17 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html               
    18 ;       
     17; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
     18;
    1919
    2020; Section containing code
    … …  
    2222
    2323;--------------------------------------------------------------------
    24 ; BootSector_TryToLoadFromDriveDL
     24; BootSector_TryToLoadFromDriveDL_AndBoot
    2525;   Parameters:
    2626;       DL:     Drive to boot from (translated, 00h or 80h)
    … …  
    3636    call    DetectPrint_TryToBootFromDL
    3737    call    LoadFirstSectorFromDriveDL
     38%ifndef USE_386
    3839    jc      SHORT .FailedToLoadFirstSector
     40%else
     41    jc      DetectPrint_FailedToLoadFirstSector
     42%endif
    3943
    4044    test    dl, dl
    … …  
    4448.AlwaysBootFromFloppyDriveForBooterGames:
    4549    stc
    46     jmp     SHORT JumpToBootSector_or_RomBoot       
     50    jmp     SHORT JumpToBootSector_or_RomBoot
     51
     52%ifndef USE_386
    4753.FailedToLoadFirstSector:
    48     call    DetectPrint_FailedToLoadFirstSector
    49     ret
     54    jmp     DetectPrint_FailedToLoadFirstSector
     55%endif
     56
    5057.FirstHardDiskSectorNotBootable:
    5158    mov     si, g_szBootSectorNotFound
    52     call    DetectPrint_NullTerminatedStringFromCSSIandSetCF
    53     ret
     59    jmp     DetectPrint_NullTerminatedStringFromCSSIandSetCF
    5460
    55 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS       
     61%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
    5662  %ifdef MODULE_DRIVEXLATE
    5763    %if TryToBoot_FallThroughTo_BootSector_TryToLoadFromDriveDL_AndBoot <> BootSector_TryToLoadFromDriveDL_AndBoot
    … …  
    7985
    8086.ReadRetryLoop:
    81     call    .LoadFirstSectorFromDLtoESBX
    82     jnc     SHORT .Return
     87    mov     ax, 0201h                       ; Read 1 sector
     88    mov     cx, 1                           ; Cylinder 0, Sector 1
     89    xor     dh, dh                          ; Head 0
     90    int     BIOS_DISK_INTERRUPT_13h
     91    jc      SHORT .FailedToLoadFirstSector
     92.Return:
     93    ret
     94
     95.FailedToLoadFirstSector:
    8396    dec     di                              ; Decrement retry counter (preserve CF)
    8497    jz      SHORT .Return                   ; Loop while retries left
    8598
    8699    ; Reset drive and retry
    87     xor     ax, ax                          ; AH=0h, Disk Controller Reset
     100    xor     ax, ax                          ; AH=00h, Disk Controller Reset
    88101    test    dl, dl                          ; Floppy drive?
    89     eCMOVS  ah, RESET_HARD_DISK             ; AH=Dh, Reset Hard Disk (Alternate reset)
     102    eCMOVS  ah, RESET_HARD_DISK             ; AH=0Dh, Reset Hard Disk (Alternate reset)
    90103    int     BIOS_DISK_INTERRUPT_13h
    91104    jmp     SHORT .ReadRetryLoop
    92105
    93 
    94 ;--------------------------------------------------------------------
    95 ; .LoadFirstSectorFromDLtoESBX
    96 ;   Parameters:
    97 ;       DL:     Drive to boot from (translated, 00h or 80h)
    98 ;       ES:BX:  Destination buffer for boot sector
    99 ;   Returns:
    100 ;       AH:     INT 13h error code
    101 ;       ES:BX:  Ptr to boot sector
    102 ;       CF:     Cleared if read successful
    103 ;               Set if any error
    104 ;   Corrupts registers:
    105 ;       AL, CX, DH
    106 ;--------------------------------------------------------------------
    107 .LoadFirstSectorFromDLtoESBX:
    108     mov     ax, 0201h                       ; Read 1 sector
    109     mov     cx, 1                           ; Cylinder 0, Sector 1
    110     xor     dh, dh                          ; Head 0
    111     int     BIOS_DISK_INTERRUPT_13h
    112 .Return:
    113     ret

  • trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

    r493 r505  
    5050%ifdef MODULE_HOTKEYS
    5151    call    HotkeyBar_ScanHotkeysFromKeyBufferAndStoreToBootvars        ; Done here while CX is still protected
    52 %endif             
     52%endif
    5353
    5454    pop     cx
    … …  
    7373%ifdef MODULE_HOTKEYS
    7474    cmp     al, COM_DETECT_HOTKEY_SCANCODE  ; Set by last call to HotkeyBar_UpdateDuringDriveDetection above
    75     jz      .DriveDetectLoop
    76 %endif     
     75    je      .DriveDetectLoop
     76%endif
    7777
    7878    mov     al,[cs:ROMVARS.wFlags]          ; Configurator set to always scan?
    … …  
    201201%ifdef MODULE_HOTKEYS
    202202    call    HotkeyBar_UpdateDuringDriveDetection
    203 %endif             
    204        
     203%endif
     204
    205205%ifdef MODULE_8BIT_IDE_ADVANCED
    206206    pop     dx
    … …  
    248248;       Nothing
    249249;   Returns:
    250 ;       CF:     Set (from BootMenuPrint_NullTerminatedStringFromCSSIandSetCF)
     250;       CF:     Set (from DetectPrint_NullTerminatedStringFromCSSIandSetCF)
    251251;   Corrupts registers:
    252252;       AX, SI

  • trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm

    r492 r505  
    33
    44;
    5 ; XTIDE Universal BIOS and Associated Tools 
     5; XTIDE Universal BIOS and Associated Tools
    66; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
    77;
    … …  
    1010; the Free Software Foundation; either version 2 of the License, or
    1111; (at your option) any later version.
    12 ; 
     12;
    1313; This program is distributed in the hope that it will be useful,
    1414; but WITHOUT ANY WARRANTY; without even the implied warranty of
    1515; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 ; GNU General Public License for more details.     
     16; GNU General Public License for more details.
    1717; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
    18 ;       
     18;
    1919
    2020; Section containing code
    … …  
    3131;--------------------------------------------------------------------
    3232DetectPrint_InitializeDisplayContext:
    33     CALL_DISPLAY_LIBRARY    InitializeDisplayContext
    34     ret
    35 
    36        
     33    JMP_DISPLAY_LIBRARY InitializeDisplayContext
     34
     35
    3736%ifdef MODULE_HOTKEYS
    3837;--------------------------------------------------------------------
    … …  
    4645;--------------------------------------------------------------------
    4746DetectPrint_GetSoftwareCoordinatesToAX:
    48     CALL_DISPLAY_LIBRARY    GetSoftwareCoordinatesToAX
    49     ret
     47    JMP_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
    5048%endif
    5149
    52        
     50
    5351;--------------------------------------------------------------------
    5452; DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
    … …  
    7573;   Corrupts registers:
    7674;       AX, CX, DX, SI, DI
    77 ;--------------------------------------------------------------------   
     75;--------------------------------------------------------------------
    7876DetectPrint_StartDetectWithAutodetectedBasePortInAXandIdeVarsInCSBP:
    7977    mov     dx, [cs:bp+IDEVARS.bDevice-1]   ; for Serial: AL=port address>>2, AH=baud rate
    … …  
    152150DetectPrint_DriveNameFromDrvDetectInfoInESBX:
    153151    push    bp
    154     mov     bp,sp   
     152    mov     bp,sp
    155153    lea     si,[bx+DRVDETECTINFO.szDrvName]
    156154    push    si
    … …  
    158156    jmp     SHORT DetectPrint_FormatCSSIfromParamsInSSBP
    159157
    160                
     158
    161159;--------------------------------------------------------------------
    162160; Prints BIOS name and segment address where it is found.
    … …  
    175173                                        ; so that it can be a different value when using .BootMenuEntry
    176174
    177 .BootMenuEntry: 
     175.BootMenuEntry:
    178176    push    bp
    179177    mov     bp, sp
    … …  
    186184    push    ax
    187185%else
    188     ; szTitle and szVersion have the high order byte of their addresses zero, 
     186    ; szTitle and szVersion have the high order byte of their addresses zero,
    189187    ; so these push instructions are only 2 bytes
    190188    ;
    … …  
    259257
    260258    mov     si, g_szTryToBoot
    261     jmp     SHORT DetectPrint_FormatCSSIfromParamsInSSBP   
     259    jmp     SHORT DetectPrint_FormatCSSIfromParamsInSSBP
    262260
    263261

  • trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenu.asm

    r492 r505  
    33
    44;
    5 ; XTIDE Universal BIOS and Associated Tools 
     5; XTIDE Universal BIOS and Associated Tools
    66; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
    77;
    … …  
    1010; the Free Software Foundation; either version 2 of the License, or
    1111; (at your option) any later version.
    12 ; 
     12;
    1313; This program is distributed in the hope that it will be useful,
    1414; but WITHOUT ANY WARRANTY; without even the implied warranty of
    1515; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1616; GNU General Public License for more details.
    17 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html       
    18 ;       
     17; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
     18;
    1919
    2020; Section containing code
    … …  
    2424; Displays Boot Menu and returns Drive or Function number.
    2525;
    26 ; BootMenu_DisplayAndStoreSelection
     26; BootMenu_DisplayAndReturnDriveInDLRomBootClearCF
    2727;   Parameters:
    2828;       DS:     RAMVARS segment
    … …  
    4141
    4242    xchg    cx, ax
    43        
     43
    4444    ; Clear Boot Menu from screen
    4545    mov     ax, ' ' | (MONO_NORMAL<<8)
    … …  
    5252;   Parameters:
    5353;       CX:     Index of menuitem selected from Boot Menu
     54;       DS:     RAMVARS segment
    5455;   Returns:
    5556;       DX:     Drive number to be used for booting
    56 ;       DS:     RAMVARS segment
    5757;       CF:     Set: There is a selected menu item, DL is valid
    5858;               Clear: The item selected is Rom Boot, DL is not valid
    5959;   Corrupts registers:
    60 ;       AX, BX, DI
     60;       AX, BX
    6161;
    6262; NOTE: We can't use the menu structure in here, as we are falling through
    63 ; through from BootMenu_DisplayAndReturnDriveInDLRomBootClearCF when the
     63; from BootMenu_DisplayAndReturnDriveInDLRomBootClearCF when the
    6464; menu structure has already been destroyed.
    6565;--------------------------------------------------------------------
    … …  
    7373    sub     dl, al                          ; Remove floppy drives from index
    7474    call    RamVars_GetHardDiskCountFromBDAtoAX
    75     or      al, 80h                         ; Or 80h into AL before the sub             
     75    or      al, 80h                         ; Or 80h into AL before the sub
    7676    cmp     dl, al                          ; Set CF if hard disk
    7777                                            ; Clear CF if last item, beyond hard disk list, which indicates ROM boot

  • trunk/XTIDE_Universal_BIOS/Src/Menus/DriveXlate.asm

    r493 r505  
    33
    44;
    5 ; XTIDE Universal BIOS and Associated Tools 
     5; XTIDE Universal BIOS and Associated Tools
    66; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
    77;
    … …  
    1010; the Free Software Foundation; either version 2 of the License, or
    1111; (at your option) any later version.
    12 ; 
     12;
    1313; This program is distributed in the hope that it will be useful,
    1414; but WITHOUT ANY WARRANTY; without even the implied warranty of
    1515; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 ; GNU General Public License for more details.     
     16; GNU General Public License for more details.
    1717; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
    18 ;       
     18;
    1919
    2020; Section containing code
    … …  
    4848%if HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber <> DriveXlate_ConvertDriveLetterInDLtoDriveNumber
    4949    %error "DriveXlate_ConvertDriveLetterInDLtoDriveNumber must be at the top of DriveXlate.asm, and that file must immediately follow HotKeys.asm"
    50 %endif     
    5150%endif
    52        
     51%endif
     52
    5353;--------------------------------------------------------------------
    5454; DriveXlate_ConvertDriveNumberFromDLtoDriveLetter
    … …  
    6464;--------------------------------------------------------------------
    6565DriveXlate_ConvertDriveNumberFromDLtoDriveLetter:
    66     test    dl, dl
    67     jns     SHORT .GetDefaultFloppyDrive
     66    xor     dl, 80h
     67    js      SHORT .GetDefaultFloppyDrive
    6868
    6969    ; Store default hard drive to boot from
    7070    call    DriveXlate_GetLetterForFirstHardDriveToAX
    71     sub     dl, 80h
    7271    add     dl, al
    7372    stc
    … …  
    7574
    7675.GetDefaultFloppyDrive:
    77     add     dl, DEFAULT_FLOPPY_DRIVE_LETTER     ; Clears CF
     76    sub     dl, 80h - DEFAULT_FLOPPY_DRIVE_LETTER   ; Clears CF
    7877    ret
    7978
    … …  
    9695    MAX_U   al, DEFAULT_HARD_DRIVE_LETTER
    9796    ret
    98                
     97
    9998
    10099;--------------------------------------------------------------------
    … …  
    168167    mov     al, dl              ; Store floppy translation
    169168    SKIP2B  di
    170 .SetHardDriveToSwap:   
     169.SetHardDriveToSwap:
    171170    mov     ah, dl              ; Store HD translation
    172171    mov     WORD [RAMVARS.xlateVars+XLATEVARS.wFDandHDswap], ax

  • trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm

    r500 r505  
    3434    call    HotkeyBar_ScanHotkeysFromKeyBufferAndStoreToBootvars
    3535    ; Fall to HotkeyBar_DrawToTopOfScreen
    36        
    37        
     36
     37
    3838;--------------------------------------------------------------------
    3939; HotkeyBar_DrawToTopOfScreen
    … …  
    127127    call    FormatFunctionHotkeyString
    128128%endif
    129     ; Fall to .PrintRomBootHotkey       
     129    ; Fall to .PrintRomBootHotkey
    130130
    131131;--------------------------------------------------------------------
    … …  
    169169;--------------------------------------------------------------------
    170170HotkeyBar_ClearRestOfTopRow:
    171     CALL_DISPLAY_LIBRARY    GetColumnsToALandRowsToAH
     171    CALL_DISPLAY_LIBRARY GetColumnsToALandRowsToAH
    172172    eMOVZX  cx, al
    173     CALL_DISPLAY_LIBRARY    GetSoftwareCoordinatesToAX
     173    CALL_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
    174174    sub     cl, al
    175175    mov     al, ' '
    176     CALL_DISPLAY_LIBRARY    PrintRepeatedCharacterFromALwithCountInCX
    177     ret
     176    JMP_DISPLAY_LIBRARY PrintRepeatedCharacterFromALwithCountInCX
    178177
    179178
    … …  
    216215
    217216    mov     si, ATTRIBUTE_CHARS.cHurryTimeout       ; Selected hotkey
    218     jz      SHORT GetDescriptionAttributeToDX       ; From compare with bScancode above
     217    je      SHORT GetDescriptionAttributeToDX       ; From compare with bScancode above
    219218
    220219GetNonSelectedHotkeyDescriptionAttributeToDX:
    … …  
    226225    call    MenuAttribute_GetToAXfromTypeInSI
    227226    xchg    dx, ax                  ; DX = Description attribute
    228     ;;  fall through to PushHotkeyParamsAndFormat 
     227    ;;  fall through to PushHotkeyParamsAndFormat
    229228
    230229
    … …  
    232231
    233232    mov     dx, (COLOR_ATTRIBUTE(COLOR_YELLOW, COLOR_CYAN) << 8) | MONO_REVERSE_BLINK
    234     jz      SHORT SelectAttributeFromDHorDLbasedOnVideoMode         ; From compare with bScancode above
     233    je      SHORT SelectAttributeFromDHorDLbasedOnVideoMode     ; From compare with bScancode above
    235234
    236235GetNonSelectedHotkeyDescriptionAttributeToDX:
    … …  
    245244    mov     dl, dh
    246245.AttributeLoadedToDL:
    247     ;;  fall through to PushHotkeyParamsAndFormat       
     246    ;;  fall through to PushHotkeyParamsAndFormat
    248247
    249248%endif ; MODULE_BOOT_MENU
    … …  
    277276    push    di              ; Description string
    278277    push    cx              ; Description string parameter
    279        
     278
    280279    push    si              ; Key attribute for last space
    281280
    … …  
    308307;--------------------------------------------------------------------
    309308HotkeyBar_RestoreCursorCoordinatesFromAX:
    310     CALL_DISPLAY_LIBRARY    SetCursorCoordinatesFromAX
    311     ret
     309    JMP_DISPLAY_LIBRARY SetCursorCoordinatesFromAX
    312310
    313311
    … …  
    325323HotkeyBar_StoreHotkeyToBootvarsForDriveLetterInDL:
    326324    eMOVZX  ax, dl
    327     xor     al, 32  ; Upper case drive letter to lower case keystroke
     325    or      al, 32  ; Upper case drive letter to lower case keystroke
    328326    jmp     SHORT HotkeyBar_StoreHotkeyToBootvarsIfValidKeystrokeInAX
    329327
    … …  
    364362    ; All scancodes are saved, even if it wasn't a drive letter,
    365363    ; which also covers our function key case.  Invalid function keys
    366     ; will not do anything (won't be printed, won't be accepted as input)       
     364    ; will not do anything (won't be printed, won't be accepted as input)
    367365    mov     [es:di], ah
    368        
     366
    369367    ; Drive letter hotkeys remaining, allow 'a' to 'z'
    370368    call    Char_IsLowerCaseLetterInAL
    371369    jnc     SHORT .KeystrokeIsNotValidDriveLetter
    372     xor     al, 32                  ; We want to print upper case letters
     370    and     al, ~32                 ; We want to print upper case letters
    373371
    374372    ; Clear HD First flag to assume Floppy Drive hotkey
    … …  
    377375
    378376    ; Determine if Floppy or Hard Drive hotkey
    379     eMOVZX  cx, al                  ; Clear CH to clear scancode
     377    xchg    cx, ax
    380378    call    DriveXlate_GetLetterForFirstHardDriveToAX
    381379    cmp     cl, al
    … …  
    386384
    387385.StoreDriveLetter:
    388     sbb     di, BYTE 1          ; Sub CF if Floppy Drive
     386    sbb     di, BYTE 1              ; Sub CF if Floppy Drive
    389387    xchg    ax, cx
    390     mov     [es:di], al         ; AH = zero to clear function hotkey
    391 
    392 .KeystrokeIsNotValidDriveLetter:       
     388    mov     [es:di], al
     389
     390.KeystrokeIsNotValidDriveLetter:
    393391NoHotkeyToProcess:
    394392    mov     al, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bScancode]
    … …  
    407405HotkeyBar_GetBootDriveNumbersToDX:
    408406    mov     dx, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wFddAndHddLetters]
    409     test    BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags], FLG_HOTKEY_HD_FIRST       
     407    test    BYTE [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags], FLG_HOTKEY_HD_FIRST
    410408    jnz     .noflip
    411409    xchg    dl, dh
    412 .noflip:   
     410.noflip:
    413411    call    DriveXlate_ConvertDriveLetterInDLtoDriveNumber
    414412    xchg    dl, dh
    415     ; Fall to HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber       
    416        
    417 HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber:     
    418 
     413    ; Fall to HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber
     414
     415HotkeyBar_FallThroughTo_DriveXlate_ConvertDriveLetterInDLtoDriveNumber:
     416

  • trunk/XTIDE_Universal_BIOS/Src/Strings.asm

    r492 r505  
    8686g_szRomBootDash:        db  " -  "                  ; String fall through to g_szRomBoot
    8787%endif
    88 %ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU       
    89 g_szRomBoot:            db  "Rom%cBoot", NULL       ; "RomBoot" or "Rom Boot"
    90 %endif
    91        
     88%ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU
     89g_szRomBoot:            db  "Rom%cBoot",NULL        ; "RomBoot" or "Rom Boot"
     90%endif
     91
    9292
    9393%ifdef MODULE_BOOT_MENU

  • trunk/XTIDE_Universal_BIOS/Src/StringsCompressed.asm

    r492 r505  
    177177
    178178%endif
    179 %ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU       
    180 g_szRomBoot:            ; db    "Rom%cBoot", NULL       ; "RomBoot" or "Rom Boot"
     179%ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU
     180g_szRomBoot:            ; db    "Rom%cBoot",NULL        ; "RomBoot" or "Rom Boot"
    181181                        ; db     52h,  6fh,  6dh,  25h,  63h,  42h,  6fh,  6fh,  74h,  00h    ; uncompressed
    182182                          db     58h,  75h,  73h,  3ch,  48h,  75h,  75h, 0bah                ; compressed

  • trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/RamVars.asm

    r493 r505  
    33
    44;
    5 ; XTIDE Universal BIOS and Associated Tools 
     5; XTIDE Universal BIOS and Associated Tools
    66; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
    77;
    … …  
    1010; the Free Software Foundation; either version 2 of the License, or
    1111; (at your option) any later version.
    12 ; 
     12;
    1313; This program is distributed in the hope that it will be useful,
    1414; but WITHOUT ANY WARRANTY; without even the implied warranty of
    1515; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 ; GNU General Public License for more details.     
     16; GNU General Public License for more details.
    1717; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
    18 ;       
     18;
    1919
    2020; Section containing code
    … …  
    9898;; when entering the boot menu and also before transferring control at boot time and
    9999;; for ROM boots (in int19h.asm).
    100        
     100
    101101    pop     es
    102102    ret
    … …  
    158158    call    RamVars_GetCountOfKnownDrivesToAX
    159159    push    ds
    160     LOAD_BDA_SEGMENT_TO ds, cx
     160    LOAD_BDA_SEGMENT_TO ds, bx
    161161    mov     bl, [BDA.bHDCount]
    162162    MAX_U   al, bl
Note: See TracChangeset for help on using the changeset viewer.