KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

Synced net branch with trunk (#3358)

Browse Source 
git-svn-id: svn://kolibrios.org@3359 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr
2013-03-10 12:28:37 +00:00
parent 7e246790ed
commit cc4161de83
65 changed files with 6785 additions and 6056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
kernel/branches/net/data32.inc
View File

@@ -46,29 +46,29 @@ keymap_alt:
db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
if lang eq ru
boot_initirq db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IRQ',0
boot_picinit db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PIC',0
boot_v86machine db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD> V86 <20><>設<EFBFBD>',0
boot_inittimer db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD><EFBFBD> ⠩<><E2A0A9><EFBFBD><EFBFBD> (IRQ0)',0
boot_initapic db '<27><><EFBFBD><EFBFBD>⪠ <20><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD>樨 APIC',0
boot_enableirq db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD> 2, 6, 13, 14, 15',0
boot_enablint_ide db '<27><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD> <20><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD> <20> <20><><EFBFBD><EFBFBD>஫<EFBFBD><E0AEAB><EFBFBD><EFBFBD> IDE',0
boot_detectfloppy db '<27><><EFBFBD><EFBFBD><EFBFBD> floppy <20><>᪮<EFBFBD><E1AAAE><EFBFBD><EFBFBD><EFBFBD>',0
boot_detecthdcd db '<27><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⪨<EFBFBD> <20><>᪮<EFBFBD> <20> ATAPI <20>ਢ<EFBFBD><E0A8A2><EFBFBD><EFBFBD>',0
boot_getcache db '<27><><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>',0
boot_detectpart db '<27><><EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>᪮<EFBFBD><E1AAAE><EFBFBD> <20><><EFBFBD>ன<EFBFBD>⢠<EFBFBD>',0
boot_init_sys db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD><EFBFBD> <20><>⠫<EFBFBD><E2A0AB><EFBFBD> /sys',0
boot_loadlibs db '<27><><EFBFBD><EFBFBD>㧪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪ (.obj)',0
boot_memdetect db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⢮ <20><><EFBFBD><EFBFBD><EFBFBD>⨢<EFBFBD><E2A8A2><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',' ',' <20><>',0
boot_tss db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> TSSs',0
boot_cpuid db '<27>⥭<EFBFBD><E2A5AD> CPUIDs',0
; boot_devices db '<27><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ன<EFBFBD><E0AEA9><EFBFBD>',0
boot_timer db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> ⠩<><E2A0A9><EFBFBD><EFBFBD>',0
boot_irqs db '<27><>८<EFBFBD>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IRQ',0
boot_setmouse db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>',0
if lang eq ru
boot_initirq db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IRQ',0
boot_picinit db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PIC',0
boot_v86machine db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD> V86 <20><>設<EFBFBD>',0
boot_inittimer db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD><EFBFBD> ⠩<><E2A0A9><EFBFBD><EFBFBD> (IRQ0)',0
boot_initapic db '<27><><EFBFBD><EFBFBD>⪠ <20><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD>樨 APIC',0
boot_enableirq db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD> 2, 6, 13, 14, 15',0
boot_enablint_ide db '<27><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD> <20><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD> <20> <20><><EFBFBD><EFBFBD>஫<EFBFBD><E0AEAB><EFBFBD><EFBFBD> IDE',0
boot_detectfloppy db '<27><><EFBFBD><EFBFBD><EFBFBD> floppy <20><>᪮<EFBFBD><E1AAAE><EFBFBD><EFBFBD><EFBFBD>',0
boot_detecthdcd db '<27><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⪨<EFBFBD> <20><>᪮<EFBFBD> <20> ATAPI <20>ਢ<EFBFBD><E0A8A2><EFBFBD><EFBFBD>',0
boot_getcache db '<27><><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>',0
boot_detectpart db '<27><><EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>᪮<EFBFBD><E1AAAE><EFBFBD> <20><><EFBFBD>ன<EFBFBD>⢠<EFBFBD>',0
boot_init_sys db '<27><><EFBFBD>樠<EFBFBD><E6A8A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD><EFBFBD> <20><>⠫<EFBFBD><E2A0AB><EFBFBD> /sys',0
boot_loadlibs db '<27><><EFBFBD><EFBFBD>㧪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪ (.obj)',0
boot_memdetect db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⢮ <20><><EFBFBD><EFBFBD><EFBFBD>⨢<EFBFBD><E2A8A2><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',' ',' <20><>',0
boot_tss db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> TSSs',0
boot_cpuid db '<27>⥭<EFBFBD><E2A5AD> CPUIDs',0
; boot_devices db '<27><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ன<EFBFBD><E0AEA9><EFBFBD>',0
boot_timer db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> ⠩<><E2A0A9><EFBFBD><EFBFBD>',0
boot_irqs db '<27><>८<EFBFBD>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IRQ',0
boot_setmouse db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>',0
boot_windefs db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>஥<EFBFBD> <20><><EFBFBD><EFBFBD> <20><> 㬮<>砭<EFBFBD><E7A0AD>',0
boot_bgr db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䮭<>',0
boot_resirqports db '<27><><EFBFBD><EFBFBD>ࢨ஢<E0A2A8><E0AEA2><EFBFBD><EFBFBD> IRQ <20> <20><><EFBFBD>⮢',0
@@ -78,69 +78,73 @@ if lang eq ru
boot_tsc db '<27>⥭<EFBFBD><E2A5AD> TSC',0
boot_cpufreq db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ',' ',' <20><><EFBFBD>',0
boot_pal_ega db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> EGA/CGA 320x200 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
boot_pal_vga db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> VGA 640x480 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
boot_failed db '<27><><EFBFBD><EFBFBD>㧪<EFBFBD> <20><>ࢮ<EFBFBD><E0A2AE> <20>ਫ<EFBFBD><E0A8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 㤠<><E3A4A0><EFBFBD><EFBFBD>',0
boot_mtrr db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> MTRR',0
boot_APIC_found db 'APIC <20><><EFBFBD><EFBFBD>祭', 0
boot_APIC_nfound db 'APIC <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', 0
if preboot_blogesc
boot_tasking db '<27><><EFBFBD> <20><>⮢<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>᪠, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ESC <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
end if
else
boot_initirq db 'Initialize IRQ',0
boot_picinit db 'Initialize PIC',0
boot_v86machine db 'Initialize system V86 machine',0
boot_inittimer db 'Initialize system timer (IRQ0)',0
boot_initapic db 'Try to initialize APIC',0
boot_enableirq db 'Enable interrupts 2, 6, 13, 14, 15',0
boot_enablint_ide db 'Enable interrupts in IDE controller',0
boot_detectfloppy db 'Search floppy drives',0
boot_detecthdcd db 'Search hard drives and ATAPI drives',0
boot_getcache db 'Get memory for cache',0
boot_detectpart db 'Search partitions on disk devices',0
boot_init_sys db 'Initialize system directory /sys',0
boot_loadlibs db 'Loading librares (.obj)',0
boot_memdetect db 'Determining amount of memory',0
boot_tss db 'Setting TSSs',0
boot_cpuid db 'Reading CPUIDs',0
; boot_devices db 'Detecting devices',0
boot_setmouse db 'Setting mouse',0
boot_windefs db 'Setting window defaults',0
boot_bgr db 'Calculating background',0
boot_pal_vga db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> VGA 640x480 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
boot_failed db '<27><><EFBFBD><EFBFBD>㧪<EFBFBD> <20><>ࢮ<EFBFBD><E0A2AE> <20>ਫ<EFBFBD><E0A8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 㤠<><E3A4A0><EFBFBD><EFBFBD>',0
boot_mtrr db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> MTRR',0
boot_APIC_found db 'APIC <20><><EFBFBD><EFBFBD>祭', 0
boot_APIC_nfound db 'APIC <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', 0
if preboot_blogesc
boot_tasking db '<27><><EFBFBD> <20><>⮢<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>᪠, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ESC <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
end if
else if lang eq sp
include 'data32sp.inc'
else
boot_initirq db 'Initialize IRQ',0
boot_picinit db 'Initialize PIC',0
boot_v86machine db 'Initialize system V86 machine',0
boot_inittimer db 'Initialize system timer (IRQ0)',0
boot_initapic db 'Try to initialize APIC',0
boot_enableirq db 'Enable interrupts 2, 6, 13, 14, 15',0
boot_enablint_ide db 'Enable interrupts in IDE controller',0
boot_detectfloppy db 'Search floppy drives',0
boot_detecthdcd db 'Search hard drives and ATAPI drives',0
boot_getcache db 'Get memory for cache',0
boot_detectpart db 'Search partitions on disk devices',0
boot_init_sys db 'Initialize system directory /sys',0
boot_loadlibs db 'Loading librares (.obj)',0
boot_memdetect db 'Determining amount of memory',0
boot_tss db 'Setting TSSs',0
boot_cpuid db 'Reading CPUIDs',0
; boot_devices db 'Detecting devices',0
boot_setmouse db 'Setting mouse',0
boot_windefs db 'Setting window defaults',0
boot_bgr db 'Calculating background',0
boot_resirqports db 'Reserving IRQs & ports',0
boot_setostask db 'Setting OS task',0
boot_allirqs db 'Unmasking IRQs',0
boot_tsc db 'Reading TSC',0
boot_cpufreq db 'CPU frequency is ',' ',' MHz',0
boot_pal_ega db 'Setting EGA/CGA 320x200 palette',0
boot_pal_vga db 'Setting VGA 640x480 palette',0
boot_failed db 'Failed to start first app',0
boot_mtrr db 'Setting MTRR',0
boot_APIC_found db 'APIC enabled', 0
boot_APIC_nfound db 'APIC not found', 0
if preboot_blogesc
boot_tasking db 'All set - press ESC to start',0
end if
end if
;new_process_loading db 'K : New Process - loading',13,10,0
;new_process_running db 'K : New Process - done',13,10,0
start_not_enough_memory db 'K : New Process - not enough memory',13,10,0
boot_pal_vga db 'Setting VGA 640x480 palette',0
boot_failed db 'Failed to start first app',0
boot_mtrr db 'Setting MTRR',0
boot_APIC_found db 'APIC enabled', 0
boot_APIC_nfound db 'APIC not found', 0
if preboot_blogesc
boot_tasking db 'All set - press ESC to start',0
end if
end if
;new_process_loading db 'K : New Process - loading',13,10,0
;new_process_running db 'K : New Process - done',13,10,0
start_not_enough_memory db 'K : New Process - not enough memory',13,10,0
msg_unresolved db 'unresolved ',0
msg_module db 'in module ',0
msg_version db 'incompatible driver version',13,10,0
msg_www db 'please visit www.kolibrios.org',13,10,0
msg_CR db 13,10,0
intel_str db "GenuineIntel",0
AMD_str db "AuthenticAMD",0
szHwMouse db 'ATI2D',0
szPS2MDriver db 'PS2MOUSE',0
;szCOM_MDriver db 'COM_MOUSE',0
if ~ lang eq sp
msg_version db 'incompatible driver version',13,10,0
msg_www db 'please visit www.kolibrios.org',13,10,0
end if
msg_CR db 13,10,0
intel_str db "GenuineIntel",0
AMD_str db "AuthenticAMD",0
szHwMouse db 'ATI2D',0
szPS2MDriver db 'PS2MOUSE',0
;szCOM_MDriver db 'COM_MOUSE',0
szUSB db 'USB',0
szAtiHW db '/rd/1/drivers/ati2d.drv',0
@@ -155,13 +159,13 @@ firstapp db 'LAUNCHER',0
notifyapp db '@notify',0
if lang eq ru
ud_user_message db '<27>訡<EFBFBD><E8A8A1>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ন<EFBFBD><E0A6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
else
ud_user_message db 'Error: unsupported processor instruction',0
end if
bootpath db '/KOLIBRI '
bootpath2 db 0
vmode db '/sys/drivers/VMODE.MDR',0
else if ~ lang eq sp
ud_user_message db 'Error: unsupported processor instruction',0
end if
bootpath db '/KOLIBRI '
bootpath2 db 0
vmode db '/sys/drivers/VMODE.MDR',0
;vrr_m db 'VRR_M',0
kernel_file db 'KERNEL MNT'