Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2433 → Rev 2434

/kernel/branches/Kolibri-acpi/boot/bootvesa.inc
94,7 → 94,8
push edx
call int2str
pop eax
@@: or al,0x30
@@:
or al, 0x30
mov [ds:di],al
inc di
ret
107,7 → 108,8
push edx
call int2strnz
pop eax
@@: or al,0x30
@@:
or al, 0x30
mov [es:di],al
inc di
ret
241,10 → 243,12
mov [es:bx+4],ax ; +4[2] : attributes
 
cmp [s_vesa.ver],'2'
jb .lp1
; jb .lp1
jb @f ; We do not use Vesa 1.2 mode is now
 
or cx,0x4000 ; use LFB
.lp1: mov [es:bx+6],cx ; +6 : mode number
.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
363,7 → 367,8
je .ok_found_mode
cmp word [es:si+8],24
je .ok_found_mode
@@: add si,size_of_step
@@:
add si, size_of_step
cmp word [es:si],-1
jnz .findvbemode
.novbemode:
438,7 → 443,8
 
mov ecx,long_v_table
 
.loop: add ax,size_of_step
.loop:
add ax, size_of_step
cmp ax,word [end_cursor]
jae .next_step
loop .loop
471,13 → 477,16
je .ok
cmp word [es:si+8],24
je .ok
.next: add si,size_of_step
.next:
add si, size_of_step
cmp word [es:si],-1
je .exit
jmp .loops
.ok: xor ax,ax
.ok:
xor ax, ax
ret
.exit: or ax,-1
.exit:
or ax, -1
ret
 
 
520,7 → 529,8
jmp .ok
 
 
.low: sub cx,size_of_step
.low:
sub cx, size_of_step
cmp cx,modes_table
jb .ok
push cx
726,8 → 736,8
je .mode0x12_0x13
 
 
cmp byte [s_vesa.ver],'2'
jb .vesa12
; cmp byte [s_vesa.ver], '2'
; jb .vesa12
 
; VESA 2 and Vesa 3
 
760,23 → 770,21
 
; VESA 1.2 PM BANK SWITCH ADDRESS
 
.vesa12:
 
 
mov ax,0x4f0A
xor bx,bx
int 0x10
xor eax,eax
xor ebx,ebx
mov ax,es
shl eax,4
mov bx,di
add eax,ebx
movzx ebx,word[es:di]
add eax,ebx
push 0x0000
pop es
mov [es:0x9014],eax
;.vesa12:
; mov ax, 0x4f0A
; xor bx, bx
; int 0x10
; xor eax, eax
; xor ebx, ebx
; mov ax, es
; shl eax, 4
; mov bx, di
; add eax, ebx
; movzx ebx, word[es:di]
; add eax, ebx
; push 0x0000
; pop es
; mov [es:0x9014], eax
.exit:
ret