Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9925 → Rev 9926

/kernel/trunk/video/blitter.inc
271,9 → 271,8
test [esp + .flags], BLIT_CLIENT_RELATIVE
jz .no_client_relative
 
mov eax, [current_slot]
add ebx, [eax + APPDATA.wnd_clientbox.left]
add ebp, [eax + APPDATA.wnd_clientbox.top]
add ebx, [window_data + eax + WDATA.clientbox.left]
add ebp, [window_data + eax + WDATA.clientbox.top]
.no_client_relative:
 
mov ecx, ebx
/kernel/trunk/video/cursors.inc
338,7 → 338,7
mov [eax + CURSOR.hot_x], ebx
mov [eax + CURSOR.hot_y], ebx
 
stdcall kernel_alloc, 0x1000
stdcall kernel_alloc, PAGE_SIZE
test eax, eax
jz .fail
 
392,7 → 392,7
mov [edi + CURSOR.hot_y], edx
 
xchg edi, eax
mov ecx, 1024
mov ecx, PAGE_SIZE/4
cld
rep movsd
jmp .add_cursor
/kernel/trunk/video/framebuffer.inc
156,7 → 156,7
or esi, PG_GLOBAL + PAT_WC + PG_UWR
and esi, [pte_valid_mask]
 
stdcall alloc_kernel_space, 0x1000
stdcall alloc_kernel_space, PAGE_SIZE
mov edi, eax
mov ebx, 4
 
168,15 → 168,15
stdcall map_page, edi, eax, PG_SWR
 
mov eax, esi
mov ecx, 1024
mov ecx, PAGE_SIZE/4
@@:
stosd
add eax, 0x1000
add eax, PAGE_SIZE
loop @B
 
add esi, 0x400000
add ebp, 4
sub edi, 4096
sub edi, PAGE_SIZE
dec ebx
jnz .new_pd
stdcall free_kernel_space, edi
185,7 → 185,7
.fake:
mov [BOOT.mtrr], byte 2
 
stdcall alloc_kernel_space, 0x1000
stdcall alloc_kernel_space, PAGE_SIZE
push eax ;store in stack for subsequent
mov edi, eax ;free_kernel_space call
 
197,13 → 197,13
 
; max VGA=640*480*4=1228800 bytes
; + 32*640*4=81920 bytes for mouse pointer
stdcall alloc_pages, ((1228800+81920)/4096)
stdcall alloc_pages, ((1228800+81920)/PAGE_SIZE)
or eax, PG_GLOBAL+PG_UWR
and eax, [pte_valid_mask]
mov ecx, (1228800+81920)/4096
mov ecx, (1228800+81920)/PAGE_SIZE
@@:
stosd
add eax, 0x1000
add eax, PAGE_SIZE
loop @B
 
call free_kernel_space
221,7 → 221,7
cli
mov [_display.current_lfb], ecx
.patch_pde:
lea edi, [eax + PROC.pdt_0+4096-32] ;last 8 pd entries up to 32Mb framebuffer
lea edi, [eax + PROC.pdt_0 + PAGE_SIZE -32] ;last 8 pd entries up to 32Mb framebuffer
mov ecx, 4
rep movsd ;patch pde
sub esi, 16