Changeset 293 in xtideuniversalbios for trunk/Configurator/Src/Menupages

Timestamp:

Mar 4, 2012, 1:33:52 AM (13 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Commit 1/2 (Library, Configurators and Serial Server):

• Changed Emulate.inc so that making 286 and 386 versions now works. Additionally, only one processor type define is needed in the makefile.
• Minor optimizations.
• Fixed spelling and did some cleaning.

Location:

trunk/Configurator/Src/Menupages

Files:

• ConfigurationMenu.asm (modified) (5 diffs)
• DrvParamsMenu.asm (modified) (2 diffs)
• FlashMenu.asm (modified) (7 diffs)
• IdeControllerMenu.asm (modified) (3 diffs)

trunk/Configurator/Src/Menupages/ConfigurationMenu.asm

@@ -1 @@
-; File name     :   ConfigurationMenu.asm
-; Project name  :   XTIDE Univeral BIOS Configurator
-; Created date  :   21.4.2010
-; Last update   :   2.5.2010
-; Author        :   Tomi Tilli
+; Project name  :   XTIDE Universal BIOS Configurator
 ; Description   :   XTIDE Universal BIOS configuration menu.
 
@@ -226 +222 @@
 ;       SS:BP:  Ptr to MENUVARS
 ;   Returns:
-;       CF:     Set if user data inputted succesfully
+;       CF:     Set if user data inputted successfully
 ;               Cleared if cancel
 ;   Corrupts registers:
@@ -245 +241 @@
 ;       SS:BP:  Ptr to MENUVARS
 ;   Returns:
-;       CF:     Set if user data inputted succesfully
+;       CF:     Set if user data inputted successfully
 ;               Cleared if cancel
 ;   Corrupts registers:
@@ -358 +354 @@
     call    ConfigurationMenu_GetNumberOfIdeControllers
     dec     cx                  ; First always visible
-    jcxz    .Return
+    jz      .Return
     mov     bx, g_MenuPageItemCfgIde2+MENUPAGEITEM.bFlags
 ALIGN JUMP_ALIGN
@@ -381 +377 @@
 ALIGN JUMP_ALIGN
 ConfigurationMenu_GetNumberOfIdeControllers:
+    mov     cx, 1               ; Assume one controller for Lite mode
     test    WORD [g_cfgVars+CFGVARS.rgbEepromBuffers+ROMVARS.wFlags], FLG_ROMVARS_FULLMODE
-    jz      SHORT .ReturnOneControllerForLiteMode
-    eMOVZX  cx, BYTE [g_cfgVars+CFGVARS.rgbEepromBuffers+ROMVARS.bIdeCnt]
-    ret
-ALIGN JUMP_ALIGN
-.ReturnOneControllerForLiteMode:
-    mov     cx, 1
-    ret
+    jz      SHORT .Return
+    mov     cl, [g_cfgVars+CFGVARS.rgbEepromBuffers+ROMVARS.bIdeCnt]
+ALIGN JUMP_ALIGN, ret
+.Return:
+    ret

trunk/Configurator/Src/Menupages/DrvParamsMenu.asm

@@ -1 @@
-; File name     :   DrvParamsMenu.asm
-; Project name  :   XTIDE Univeral BIOS Configurator
-; Created date  :   26.4.2010
-; Last update   :   27.4.2010
-; Author        :   Tomi Tilli
+; Project name  :   XTIDE Universal BIOS Configurator
 ; Description   :   Menu for configuring DRVPARAMS.
 
@@ -109 +105 @@
 ALIGN JUMP_ALIGN
 DrvParamsMenu_SetDrvParamsOffset:
-    eMOVZX  cx, BYTE [g_MenuPageDrvParams+MENUPAGE.bItemCnt]
+    eMOVZX  cx, [g_MenuPageDrvParams+MENUPAGE.bItemCnt]
     dec     cx
     mov     bx, g_MenuPageItemDrvBlockMode+MENUPAGEITEM.pValue

trunk/Configurator/Src/Menupages/FlashMenu.asm

@@ -1 @@
-; Project name  :   XTIDE Univeral BIOS Configurator
+; Project name  :   XTIDE Universal BIOS Configurator
 ; Description   :   Flash menu.
 
 
 ; Flash error codes returned from progress bar task function
-ERR_FLASH_SUCCESSFULL   EQU     0
+ERR_FLASH_SUCCESSFUL    EQU     0
 ERR_FLASH_POLL_TIMEOUT  EQU     1
 
@@ -132 +132 @@
     call    MenuPageItem_GetByteFromUserWithoutMarkingUnsaved
     jnc     SHORT .Cancel
-    eMOVZX  bx, BYTE [g_cfgVars+CFGVARS.bPageSize]
+    eMOVZX  bx, [g_cfgVars+CFGVARS.bPageSize]
     eBSR    ax, bx                  ; AX = Index of highest order bit
     mov     cx, 1
@@ -185 +185 @@
     xor     dx, dx
     mov     ax, [g_cfgVars+CFGVARS.wEepromSize]     ; DX:AX = Bytes to write
-    eMOVZX  cx, BYTE [g_cfgVars+CFGVARS.bPageSize]
+    eMOVZX  cx, [g_cfgVars+CFGVARS.bPageSize]
     div     cx                                      ; AX = Total number of pages
     mov     [g_cfgVars+CFGVARS.flashVars+FLASHVARS.wTotalPages], ax
@@ -255 +255 @@
 ALIGN JUMP_ALIGN
 .FlashComplete:
-    mov     ax, ERR_FLASH_SUCCESSFULL
+    mov     ax, ERR_FLASH_SUCCESSFUL
     retf
 .Timeout:
@@ -278 +278 @@
     mov     ax, [si+FLASHVARS.wTotalPages]
     sub     ax, [si+FLASHVARS.wPagesLeft]           ; AX=Pages written
-    eMOVZX  dx, BYTE [g_cfgVars+CFGVARS.bPageSize]
+    eMOVZX  dx, [g_cfgVars+CFGVARS.bPageSize]
     mul     dx                                      ; AX=Bytes written
 
@@ -311 +311 @@
     mov     dx, [si+FLASHVARS.wPagesBeforeDraw]
     call    FlashMenu_GetPointersToPageToFlash
-    eMOVZX  ax, BYTE [g_cfgVars+CFGVARS.bSdpCommand]
-    eMOVZX  cx, BYTE [g_cfgVars+CFGVARS.bPageSize]
+    eMOVZX  ax, [g_cfgVars+CFGVARS.bSdpCommand]
+    eMOVZX  cx, [g_cfgVars+CFGVARS.bPageSize]
 ALIGN JUMP_ALIGN
 .PageLoop:
@@ -405 +405 @@
     cmp     ax, ERR_FLASH_POLL_TIMEOUT
     je      SHORT FlashMenu_PollingTimeoutErrorDuringFlashing
-    call    Flash_WasDataWriteSuccessfull
+    call    Flash_WasDataWriteSuccessful
     jne     SHORT FlashMenu_DataVerifyErrorAfterFlashing
     ; Fall to FlashMenu_EepromFlashedSuccessfully

trunk/Configurator/Src/Menupages/IdeControllerMenu.asm

@@ -1 @@
-; File name     :   IdeControllerMenu.asm
-; Project name  :   XTIDE Univeral BIOS Configurator
-; Created date  :   23.4.2010
-; Last update   :   27.4.2010
-; Author        :   Tomi Tilli
+; Project name  :   XTIDE Universal BIOS Configurator
 ; Description   :   Menu for configuring IDEVARS.
 
@@ -119 +115 @@
 
 ;--------------------------------------------------------------------
-; Stores IDEVARS specific pointers to IDE Controller Menu 
+; Stores IDEVARS specific pointers to IDE Controller Menu
 ; MENUPAGEITEM structs.
 ;
@@ -133 +129 @@
 ALIGN JUMP_ALIGN
 IdeControllerMenu_SetIdevarsOffset:
-    eMOVZX  cx, BYTE [g_MenuPageIdeVars+MENUPAGE.bItemCnt]
+    eMOVZX  cx, [g_MenuPageIdeVars+MENUPAGE.bItemCnt]
     dec     cx
     mov     bx, g_MenuPageItemIdeMaster+MENUPAGEITEM.pValue