Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 142 → Rev 143

/kernel/branches/gfx_kernel/kernel.asm
233,7 → 233,7
endg
 
iglobal
firstapp db 'LAUNCHER '
firstapp db '/rd/1/LAUNCHER',0
char db 'CHAR MT '
char2 db 'CHAR2 MT '
bootpath db '/KOLIBRI '
240,7 → 240,7
bootpath2 db 0
vmode db 'VMODE MDR'
cur_file db 'ARROW CUR'
vrr_m db 'VRR_M '
vrr_m db '/rd/1/VRR_M',0
endg
 
 
772,21 → 772,22
mov [0x3000],dword 1
mov [0x3004],dword 1
cli
mov al,[0x2f0000+0x9030]
cmp al,1
cmp byte [0x2f0000+0x9030],1
jne no_load_vrr_m
mov eax,vrr_m
mov ebp,vrr_m
lea esi,[ebp+6] ; skip '/RD/1/'
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
call fs_RamdiskExecute.flags
cmp eax,2 ; if vrr_m app found (PID=2)
je first_app_found
 
no_load_vrr_m:
mov eax,firstapp
mov ebp,firstapp
lea esi,[ebp+6]
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
call fs_RamdiskExecute.flags
 
cmp eax,2 ; continue if a process has been loaded
je first_app_found
3350,7 → 3351,7
mouse_active db 0
endg
iglobal
cpustring db 'CPU '
cpustring db '/RD/1/CPU',0
endg
 
uglobal
3364,10 → 3365,11
 
cmp [ctrl_alt_del], 1
jne nocpustart
mov eax, cpustring
mov ebp, cpustring
lea esi,[ebp+6]
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
call fs_RamdiskExecute.flags
mov [ctrl_alt_del], 0
nocpustart:
cmp [mouse_active], 1
/kernel/trunk/boot/bootcode.inc
448,8 → 448,8
; d) preboot_device = from what boot?
mov di, preboot_graph-0x10000
; check bootloader block
cmp [.loader_block-0x10000], 1
jnz .noloaderblock
cmp [.loader_block-0x10000], -1
jz .noloaderblock
les bx, [.loader_block-0x10000]
cmp byte [es:bx], 1
mov si, loader_block_error-0x10000
657,7 → 657,7
.timer dd ?
end virtual
org $+0x10000
.loader_block dd 0
.loader_block dd -1
org $-0x10000
.gettime:
mov ah, 0
727,7 → 727,7
_setcursor 15,0
cmp [.bSettingsChanged-0x10000], 0
jz .load
cmp [.loader_block-0x10000], 0
cmp [.loader_block-0x10000], -1
jz .load
les bx, [.loader_block-0x10000]
mov eax, [es:bx+3]
/kernel/trunk/boot/shutdown.inc
136,7 → 136,10
 
nrl:
call dtext
sub ebx,0x050000
; sub ebx,0x050000
ror ebx, 16
sub bl, 0x05
ror ebx, 16
add eax,8
add ecx,31
cmp cx,word 0x0001+25*31
/kernel/trunk/detect/dev_hdcd.inc
329,7 → 329,7
mov AL,08h
inc DX ;ðåãèñòð êîìàíä
out DX,AL
mov ecx,0xffff
mov ecx,0x80000
@@WaitHDReady_1:
; Ïðîâåðèòü âðåìÿ îæèäàíèÿ
dec ecx
/kernel/trunk/kernel.asm
231,13 → 231,13
endg
 
iglobal
firstapp db 'LAUNCHER '
firstapp db '/rd/1/LAUNCHER',0
char db 'CHAR MT '
char2 db 'CHAR2 MT '
bootpath db '/KOLIBRI '
bootpath2 db 0
vmode db 'VMODE MDR'
vrr_m db 'VRR_M '
vrr_m db '/rd/1/VRR_M',0
endg
 
 
727,21 → 727,22
mov [0x3000],dword 1
mov [0x3004],dword 1
cli
mov al,[0x2f0000+0x9030]
cmp al,1
cmp byte [0x2f0000+0x9030],1
jne no_load_vrr_m
mov eax,vrr_m
mov ebp,vrr_m
lea esi,[ebp+6] ; skip '/rd/1/'
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
call fs_RamdiskExecute.flags
cmp eax,2 ; if vrr_m app found (PID=2)
je first_app_found
 
no_load_vrr_m:
mov eax,firstapp
mov ebp,firstapp
lea esi,[ebp+6]
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
call fs_RamdiskExecute.flags
 
cmp eax,2 ; continue if a process has been loaded
je first_app_found
3336,7 → 3337,7
mouse_active db 0
endg
iglobal
cpustring db 'CPU '
cpustring db '/RD/1/CPU',0
endg
 
uglobal
3350,10 → 3351,11
 
cmp [ctrl_alt_del], 1
jne nocpustart
mov eax, cpustring
mov ebp, cpustring
lea esi,[ebp+6]
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
call fs_RamdiskExecute.flags
mov [ctrl_alt_del], 0
nocpustart:
cmp [mouse_active], 1