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/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/ConfigurationMenu.asm

    r567 r589  
    177177        %assign i i+1
    178178    %endrep
    179     ;   dw  NULL    ; Is this needed? *FIXME*
     179        dw  NULL
     180
    180181
    181182; Section containing code
     
    285286    call    Buffers_GetRomvarsFlagsToAX
    286287    mov     bx, g_MenuitemConfigurationIdleTimeout
    287     test    ax, FLG_ROMVARS_MODULE_POWER_MANAGEMENT
     288    test    al, FLG_ROMVARS_MODULE_POWER_MANAGEMENT
    288289    jz      SHORT .DisableMenuitemFromCSBX
    289290    ; Fall to .EnableMenuitemFromCSBX
     
    393394    push    es
    394395    pop     ds
    395     xor     ch, ch                      ; clearing high order of CX and notification flag
    396     mov     dx, cx                      ; (probably unnecessary, CX should be less than 127, but just to be sure)
    397     jcxz    .done                       ; probably unnecessary, but make sure there is at least one controller
     396    mov     dx, cx                      ; Controller count to DL (will always be at least 1) while also clearing notification flag in DH
    398397
    399398    lea     bx, [di+ROMVARS.ideVars0]   ; add in offset of first idevars
     
    404403    xor     ax, ax                      ; first non-serial found
    405404    mov     cl, dl                      ; idevars count
    406     xor     ch, ch
    407405
    408406.loop:
    409     cmp     byte [di+IDEVARS.bDevice], DEVICE_SERIAL_PORT
    410     jnz     .notSerial
     407    cmp     BYTE [di+IDEVARS.bDevice], DEVICE_SERIAL_PORT
     408    jne     SHORT .notSerial
    411409
    412410    test    si, si                      ; record the first serial controller that we find
    413     jnz     .next
     411    jnz     SHORT .next
    414412    mov     si, di
    415413    SKIP2B  f
     
    423421
    424422    test    si, si                      ; no serial drives, nothing to do
    425     jz      .done
     423    jz      SHORT .done
    426424    cmp     si, ax                      ; serial port is already later on the list than any other controllers
    427     ja      .done                       ; (also takes care of the case where there are no other controllers)
     425    ja      SHORT .done                 ; (also takes care of the case where there are no other controllers)
    428426
    429427;
     
    438436    mov     di, sp
    439437
    440     mov     cx, IDEVARS_size
    441438    push    ss
    442439    pop     es
    443440
     441%if IDEVARS_size & 1
     442    mov     cl, IDEVARS_size
    444443    rep movsb
     444%else
     445    mov     cl, IDEVARS_size / 2
     446    rep movsw
     447%endif
    445448
    446449    lea     di, [si-IDEVARS_size]       ; move up all the idevars below the serial, by one slot
     
    457460    push    ss
    458461    pop     ds
    459     mov     cx, IDEVARS_size
    460462    ; di is already at last IDEVARS position
    461463
     464%if IDEVARS_size & 1
     465    mov     cl, IDEVARS_size
    462466    rep movsb
     467%else
     468    mov     cl, IDEVARS_size / 2
     469    rep movsw
     470%endif
    463471
    464472    add     sp, IDEVARS_size
     
    469477    mov     dh, 1                       ; set flag that we have done a relocation
    470478
    471     jmp     .outerLoop
     479    jmp     SHORT .outerLoop
    472480
    473481.done:
     
    478486
    479487    test    dh, dh
    480     jz      .noWorkDone
     488    jz      SHORT .noWorkDone
    481489
    482490    mov     dx, g_szSerialMoved
  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/FlashMenu.asm

    r568 r589  
    328328    call    .GetSelectedEepromSizeInWordsToAX
    329329    xor     dx, dx
    330     shl     ax, 1       ; Size in bytes to...
    331     rcl     dx, 1       ; ...DX:AX
     330    eSHL_IM ax, 1       ; Size in bytes to...
     331    eRCL_IM dx, 1       ; ...DX:AX
    332332
    333333    cmp     WORD [si+FLASHVARS.wEepromPageSize], BYTE 1
  • trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/IdeControllerMenu.asm

    r588 r589  
    571571
    572572
    573 ;
    574 ; No change to Device byte, but use this opportunity to change defaults stored in wPort and wPortCtrl if we are
    575 ; changing in/out of a Serial device (since we use these bytes in radically different ways).
    576 ;
    577573ALIGN JUMP_ALIGN
    578574IdeControllerMenu_WriteDevice:
     
    581577    push    ax
    582578
     579    mov     bl, [es:di]                         ; What is the current Device we are changing from?
     580    sub     di, BYTE IDEVARS.bDevice - IDEVARS.wBasePort    ; Get ready to set the Port addresses
     581
    583582    ; Note! AL is the choice index, not device code
    584     shl     ax, 1                               ; Selection to device code
    585     mov     bl, [es:di]                         ; what is the current Device we are changing from?
    586     sub     di, BYTE IDEVARS.bDevice - IDEVARS.wBasePort    ; Get ready to set the Port addresses
     583    shl     al, 1                               ; Selection to device code
     584
     585    ; Restore ports and other stuff to default values
     586    jz      SHORT .StandardIdeDevice            ; DEVICE_16BIT_ATA
     587
     588    cmp     al, DEVICE_8BIT_ATA
     589    ja      SHORT .NotStandardIdeDevice
     590    jb      SHORT .AdvancedAtaDevice            ; DEVICE_32BIT_ATA
     591    test    BYTE [es:ROMVARS.wFlags], FLG_ROMVARS_MODULE_8BIT_IDE
     592    jmp     SHORT .CheckZF
     593
     594.AdvancedAtaDevice:
     595    test    BYTE [es:ROMVARS.wFlags+1], FLG_ROMVARS_MODULE_ADVANCED_ATA >> 8
     596.CheckZF:
     597    jz      SHORT .SupportForDeviceNotAvailable
     598
     599    ; Standard ATA controllers, including 8-bit mode
     600.StandardIdeDevice:
     601    lea     ax, [di-ROMVARS.ideVars0+IDEVARS.wBasePort]
     602    mov     bl, IDEVARS_size
     603    div     bl
     604    mov     bx, .rgbLowByteOfStdIdeInterfacePorts
     605    xlat
     606    mov     ah, 1                               ; DEVICE_ATA_*_PORT >> 8
     607    mov     bh, 3                               ; DEVICE_ATA_*_PORTCTRL >> 8
     608    mov     bl, al
     609    jmp     SHORT .WriteNonSerial
     610
     611.rgbLowByteOfStdIdeInterfacePorts:              ; Defaults for 16-bit and better ATA devices
     612    db      DEVICE_ATA_PRIMARY_PORT     & 0FFh
     613    db      DEVICE_ATA_SECONDARY_PORT   & 0FFh
     614    db      DEVICE_ATA_TERTIARY_PORT    & 0FFh
     615    db      DEVICE_ATA_QUATERNARY_PORT  & 0FFh
     616
     617.NotStandardIdeDevice:
    587618    cmp     al, DEVICE_SERIAL_PORT
    588     je      SHORT .ChangingToSerial
     619    jb      SHORT .NotSerialDevice
     620    test    BYTE [es:ROMVARS.wFlags+1], FLG_ROMVARS_MODULE_SERIAL >> 8
     621    jnz     SHORT .ChangingToSerial
     622
     623.SupportForDeviceNotAvailable:
     624    push    dx
     625    mov     dx, g_szUnsupportedDevice
     626    call    Dialogs_DisplayErrorFromCSDX
     627    pop     dx
     628
     629    ; Restore device type to the previous value
     630    pop     ax                                  ; Get choice index from stack
     631    mov     al, bl                              ; Previous device type to AL
     632    shr     al, 1                               ; Device code to choice index
     633    jmp     SHORT .DoneWithNoChangeOfDevice
     634
     635.NotSerialDevice:
     636    ; Remaining device types all require MODULE_8BIT_IDE or MODULE_8BIT_IDE_ADVANCED
     637    test    BYTE [es:ROMVARS.wFlags], FLG_ROMVARS_MODULE_8BIT_IDE | FLG_ROMVARS_MODULE_8BIT_IDE_ADVANCED
     638    jz      SHORT .SupportForDeviceNotAvailable
     639
     640    ; We know MODULE_8BIT_IDE is included
     641    lahf    ; Save the PF
     642    cmp     al, DEVICE_8BIT_XTIDE_REV2
     643    jbe     SHORT .ChangingToXTIDEorXTCF
     644    sahf    ; Restore the PF
     645    jpo     SHORT .SupportForDeviceNotAvailable ; Jump if no MODULE_8BIT_IDE_ADVANCED
    589646    cmp     al, DEVICE_8BIT_JRIDE_ISA
    590647    je      SHORT .ChangingToJrIdeIsa
     
    592649    je      SHORT .ChangingToADP50L
    593650
    594     ; Restore ports to default values
    595     cmp     al, DEVICE_8BIT_ATA                 ; Standard ATA controllers, including 8-bit mode
    596     mov     ax, DEVICE_ATA_PRIMARY_PORT         ; Defaults for 16-bit and better ATA devices
    597     mov     bx, DEVICE_ATA_PRIMARY_PORTCTRL
    598     jbe     SHORT .WriteNonSerial
    599 
     651.ChangingToXTIDEorXTCF:
    600652    mov     ax, DEVICE_XTIDE_DEFAULT_PORT       ; Defaults for 8-bit XTIDE and XT-CF devices
    601653    mov     bx, DEVICE_XTIDE_DEFAULT_PORTCTRL
     
    631683.Done:
    632684    pop     ax
     685.DoneWithNoChangeOfDevice:
    633686    pop     di          ; IDEVARS.bDevice
    634687    pop     bx
Note: See TracChangeset for help on using the changeset viewer.