Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 82 → Rev 102

/kernel/trunk/video/vesa12.inc
48,6 → 48,7
; set_bank for S3 videocards, work on S3 ViRGE PCI (325)
; modified by kmeaw
set_bank:
pushfd
cli
cmp al,[0xfff2]
je retsb
121,7 → 122,7
pop dx
pop ax
retsb:
sti
popfd
ret
 
;Set bank function for Intel 810/815 chipsets
461,8 → 462,7
mov ebx,3
div ebx
add eax,WinMapAddress
mov ebx,[0x3010]
movzx ebx,byte[ebx+0xe]
mov ebx,[0x3000]
cld
 
dbnp2412:
553,8 → 553,7
sub eax,[0xfe80]
shr eax,2
add eax,WinMapAddress
mov ebx,[0x3010]
movzx ebx,byte[ebx+0xe]
mov ebx,[0x3000]
cld
 
dbnp3212:
823,8 → 822,7
mov ebx,3
div ebx
add eax,WinMapAddress
mov ebx,[0x3010]
mov bl,[ebx+0xe]
mov ebx,[0x3000]
mov bh,[esp+4*4]
 
np2412:
901,8 → 899,7
sub eax,[0xfe80]
shr eax,2
add eax,WinMapAddress
mov ebx,[0x3010]
mov bl,[ebx+0xe]
mov ebx,[0x3000]
mov bh,[esp+4*4]
 
np3212:
/kernel/trunk/video/vesa20.inc
201,14 → 201,12
xchg eax, ebp
 
; get process number
mov eax, [0x3010]
mov bl, [eax+0xE]
mov ebx, [0x3000]
 
cmp byte [ScreenBPP], 32
je put_image_end_32
 
;put_image_end_24:
;cli ; !!!!!!!!!!!!!!!!!!!!!!
mov edi, [putimg.real_sy]
align 4
.new_line:
244,7 → 242,6
.finish:
add esp, putimg.stack_data
popad
;sti ; !!!!!!!!!!!!!!!!!!!!!
ret
 
put_image_end_32:
679,13 → 676,11
xchg eax, ebp
 
; get process number
mov eax, [0x3010]
mov bl, [eax+0xE]
mov ebx, [0x3000]
 
cmp byte [ScreenBPP], 24
jne draw_bar_end_32
draw_bar_end_24:
;cli ; !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
mov eax, [drbar.color] ;; BBGGRR00
mov bh, al ;; bh = BB
shr eax, 8 ;; eax = RRGG
736,7 → 731,6
add esp, drbar.stack_data
popad
xor eax, eax
;sti ; !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
ret
 
draw_bar_end_32:
/kernel/trunk/video/vga.inc
142,8 → 142,7
push ebx ; H
push edx ; x+Xwin
 
mov ebx,[0x3010]
mov bl,[ebx+0xe]
mov ebx,[0x3000]
mov bh,[esp+6*4]
 
cld
255,6 → 254,7
and ecx,0x07 ; bit no. (modulo 8)
 
setvgapixel:
pushfd
cli
; edi = address, eax = 24bit colour, ecx = bit no. (modulo 8)
 
304,7 → 304,7
mov al,[edi] ; dummy read
mov [edi],dl
 
sti
popfd
ret
 
 
415,8 → 415,7
push esi
push ecx ; x+Xwin
 
mov ebx,[0x3010]
movzx ebx,byte[ebx+0xe]
mov ebx,[0x3000]
 
cld