Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 534 → Rev 535

/kernel/trunk/core/conf_lib.inc
1,20 → 1,14
$Revision$
;-------------------------------------------------------------------------
;
; ” ©« ª®­ä¨£ãà æ¨¨
;
;
; SPraid
;
;Loading configuration from ini file
; {SPraid.simba}
;-------------------------------------------------------------------------
 
conf_file_loaded: db 0 ; ä« £ § £à㧪¨ ª®­ä¨£ 
conf_path_sect: db 'path',0
 
conf_fname db '/sys/sys.conf',0
 
 
 
; set soke kernel configuration
proc set_kernel_conf
locals
par db 30 dup(?)
95,6 → 89,7
udev_midibase db 'midibase',0
udev_midibase_def db '0x320',0
 
;set up netvork configuration
proc set_network_conf
locals
par db 30 dup(?)
152,8 → 147,7
unet_gate db 'gate',0
unet_def db 0
 
; ª®­¢¥à祭¨¥ áâப¨ ¢ DWord ¢ eax (¯® ¢â®à®¬ã ᨬ¢®«ã ®¯à¥¤¥«ï¥â á¨á⥬ã áç¨á«¥­¨ï)
; convert string to DWord
proc strtoint stdcall,strs
pushad
178,7 → 172,7
ret
endp
 
; ª®­¢¥à祭¨¥ áâப¨ ¢ DWord ¢ eax ¤«ï ¤¥áïâ¨ç­®£®
; convert string to DWord for decimal value
proc strtoint_dec stdcall,strs
pushad
xor edx,edx
231,7 → 225,7
ret
endp
 
; ª®­¢¥à祭¨¥ áâப¨ ¢ DWord ¢ eax ¤«ï è¥á­ ¤æ â¨à¨ç­®£®
;convert string to DWord for hex value
proc strtoint_hex stdcall,strs
pushad
xor edx,edx
286,7 → 280,7
endp
 
 
; ¯à¥®¡à §®¢ âì  ¤à¥á ¢ â® çâ® ­ ¤ , ¥á«¨ ¯ãáâ® â® ¢¥à­ãâì 0
; convert string to DWord for IP addres
proc do_inet_adr stdcall,strs
pushad
319,7 → 313,7
endp
 
 
; ãáâ ­®¢ª¨ ¨§ setup
;setup configurations
 
_mouse_speed:
mov eax,18
/kernel/trunk/core/ext_lib.inc
40,7 → 40,7
 
 
 
align 4 ; çàãðóçêà áèáëèîòåêè ñ óñëîâèåì, ÷òî áóäèò èñïîëüçûâàòüñÿ èç ÿäðà
align 4 ; loading library (use kernel functions)
proc load_k_library stdcall, file_name:dword
locals
coff dd ?
/kernel/trunk/data32.inc
107,17 → 107,7
putpixel dd __sys_putpixel
; } mike.dld
 
; SPraid.simba { 6.05.2007
; êîíñòàíòû äëÿ îáðàùåíèÿ ê èíè ôàéëó äëÿ îïðåäåëåíèÿ óñòðîéñòâ
;
 
ini_dev_sect: db 'dev',0 ; ñåêöèÿ îá óñòðîéñòâàõ
ini_com1_mouse_detect: db 'com1_mouse',0
ini_com2_mouse_detect: db 'com2_mouse',0
 
dev_dev_val: db '2',0 ; äàëåå åñëè 2 - òî äåòåêòèðîâàòü
; } SPraid.simba
 
align 4
keyboard dd 1
sound_dma dd 1
/kernel/trunk/fs/parse_fn.inc
26,12 → 26,12
tmp_file_name_table dd ?
endg
 
; ¡¥à¥â ¯ à ¬¥âàë bx_from_load ¨ ¨­¨æ¨ «¨§¨àã¥â § ¬¥­ã ¤«ï /sys
; use bx_from_load and init system directory /sys
Parser_params:
mov eax,[OS_BASE+0x10000+bx_from_load]
mov ecx,sysdir_path
mov [ecx-64],dword 'sys'
cmp al,'r' ; à ¬ ¤¨áª
cmp al,'r' ; if ram disk
jnz @f
mov [ecx],dword 'RD/?'
mov [ecx+3],byte ah
39,7 → 39,7
ret
@@:
sub al,49
mov [ecx],dword 'HD?/'
mov [ecx],dword 'HD?/' ; if hard disk
mov [ecx+2],byte al
mov [ecx+4],byte ah
mov [ecx+5],dword '/KOL'
/kernel/trunk/kernel.asm
552,13 → 552,12
;!!!!!!!!!!!!!!!!!!!!!!!
 
mov ax,[OS_BASE+0x10000+bx_from_load]
cmp ax,'r1' ; åñëè ñðàì äèñê - òî íå ãðóçèòü áèáëèîòåêè
cmp ax,'r1' ; if using not ram disk, then load librares and parameters {SPraid.simba}
je no_lib_load
; LOADING LIBRARES
stdcall dll.Load,@IMPORT ; SPraid - çàãðóçêà ôóíêöèîíàëà (ïîêà ÷òî èíè ôàéë)
stdcall dll.Load,@IMPORT ; loading librares for kernel (.obj files)
call load_file_parse_table ; prepare file parse table
call set_kernel_conf ; configure devices and gui
mov byte [conf_file_loaded],1
no_lib_load:
 
; LOAD FONTS I and II
763,7 → 762,7
(tss._io_map_1-OS_BASE), PG_MAP
 
mov ax,[OS_BASE+0x10000+bx_from_load]
cmp ax,'r1' ; åñëè ñðàì äèñê - òî íå ãðóçèòü áèáëèîòåêè
cmp ax,'r1' ; if not rused ram disk - load network configuration from files {SPraid.simba}
je no_st_network
call set_network_conf
no_st_network: