Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 746 → Rev 747

/kernel/trunk/core/dll.inc
197,6 → 197,7
 
align 4
proc pci_read16 stdcall, bus:dword, devfn:dword, reg:dword
push ebx
xor eax, eax
xor ebx, ebx
mov ah, byte [bus]
204,11 → 205,13
mov bh, byte [devfn]
mov bl, byte [reg]
call pci_read_reg
pop ebx
ret
endp
 
align 4
proc pci_read8 stdcall, bus:dword, devfn:dword, reg:dword
push ebx
xor eax, eax
xor ebx, ebx
mov ah, byte [bus]
216,11 → 219,13
mov bh, byte [devfn]
mov bl, byte [reg]
call pci_read_reg
pop ebx
ret
endp
 
align 4
proc pci_write8 stdcall, bus:dword, devfn:dword, reg:dword, val:dword
push ebx
xor eax, eax
xor ebx, ebx
mov ah, byte [bus]
229,11 → 234,13
mov bl, byte [reg]
mov ecx, [val]
call pci_write_reg
pop ebx
ret
endp
 
align 4
proc pci_write16 stdcall, bus:dword, devfn:dword, reg:dword, val:dword
push ebx
xor eax, eax
xor ebx, ebx
mov ah, byte [bus]
242,6 → 249,7
mov bl, byte [reg]
mov ecx, [val]
call pci_write_reg
pop ebx
ret
endp
 
/kernel/trunk/core/malloc.inc
983,7 → 983,7
align 4
init_malloc:
 
stdcall kernel_alloc, 0x20000
stdcall kernel_alloc, 0x30000
 
mov [mst.top], eax
mov [mst.topsize], 128*1024
/kernel/trunk/core/memory.inc
1057,8 → 1057,8
mov [esp+36], eax
ret
@@:
cmp eax, 21
ja @f
cmp eax, 21 ;for test purposes only
ja @f ;will be removed soon
cmp ebx, OS_BASE
jae .fail
 
/kernel/trunk/core/peload.inc
275,10 → 275,18
free_kernel_space, 'FreeKernelSpace', \ ; stdcall
kernel_alloc, 'KernelAlloc', \ ; stdcall
kernel_free, 'KernelFree', \ ; stdcall
malloc, 'Kmalloc', \
free, 'Kfree', \
map_io_mem, 'MapIoMem', \ ; stdcall
\
pci_api, 'PciApi', \
pci_read8, 'PciRead8', \ ; stdcall
pci_read16, 'PciRead16', \ ; stdcall
pci_read32, 'PciRead32', \ ; stdcall
pci_write8, 'PciWrite8', \ ; stdcall
pci_write16, 'PciWrite16', \ ; stdcall
pci_write32, 'PciWrite32', \ ; stdcall
\
reg_service, 'RegService', \
user_alloc, 'UserAlloc', \ ; stdcall
user_free, 'UserFree', \ ; stdcall