Changeset 9 in xtideuniversalbios for trunk/Configurator/Src/Libraries/menu/menuloop.asm

Timestamp:

May 25, 2010, 5:01:46 PM (15 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Now assembles with Yasm

File:

• trunk/Configurator/Src/Libraries/menu/menuloop.asm (modified) (6 diffs)

trunk/Configurator/Src/Libraries/menu/menuloop.asm

@@ -2 +2 @@
 ; Project name  :   Menu library
 ; Created date  :   11.11.2009
-; Last update   :   10.12.2009
+; Last update   :   25.5.2010
 ; Author        :   Tomi Tilli
 ; Description   :   ASM library to menu system.
@@ -92 +92 @@
 ; MenuLoop_SendEvent        Sends any event to user event handler
 ;   Parameters:
-;       BX:     Event code
+;       BX:     Event code (MenuLoop_SendEvent only)
 ;       DX:     Event parameter (event specific)
 ;       SS:BP:  Ptr to MENUVARS
@@ -193 +193 @@
     mov     [bp+MENUVARS.wItemSel], ax      ; Store new index
     cmp     ax, [bp+MENUVARS.wItemTop]      ; Need to scroll?
-    jae     .DrawSelection                  ;  If not, go to draw selection
+    jb      SHORT .ScrollUp
+    jmp     .DrawSelection                  ;  If not, go to draw selection
+ALIGN JUMP_ALIGN
+.ScrollUp:
     dec     WORD [bp+MENUVARS.wItemTop]     ; Scroll
     jmp     .ScrollMenu
@@ -222 +225 @@
     add     bx, [bp+MENUVARS.wItemTop]      ; BX to one past last visible index
     cmp     ax, bx                          ; Need to scroll?
-    jb      .DrawSelection                  ;  If not, go to draw selection
+    jae     .ScrollDown
+    jmp     .DrawSelection
+ALIGN JUMP_ALIGN
+.ScrollDown:
     inc     WORD [bp+MENUVARS.wItemTop]     ; Scroll
     jmp     .ScrollMenu
@@ -236 +242 @@
     jmp     .ScrollMenu
 %endif
+
+    ; HOME pressed
+ALIGN JUMP_ALIGN
+.KeyHome:
+    xor     ax, ax
+    mov     [bp+MENUVARS.wItemSel], ax
+    mov     [bp+MENUVARS.wItemTop], ax
+    jmp     .ScrollMenu
+
+    ; END pressed
+ALIGN JUMP_ALIGN
+.KeyEnd:
+    mov     ax, [bp+MENUVARS.wItemCnt]      ; Load number if menuitems
+    mov     bx, ax                          ; Copy menuitem count to BX
+    dec     ax                              ; Decrement for last index
+    mov     [bp+MENUVARS.wItemSel], ax      ; Store new selection
+    sub     bl, [bp+MENUVARS.bVisCnt]       ; BX to first menuitem to draw
+    sbb     bh, 0
+    mov     [bp+MENUVARS.wItemTop], bx      ; Store first menuitem to draw
+    jnc     .ScrollMenu 
+    mov     WORD [bp+MENUVARS.wItemTop], 0  ; Overflow, start with 0
+    jmp     .ScrollMenu
 
     ; PGUP pressed
@@ -262 +290 @@
     mov     [bp+MENUVARS.wItemSel], ax
     mov     [bp+MENUVARS.wItemTop], ax
-    jmp     .ScrollMenu
-
-    ; HOME pressed
-ALIGN JUMP_ALIGN
-.KeyHome:
-    xor     ax, ax
-    mov     [bp+MENUVARS.wItemSel], ax
-    mov     [bp+MENUVARS.wItemTop], ax
-    jmp     .ScrollMenu
-
-    ; END pressed
-ALIGN JUMP_ALIGN
-.KeyEnd:
-    mov     ax, [bp+MENUVARS.wItemCnt]      ; Load number if menuitems
-    mov     bx, ax                          ; Copy menuitem count to BX
-    dec     ax                              ; Decrement for last index
-    mov     [bp+MENUVARS.wItemSel], ax      ; Store new selection
-    sub     bl, [bp+MENUVARS.bVisCnt]       ; BX to first menuitem to draw
-    sbb     bh, 0
-    mov     [bp+MENUVARS.wItemTop], bx      ; Store first menuitem to draw
-    jnc     .ScrollMenu 
-    mov     WORD [bp+MENUVARS.wItemTop], 0  ; Overflow, start with 0
     ; Fall to .ScrollMenu