Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 946 → Rev 945

/kernel/trunk/boot/bootvesa.inc
111,7 → 111,6
mov [es:di],al
inc di
ret
 
;-------------------------------------------------------
;Write message about incorrect v_mode and write message about jmp on swith v_mode
v_mode_error:
247,7 → 246,7
.lp1: mov [es:bx+6],cx ; +6 : mode number
movzx ax,byte [es:mi.BitsPerPixel]
mov word [es:bx+8],ax ; +8 : bits per pixel
add bx,size_of_step ; size of record
add bx,size_of_step
 
@@:
add si,2
415,16 → 414,8
@@:
 
mov word [home_cursor],ax
mov si,[preboot_graph]
mov word [cursor_pos],si
 
push word [es:si]
pop word [x_save]
push word [es:si+2]
pop word [y_save]
push word [es:si+6]
pop word [number_vm]
 
push word [preboot_graph]
pop word [cursor_pos]
ret
;;;;;;;;;;;;;;;;;;;;;;;;;;;
.loops:
441,9 → 432,7
je .exit
jmp .loops
.ok: xor ax,ax
ret
.exit: or ax,-1
ret
.exit: ret
 
 
;-----------------------------------------------------------------------------
542,15 → 531,14
mov bp,long_v_table ;show rows
.@@_next_bit:
;clear cursor
mov ax,' '
mov word[ds:_r1+21],ax
mov word[ds:_r1+50],ax
mov word[ds:_r1+21],' '
mov word[ds:_r1+50],' '
 
mov word[ds:_r2+21],ax
mov word[ds:_r2+45],ax
mov word[ds:_r2+21],' '
mov word[ds:_r2+45],' '
 
mov word[ds:_rs+21],ax
mov word[ds:_rs+46],ax
mov word[ds:_rs+21],' '
mov word[ds:_rs+46],' '
; draw string
cmp word [es:si+6],0x12
je .show_0x12
658,10 → 646,10
mov cx,70
mov bp,12
.loop_start:
rep stosw
rep stosw ;®ç¨á⪠ ®¡« á⨠íªà ­ 
mov cx,70
add di,20
dec bp
dec bp ;㬥­ì襭¨¥ bp, ¢ bp áç¥â稪
jns .loop_start
pop es
popa
/kernel/trunk/boot/bootcode.inc
394,6 → 394,7
call calc_vmodes_table
call check_first_parm ;check and enable cursor_pos
 
 
; \begin{diamond}[30.11.2005]
cfgmanager:
; settings:
445,7 → 446,6
mov word [.timer], .newtimer
mov word [.timer+2], cs
.printcfg:
 
_setcursor 9,0
mov si, current_cfg_msg
call print
515,7 → 515,6
mov eax, [.oldtimer]
mov [es:8*4], eax
mov [.timer], eax
 
_setcursor 7,0
mov si, space_msg
call printplain
768,12 → 767,11
jnz .waityn
call putchar
mov byte [space_msg+80], 186
 
pop eax
push cs
push .cont
push eax
retf ;call back
retf
.loadc:
pop eax
.cont: