Changeset 589 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages

Timestamp:

May 22, 2016, 12:26:57 PM (9 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:

• ConfigurationMenu.asm (modified) (9 diffs)
• FlashMenu.asm (modified) (1 diff)
• IdeControllerMenu.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/ConfigurationMenu.asm

@@ -177 +177 @@
         %assign i i+1
     %endrep
-    ;   dw  NULL    ; Is this needed? *FIXME*
+        dw  NULL
+
 
 ; Section containing code
@@ -285 +286 @@
     call    Buffers_GetRomvarsFlagsToAX
     mov     bx, g_MenuitemConfigurationIdleTimeout
-    test    ax, FLG_ROMVARS_MODULE_POWER_MANAGEMENT
+    test    al, FLG_ROMVARS_MODULE_POWER_MANAGEMENT
     jz      SHORT .DisableMenuitemFromCSBX
     ; Fall to .EnableMenuitemFromCSBX
@@ -393 +394 @@
     push    es
     pop     ds
-    xor     ch, ch                      ; clearing high order of CX and notification flag
-    mov     dx, cx                      ; (probably unnecessary, CX should be less than 127, but just to be sure)
-    jcxz    .done                       ; probably unnecessary, but make sure there is at least one controller
+    mov     dx, cx                      ; Controller count to DL (will always be at least 1) while also clearing notification flag in DH
 
     lea     bx, [di+ROMVARS.ideVars0]   ; add in offset of first idevars
@@ -404 +403 @@
     xor     ax, ax                      ; first non-serial found
     mov     cl, dl                      ; idevars count
-    xor     ch, ch
 
 .loop:
-    cmp     byte [di+IDEVARS.bDevice], DEVICE_SERIAL_PORT
-    jnz     .notSerial
+    cmp     BYTE [di+IDEVARS.bDevice], DEVICE_SERIAL_PORT
+    jne     SHORT .notSerial
 
     test    si, si                      ; record the first serial controller that we find
-    jnz     .next
+    jnz     SHORT .next
     mov     si, di
     SKIP2B  f
@@ -423 +421 @@
 
     test    si, si                      ; no serial drives, nothing to do
-    jz      .done
+    jz      SHORT .done
     cmp     si, ax                      ; serial port is already later on the list than any other controllers
-    ja      .done                       ; (also takes care of the case where there are no other controllers)
+    ja      SHORT .done                 ; (also takes care of the case where there are no other controllers)
 
 ;
@@ -438 +436 @@
     mov     di, sp
 
-    mov     cx, IDEVARS_size
     push    ss
     pop     es
 
+%if IDEVARS_size & 1
+    mov     cl, IDEVARS_size
     rep movsb
+%else
+    mov     cl, IDEVARS_size / 2
+    rep movsw
+%endif
 
     lea     di, [si-IDEVARS_size]       ; move up all the idevars below the serial, by one slot
@@ -457 +460 @@
     push    ss
     pop     ds
-    mov     cx, IDEVARS_size
     ; di is already at last IDEVARS position
 
+%if IDEVARS_size & 1
+    mov     cl, IDEVARS_size
     rep movsb
+%else
+    mov     cl, IDEVARS_size / 2
+    rep movsw
+%endif
 
     add     sp, IDEVARS_size
@@ -469 +477 @@
     mov     dh, 1                       ; set flag that we have done a relocation
 
-    jmp     .outerLoop
+    jmp     SHORT .outerLoop
 
 .done:
@@ -478 +486 @@
 
     test    dh, dh
-    jz      .noWorkDone
+    jz      SHORT .noWorkDone
 
     mov     dx, g_szSerialMoved

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/FlashMenu.asm

@@ -328 +328 @@
     call    .GetSelectedEepromSizeInWordsToAX
     xor     dx, dx
-    shl     ax, 1       ; Size in bytes to...
-    rcl     dx, 1       ; ...DX:AX
+    eSHL_IM ax, 1       ; Size in bytes to...
+    eRCL_IM dx, 1       ; ...DX:AX
 
     cmp     WORD [si+FLASHVARS.wEepromPageSize], BYTE 1

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/IdeControllerMenu.asm

@@ -571 +571 @@
 
 
-;
-; No change to Device byte, but use this opportunity to change defaults stored in wPort and wPortCtrl if we are
-; changing in/out of a Serial device (since we use these bytes in radically different ways).
-;
 ALIGN JUMP_ALIGN
 IdeControllerMenu_WriteDevice:
@@ -581 +577 @@
     push    ax
 
+    mov     bl, [es:di]                         ; What is the current Device we are changing from?
+    sub     di, BYTE IDEVARS.bDevice - IDEVARS.wBasePort    ; Get ready to set the Port addresses
+
     ; Note! AL is the choice index, not device code
-    shl     ax, 1                               ; Selection to device code
-    mov     bl, [es:di]                         ; what is the current Device we are changing from?
-    sub     di, BYTE IDEVARS.bDevice - IDEVARS.wBasePort    ; Get ready to set the Port addresses
+    shl     al, 1                               ; Selection to device code
+
+    ; Restore ports and other stuff to default values
+    jz      SHORT .StandardIdeDevice            ; DEVICE_16BIT_ATA
+
+    cmp     al, DEVICE_8BIT_ATA
+    ja      SHORT .NotStandardIdeDevice
+    jb      SHORT .AdvancedAtaDevice            ; DEVICE_32BIT_ATA
+    test    BYTE [es:ROMVARS.wFlags], FLG_ROMVARS_MODULE_8BIT_IDE
+    jmp     SHORT .CheckZF
+
+.AdvancedAtaDevice:
+    test    BYTE [es:ROMVARS.wFlags+1], FLG_ROMVARS_MODULE_ADVANCED_ATA >> 8
+.CheckZF:
+    jz      SHORT .SupportForDeviceNotAvailable
+
+    ; Standard ATA controllers, including 8-bit mode
+.StandardIdeDevice:
+    lea     ax, [di-ROMVARS.ideVars0+IDEVARS.wBasePort]
+    mov     bl, IDEVARS_size
+    div     bl
+    mov     bx, .rgbLowByteOfStdIdeInterfacePorts
+    xlat
+    mov     ah, 1                               ; DEVICE_ATA_*_PORT >> 8
+    mov     bh, 3                               ; DEVICE_ATA_*_PORTCTRL >> 8
+    mov     bl, al
+    jmp     SHORT .WriteNonSerial
+
+.rgbLowByteOfStdIdeInterfacePorts:              ; Defaults for 16-bit and better ATA devices
+    db      DEVICE_ATA_PRIMARY_PORT     & 0FFh
+    db      DEVICE_ATA_SECONDARY_PORT   & 0FFh
+    db      DEVICE_ATA_TERTIARY_PORT    & 0FFh
+    db      DEVICE_ATA_QUATERNARY_PORT  & 0FFh
+
+.NotStandardIdeDevice:
     cmp     al, DEVICE_SERIAL_PORT
-    je      SHORT .ChangingToSerial
+    jb      SHORT .NotSerialDevice
+    test    BYTE [es:ROMVARS.wFlags+1], FLG_ROMVARS_MODULE_SERIAL >> 8
+    jnz     SHORT .ChangingToSerial
+
+.SupportForDeviceNotAvailable:
+    push    dx
+    mov     dx, g_szUnsupportedDevice
+    call    Dialogs_DisplayErrorFromCSDX
+    pop     dx
+
+    ; Restore device type to the previous value
+    pop     ax                                  ; Get choice index from stack
+    mov     al, bl                              ; Previous device type to AL
+    shr     al, 1                               ; Device code to choice index
+    jmp     SHORT .DoneWithNoChangeOfDevice
+
+.NotSerialDevice:
+    ; Remaining device types all require MODULE_8BIT_IDE or MODULE_8BIT_IDE_ADVANCED
+    test    BYTE [es:ROMVARS.wFlags], FLG_ROMVARS_MODULE_8BIT_IDE | FLG_ROMVARS_MODULE_8BIT_IDE_ADVANCED
+    jz      SHORT .SupportForDeviceNotAvailable
+
+    ; We know MODULE_8BIT_IDE is included
+    lahf    ; Save the PF
+    cmp     al, DEVICE_8BIT_XTIDE_REV2
+    jbe     SHORT .ChangingToXTIDEorXTCF
+    sahf    ; Restore the PF
+    jpo     SHORT .SupportForDeviceNotAvailable ; Jump if no MODULE_8BIT_IDE_ADVANCED
     cmp     al, DEVICE_8BIT_JRIDE_ISA
     je      SHORT .ChangingToJrIdeIsa
@@ -592 +649 @@
     je      SHORT .ChangingToADP50L
 
-    ; Restore ports to default values
-    cmp     al, DEVICE_8BIT_ATA                 ; Standard ATA controllers, including 8-bit mode
-    mov     ax, DEVICE_ATA_PRIMARY_PORT         ; Defaults for 16-bit and better ATA devices
-    mov     bx, DEVICE_ATA_PRIMARY_PORTCTRL
-    jbe     SHORT .WriteNonSerial
-
+.ChangingToXTIDEorXTCF:
     mov     ax, DEVICE_XTIDE_DEFAULT_PORT       ; Defaults for 8-bit XTIDE and XT-CF devices
     mov     bx, DEVICE_XTIDE_DEFAULT_PORTCTRL
@@ -631 +683 @@
 .Done:
     pop     ax
+.DoneWithNoChangeOfDevice:
     pop     di          ; IDEVARS.bDevice
     pop     bx