Changeset 589 in xtideuniversalbios for trunk/Assembly_Library/Src


Ignore:
Timestamp:
May 22, 2016, 12:26:57 PM (8 years ago)
Author:
Krister Nordvall
Message:

Changes:

  • BIOS: Fixed a purely cosmetic bug from r542 where, in builds containing MODULE_EBIOS, the boot menu would display an incorrect drive size (0.4 kB with MODULE_STRINGS_COMPRESSED or 0.5 kB without) for old drives with no support for LBA.
  • Fixed a bug from r392 where Vision_DetectAndReturnIDinAXandPortInDXifControllerPresent would return the ID in AL instead of AH (if DANGEROUS_DETECTION had been defined).
  • Fixed a bug from r587 in AdvAtaInit.asm that would prevent detection of QDI Vision controllers.
  • Also changed how the QDI Vision IDs are defined (removed the need for shifting) to avoid confusion. This fixed a potential bug from r587 in AdvAtaInit.asm where some IDs were not being shifted.
  • Fixed a bug in PDC20x30.asm from r587 where GetPdcIDtoAX would not return with the IDE base port in DX so DisablePdcProgrammingMode would fail.
  • Made some changes to ModuleDependency.inc and other files so that MODULE_ADVANCED_ATA now requires USE_386. Consequently it is no longer included in the regular AT-builds, only in the 386_8k-build.
  • Moved the UNROLL_SECTORS_IN_CX_TO_xWORDS macros from IDE_8bit.inc to IdeIO.inc which means it's now possible to build a BIOS without MODULE_8BIT_IDE.
  • XTIDECFG: Added a minimum DOS version check (since it needs DOS version 2+) to allow the program to quit gracefully in the unlikely scenario where someone tries to run it under DOS version 1.
  • Made some changes to Drive.asm to improve drive enumeration. The old method using GET_DOS_DRIVE_PARAMETER_BLOCK_FOR_SPECIFIC_DRIVE worked well in Windows XP but not in Windows 98 SE (in Windows or in DOS mode). The two problems were; 1) The function call would access the drives which on single floppy drive systems would cause Windows to swap between A: and B: (throwing a blue screen asking the user to insert a disk etc). 2) Only floppy drives and FAT16 drives would be available in the list of drives, no FAT32/optical/network drives.
  • Improved code in IdeControllerMenu.asm so that the default port addresses for all IDE interfaces are now restored when (re-)selecting the (same) type of IDE device.
  • Also made it impossible to select a device type unless the required module is included in the loaded BIOS.
  • The version check done when loading a BIOS now uses the FLASH_SIGNATURE definition from Version.inc. Any changes affecting RomVars now only requires updating that definition. This means that changes to RomVars must be implemented in both the BIOS and XTIDECFG before being committed to the repository.
  • Added a compatibility fix for 3Com 3C503 cards to the ROM checksumming code in Buffers.asm (Buffers_GenerateChecksum).
  • SerDrive: Made some minor changes to file names and paths to improve compatibility with case sensitive environments.
  • BIOSDRVS: Made a minor size optimization which as a side effect also makes it compatible with all DOS versions including DOS version 1.
  • Library: Renamed the WAIT_RETRACE_IF_NECESSARY_THEN macro to CALL_WAIT_FOR_RETRACE_IF_NECESSARY_THEN and made a tail-call-optimized version of it (JMP_WAIT_FOR_RETRACE_IF_NECESSARY_THEN).
  • A speed optimization to the eRCL_IM macro for 386 and higher. This change breaks emulation in the sense that the macro will fail when given a memory operand as the first parameter.
  • Other minor optimizations and fixes.
Location:
trunk/Assembly_Library/Src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Assembly_Library/Src/Display/DisplayCharOut.asm

    r526 r589  
    4141    cmp     al, ' '                         ; Printable character?
    4242    jb      SHORT DisplayCharOut_BiosTeletypeOutput
    43     WAIT_RETRACE_IF_NECESSARY_THEN stosw
    44     ret
     43    JMP_WAIT_FOR_RETRACE_IF_NECESSARY_THEN stosw
    4544
    4645ALIGN DISPLAY_JUMP_ALIGN
    … …  
    9695    xchg    al, ah              ; Swap character and attribute
    9796    inc     di                  ; Skip character
    98     WAIT_RETRACE_IF_NECESSARY_THEN stosb
    99     ret
     97    JMP_WAIT_FOR_RETRACE_IF_NECESSARY_THEN stosb
    10098
    10199ALIGN DISPLAY_JUMP_ALIGN
    102100DisplayCharOut_Character:
    103     WAIT_RETRACE_IF_NECESSARY_THEN stosb
     101    CALL_WAIT_FOR_RETRACE_IF_NECESSARY_THEN stosb
    104102    inc     di                  ; Skip attribute
    105103    ret
    … …  
    107105ALIGN DISPLAY_JUMP_ALIGN
    108106DisplayCharOut_CharacterWithAttribute:
    109     WAIT_RETRACE_IF_NECESSARY_THEN stosw
    110     ret
     107    JMP_WAIT_FOR_RETRACE_IF_NECESSARY_THEN stosw
    111108
    112109

  • trunk/Assembly_Library/Src/Display/DisplayFormat.asm

    r526 r589  
    269269    jz      SHORT .CopyWithoutDisplayProcessing
    270270
    271     WAIT_RETRACE_IF_NECESSARY_THEN rep movsb
     271    CALL_WAIT_FOR_RETRACE_IF_NECESSARY_THEN rep movsb
    272272    dec     di                  ; Point to preceeding character instead of attribute
    273273    ret
     274
    274275ALIGN DISPLAY_JUMP_ALIGN
    275276.CopyWithoutDisplayProcessing:

  • trunk/Assembly_Library/Src/Display/DisplayPage.asm

    r526 r589  
    4343%ifdef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    4444    %define EXCLUDE
    45     %ifdef MODULE_HOTKEYS
    46         %undef EXCLUDE
    47     %endif
    48     %ifdef MODULE_BOOT_MENU
     45    %ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU
    4946        %undef EXCLUDE
    5047    %endif

  • trunk/Assembly_Library/Src/Display/DisplayPrint.asm

    r580 r589  
    296296        %undef EXCLUDE
    297297    %endif
    298     %ifdef MODULE_HOTKEYS
    299         %undef EXCLUDE
    300     %endif
    301     %ifdef MODULE_BOOT_MENU
     298    %ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU
    302299        %undef EXCLUDE
    303300    %endif

  • trunk/Assembly_Library/Src/File/Drive.asm

    r526 r589  
    8686    xchg    dx, ax          ; Default drive to DL
    8787    call    Drive_SetDefaultFromDL
    88     eMOVZX  cx, al          ; Number of potentially valid drive letters available
    89     cmp     cl, 32
    90     jb      SHORT .Return
    91     mov     cl, 32
    92 ALIGN JUMP_ALIGN, ret
    93 .Return:
     88    cmp     al, 32          ; Number of potentially valid drive letters available
     89    jb      SHORT .Below32
     90    mov     al, 32
     91.Below32:
     92    cbw
     93    xchg    cx, ax
    9494    ret
    9595
    … …  
    133133
    134134    inc     dx          ; Default drive is 00h and first drive is 01h
     135    mov     ax, CHECK_IF_BLOCK_DEVICE_REMOTE    ; Needs DOS 3.1+
     136    mov     bx, dx
     137    push    dx
     138    int     DOS_INTERRUPT_21h
     139    pop     dx
     140    jnc     SHORT .DriveIsValid
     141    cmp     ax, ERR_DOS_INVALID_DRIVE
     142    je      SHORT .DriveIsNotValid
     143    ; Fall back to old method if ERR_DOS_FUNCTION_NUMBER_INVALID
     144
    135145    mov     ah, GET_DOS_DRIVE_PARAMETER_BLOCK_FOR_SPECIFIC_DRIVE
    136146    int     DOS_INTERRUPT_21h
     147.DriveIsValid:
     148.DriveIsNotValid:
    137149    dec     dx
    138150    test    al, al

  • trunk/Assembly_Library/Src/Keyboard/Keyboard.asm

    r581 r589  
    291291%ifdef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    292292    %define EXCLUDE
    293     %ifdef MODULE_HOTKEYS
    294         %undef EXCLUDE
    295     %endif
    296     %ifdef MODULE_BOOT_MENU
     293    %ifdef MODULE_HOTKEYS OR MODULE_BOOT_MENU
    297294        %undef EXCLUDE
    298295    %endif

  • trunk/Assembly_Library/Src/Menu/CharOutLineSplitter.asm

    r526 r589  
    162162    push    si
    163163    push    cx
    164     WAIT_RETRACE_IF_NECESSARY_THEN rep movsb
     164    CALL_WAIT_FOR_RETRACE_IF_NECESSARY_THEN rep movsb
    165165    pop     cx
    166166    pop     si

  • trunk/Assembly_Library/Src/Menu/Dialog/DialogFile.asm

    r568 r589  
    239239; AppendFileFromDTAinDSSItoOffScreenBuffer
    240240;   Parameters:
    241 ;       CX:     Files/directores found
     241;       CX:     Files/directories found
    242242;       DL:     Zero if root directory selected
    243243;       DS:SI:  Ptr to DTA containing file information

  • trunk/Assembly_Library/Src/Menu/MenuLoop.asm

    r581 r589  
    106106%ifndef MENU_NO_ESC
    107107    cmp     al, ESC
    108     je      SHORT .LeaveMenuWithoutSelectingItem
    109 %endif
    110     cmp     al, CR
    111     je      SHORT .SelectItem
    112 
    113     test    BYTE [bp+MENU.bFlags], FLG_MENU_USER_HANDLES_SCROLLING
    114     jz      SHORT MenuLoop_ProcessScrollingKeysFromAX
    115     ret     ; Return with CF cleared since keystroke not processed
    116 
    117 %ifndef MENU_NO_ESC
    118 ALIGN MENU_JUMP_ALIGN
    119 .LeaveMenuWithoutSelectingItem:
     108    jne     SHORT .NotEscape
     109
     110    ; Leave menu without selecting item
    120111    call    MenuEvent_ExitMenu
    121112    jnc     SHORT .CancelMenuExit
    … …  
    128119
    129120ALIGN MENU_JUMP_ALIGN
    130 .SelectItem:
     121.NotEscape:
     122    cmp     al, CR
     123    jne     SHORT .NotCarriageReturn
     124
     125    ; Select item
    131126    mov     cx, [bp+MENUINIT.wHighlightedItem]
    132127    call    MenuEvent_ItemSelectedFromCX
    133128    stc
    134     ret
     129.Return:
     130    ret
     131
     132ALIGN MENU_JUMP_ALIGN
     133.NotCarriageReturn:
     134    test    BYTE [bp+MENU.bFlags], FLG_MENU_USER_HANDLES_SCROLLING
     135    jnz     SHORT .Return   ; With CF cleared since keystroke not processed
     136    ; Fall to MenuLoop_ProcessScrollingKeysFromAX
    135137
    136138
    … …  
    172174.ChangeToPreviousPage:
    173175    call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
    174     xchg    ax, cx
    175     neg     ax
    176     mov     cx, [bp+MENUINIT.wHighlightedItem]
    177     add     cx, ax
     176    neg     cx
     177    mov     ax, cx
     178    add     cx, [bp+MENUINIT.wHighlightedItem]
    178179    jge     SHORT .MoveHighlightedItemByAX  ; No rotation for PgUp
    179180    ; Fall to .SelectFirstItem
    … …  
    187188.ChangeToNextPage:
    188189    call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
    189     xchg    ax, cx
    190     mov     cx, [bp+MENUINIT.wHighlightedItem]
    191     add     cx, ax
     190    mov     ax, cx
     191    add     cx, [bp+MENUINIT.wHighlightedItem]
    192192    cmp     cx, [bp+MENUINIT.wItems]
    193193    jb      SHORT .MoveHighlightedItemByAX  ; No rotation for PgDn

  • trunk/Assembly_Library/Src/Serial/SerialServerScan.asm

    r567 r589  
    4646
    4747        test    dx, dx
    48         jnz     short SerialServerScan_CheckForServer_PortAndBaudInDX
     48        jnz     SHORT SerialServerScan_CheckForServer_PortAndBaudInDX
    4949
    50         mov     di,.scanPortAddresses-1
    51         mov     ch,1            ;  tell server that we are scanning
     50        mov     di, .scanPortAddresses-1
     51        mov     ch, 1           ;  tell server that we are scanning
    5252
    5353.nextPort:
    5454        inc     di              ; load next port address
    55         xor     dh, dh
    56         mov     dl,[cs:di]
     55        mov     dh, 40h         ; Clear DH and make sure CF is set if error
     56        mov     dl, [cs:di]
    5757        eSHL_IM dx, 2           ; shift from one byte to two
    58         stc                     ; setup error code for exit
    59         jz      .error
     58        jz      SHORT .error
    6059
    6160;
    … …  
    6362;
    6463        push    dx
    65         add     dl,Serial_UART_lineControl
    66         mov     al, 09ah
     64        add     dl, Serial_UART_lineControl
     65        mov     al, 9Ah
    6766        out     dx, al
    6867        in      al, dx
    6968        pop     dx
    70         cmp     al, 09ah
    71         jnz     .nextPort
     69        cmp     al, 9Ah
     70        jne     SHORT .nextPort
    7271
    73         mov     al, 0ch
     72        mov     al, 0Ch
    7473        out     dx, al
    7574        in      al, dx
    76         cmp     al, 0ch
    77         jnz     .nextPort
     75        cmp     al, 0Ch
     76        jne     SHORT .nextPort
    7877
    7978;
    … …  
    8483; *on the server side* if the client side had a 4x clock multiplier, a 2x clock multiplier, or no clock multiplier.
    8584;
    86 ; Starting with 30h, that means 30h (2400 baud), 18h (4800 baud), 0ch (9600 baud), and
     85; Starting with 30h, that means 30h (2400 baud), 18h (4800 baud), 0Ch (9600 baud), and
    8786;                               04h (28800 baud), 02h (57600 baud), 01h (115200 baud)
    8887;
    89 ; Note: hardware baud multipliers (2x, 4x) will impact the final baud rate and are not known at this level
     88; Note: hardware baud multipliers (2x, 4x, 8x) will impact the final baud rate and are not known at this level
    9089;
    91         mov     dh,030h * 2     ; multiply by 2 since we are about to divide by 2
    92         mov     dl,[cs:di]      ; restore single byte port address for scan
     90        mov     dh, 30h * 2     ; multiply by 2 since we are about to divide by 2
     91        mov     dl, [cs:di]     ; restore single byte port address for scan
    9392
    9493.nextBaud:
    95         shr     dh,1
    96         jz      .nextPort
    97         cmp     dh,6            ; skip from 6 to 4, to move from the top of the 9600 baud range
    98         jnz     .testBaud       ; to the bottom of the 115200 baud range
    99         mov     dh,4
     94        shr     dh, 1
     95        jz      SHORT .nextPort
     96        cmp     dh, 6           ; skip from 6 to 4, to move from the top of the 9600 baud range
     97        jne     SHORT .testBaud ; to the bottom of the 115200 baud range
     98        mov     dh, 4
    10099
    101100.testBaud:
    102101        call    SerialServerScan_CheckForServer_PortAndBaudInDX
    103         jc      .nextBaud
     102        jc      SHORT .nextBaud
    104103
    105104.error:
    … …  
    135134SerialServerScan_CheckForServer_PortAndBaudInDX:
    136135        push    bp              ; setup fake SerialServer_Command
    137 
    138136        push    dx              ; send port baud and rate, returned in inquire packet
    139137                                ; (and possibly returned in the drive identification string)
    140 
    141138        push    cx              ; send number of sectors, and if it is on a scan or not
    142 
    143         mov     bl,SerialServer_Command_Inquire         ; protocol command onto stack with bh
     139        mov     bl, SerialServer_Command_Inquire        ; protocol command onto stack with bh
    144140        push    bx
    145141
    146         mov     bp,sp
    147 
     142        mov     bp, sp
    148143        call    SerialServer_SendReceive
    149144

  • trunk/Assembly_Library/Src/Util/Math.asm

    r526 r589  
    3636ALIGN JUMP_ALIGN
    3737Math_DivQWatSSBPbyCX:
     38%if 1
    3839    xor     dx, dx
    3940    mov     ax, [bp+6]      ; Load highest divident WORD to DX:AX
    … …  
    5354    mov     [bp], ax
    5455    ret
     56%else ; ~1
     57; This is about half the size compared to the above code but it's not tested which is why it's commented away.
     58    push    di
     59    mov     di, 6
     60    xor     dx, dx
     61.Next:
     62    mov     ax, [bp+di]
     63    div     cx
     64    mov     [bp+di], ax
     65    dec     di
     66    dec     di
     67    jns     .Next
     68    pop     di
     69    ret
     70%endif ; 1
    5571%endif
    5672
Note: See TracChangeset for help on using the changeset viewer.