Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1710 → Rev 1709

/kernel/branches/Kolibri-A/trunk/kernel.asm
198,6 → 198,7
 
include "data16.inc"
 
diff16 "end of data16 ",0,$
 
use32
org $+0x10000
500,10 → 501,8
mov [graph_data_l+4],al
mov [graph_data_l+7],ah
or [KERNEL_ALLOC_FLAG], dword PG_NOCACHE
stdcall kernel_alloc, [_WinMapSize]
mov [_WinMapAddress], eax
xor [KERNEL_ALLOC_FLAG], dword PG_NOCACHE
 
xor eax,eax
inc eax
895,9 → 894,31
jne .bll1
end if
 
; mov [ENABLE_TASKSWITCH],byte 1 ; multitasking enabled
 
; UNMASK ALL IRQ'S
 
; mov esi,boot_allirqs
; call boot_log
;
; cli ;guarantee forbidance of interrupts.
; mov al,0 ; unmask all irq's
; out 0xA1,al
; out 0x21,al
;
; mov ecx,32
;
; ready_for_irqs:
;
; mov al,0x20 ; ready for irqs
; out 0x20,al
; out 0xa0,al
;
; loop ready_for_irqs ; flush the queue
 
stdcall attach_int_handler, 1, irq1, 0
 
; mov [dma_hdd],1
cmp [IDEContrRegsBaseAddr], 0
setnz [dma_hdd]
mov [timer_ticks_enable],1 ; for cd driver
905,10 → 926,12
sti
call change_task
 
jmp osloop ; Fly :)
jmp osloop
 
diff16 "init code end: ",0,$
; jmp $ ; wait here for timer to take control
 
; Fly :)
 
include 'unpacker.inc'
include 'fdo.inc'
 
2215,7 → 2238,6
test ecx, ecx
jz @f
cmp eax, static_background_data
 
jz .ret
@@:
mov ebx, [mem_BACKGROUND]
2704,7 → 2726,6
mov [edx + RECT.left], 0
mov [edx + RECT.top], 0
mov eax, [Screen_Max_X]
 
mov [edx + RECT.right], eax
mov eax, [Screen_Max_Y]
mov [edx + RECT.bottom], eax
/kernel/branches/Kolibri-A/trunk/core/heap.inc
110,7 → 110,6
mov [mem_used.fd], eax
mov [mem_used.bk], eax
 
mov [KERNEL_ALLOC_FLAG], dword PG_SW
stdcall alloc_pages, dword 32
mov ecx, 32
mov edx, eax
572,7 → 571,7
mov edi, eax
mov edx, [lin_addr]
@@:
stdcall map_page,edx,edi,dword [KERNEL_ALLOC_FLAG]
stdcall map_page,edx,edi,dword PG_SW
add edx, 0x1000
add edi, 0x1000
dec ecx
1539,5 → 1538,3
.fail:
ret
endp
diff16 "heap code end ",0,$
diff16 "heap code size",init_kernel_heap,$
/kernel/branches/Kolibri-A/trunk/core/memory.inc
1441,5 → 1441,3
.fail:
ret
endp
diff16 "memman code end",0,$
diff16 "memman code sze",alloc_page,$
/kernel/branches/Kolibri-A/trunk/gui/mouse.inc
699,6 → 699,3
 
.exit:
ret
 
diff16 "mouse code end ",0,$
diff16 "mouse code size",mouse_check_events,$
/kernel/branches/Kolibri-A/trunk/gui/window.inc
2083,6 → 2083,3
call draw_rectangle.forced
pop esi ebx eax
ret
 
diff16 "window code end",0,$
diff16 "window.inc size",syscall_draw_window,$
/kernel/branches/Kolibri-A/trunk/gui/skincode.inc
458,5 → 458,3
 
ret 4
 
diff16 "skin code end ",0,$
diff16 "skin code size",read_skin_file,$
/kernel/branches/Kolibri-A/trunk/gui/font.inc
130,5 → 130,3
popad
pop eax ; << // Alver 22.06.2008 // <<
ret
diff16 "font code end ",0,$
diff16 "font code size",dtext,$
/kernel/branches/Kolibri-A/trunk/const.inc
252,7 → 252,6
BytesPerScanLine equ (OS_BASE+0x000FE08)
SCR_MODE equ (OS_BASE+0x000FE0C)
 
KERNEL_ALLOC_FLAG equ (OS_BASE+0x000FE70)
mmio_pcie_cfg_addr equ (OS_BASE+0x000FE74)
mmio_pcie_cfg_lim equ (OS_BASE+0x000FE78)
mmio_pcie_cfg_pdes equ (OS_BASE+0x000FE7C)