Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2258 → Rev 2259

/kernel/branches/Kolibri-acpi/build.bat
1,7 → 1,7
@echo off
cls
set languages=en ru ge et
set drivers=com_mouse emu10k1x ensoniq fm801 infinity sis sound uart viasound vmode vt823x
set drivers=com_mouse emu10k1x ensoniq fm801 infinity sis sound viasound vt823x
set targets=all kernel drivers skins clean
 
call :Check_Target %1
/kernel/branches/Kolibri-acpi/const.inc
293,7 → 293,7
 
BgrAuxTable equ (OS_BASE+0x0298000)
; unused?
SB16Buffer equ (OS_BASE+0x2A0000)
SB16Buffer equ (OS_BASE+0x02A0000)
SB16_Status equ (OS_BASE+0x02B0000)
 
BUTTON_INFO equ (OS_BASE+0x02C0000)
306,17 → 306,15
stack_data equ (OS_BASE+0x0304000)
stack_data_end equ (OS_BASE+0x031ffff)
resendQ equ (OS_BASE+0x0320000)
VMODE_BASE equ (OS_BASE+0x0328000)
skin_data equ (OS_BASE+0x0330000)
draw_data equ (OS_BASE+0x0338000);
 
BgrDrawMode equ (OS_BASE+0x033BFF4)
BgrDataWidth equ (OS_BASE+0x033BFF8)
BgrDataHeight equ (OS_BASE+0x033BFFC)
skin_data equ (OS_BASE+0x0328000)
draw_data equ (OS_BASE+0x0330000)
 
BOOT_VAR equ (OS_BASE+0x0340000)
BgrDrawMode equ (OS_BASE+0x0333FF4)
BgrDataWidth equ (OS_BASE+0x0333FF8)
BgrDataHeight equ (OS_BASE+0x0333FFC)
 
sys_pgmap equ (OS_BASE+0x0350000)
sys_pgmap equ (OS_BASE+0x0334000)
 
UPPER_KERNEL_PAGES equ (OS_BASE+0x0400000)
 
/kernel/branches/Kolibri-acpi/core/heap.inc
1472,15 → 1472,3
.fail:
ret
endp
 
align 4
sys_perf:
test ecx, ecx
jz .fail
 
mov edi, ecx
mov esi, mem_hash_cnt
mov ecx, 64
rep movsd
.fail:
ret
/kernel/branches/Kolibri-acpi/core/malloc.inc
202,6 → 202,9
; eax= mem
align 4
free:
test eax, eax
jz .exit
 
push edi
mov edi, eax
add edi, -8
296,7 → 299,9
pop esi
.fail:
pop edi
.exit:
ret
 
@@:
 
; nsize = next->head & ~INUSE_BITS;
/kernel/branches/Kolibri-acpi/core/syscall.inc
194,7 → 194,6
dd syscall_window_settings ; 71-Window settings
dd sys_sendwindowmsg ; 72-Send window message
dd blit_32 ; 73-blitter;
dd sys_perf ; 74 for debug purposes only
times 255 - ( ($-servetable2) /4 ) dd undefined_syscall
dd sys_end ; -1-end application
 
/kernel/branches/Kolibri-acpi/drivers/imports.inc
59,6 → 59,9
Kfree,\
CreateRingBuffer,\
\
DiskAdd, \
DiskMediaChanged, \
\
GetPid,\
CreateObject,\
DestroyObject,\
/kernel/branches/Kolibri-acpi/kernel.asm
649,12 → 649,6
 
call calculatefatchain
 
; LOAD VMODE DRIVER
 
;!!!!!!!!!!!!!!!!!!!!!!!
include 'vmodeld.inc'
;!!!!!!!!!!!!!!!!!!!!!!!
 
if 0
mov ax,[OS_BASE+0x10000+bx_from_load]
cmp ax,'r1' ; if using not ram disk, then load librares and parameters {SPraid.simba}
867,6 → 861,9
call set_network_conf
no_st_network:
 
xchg bx, bx
stdcall load_driver, ahci_driver
 
; LOAD FIRST APPLICATION
cli
 
1008,6 → 1005,8
include 'unpacker.inc'
include 'fdo.inc'
 
ahci_driver db 'AHCI',0
 
align 4
boot_log:
pushad
1604,15 → 1603,10
no_set_lba_read:
; cmp eax,12 ; ENABLE PCI ACCESS
dec ebx
jnz no_set_pci_access
jnz sys_setup_err
mov [pci_access_enabled],ecx
ret
no_set_pci_access:
 
;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
include 'vmodeint.inc'
;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
sys_setup_err:
or [esp+32],dword -1
ret