diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 899d9d4da4..57a1edcacd 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -588,7 +588,6 @@ tup.append_table(img_files, { {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"}, {"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"}, {"PANELS_CFG", PROGS .. "/cmm/panels_cfg/panels_cfg.com"}, - {"@KERNEL", PROGS .. "/cmm/KERNEL/kernel.com"}, }) tup.append_table(extra_files, { {"kolibrios/drivers/DRVINST.KEX", PROGS .. "/cmm/drvinst/drvinst.com"}, diff --git a/data/common/settings/AUTORUN.DAT b/data/common/settings/AUTORUN.DAT index 280eec3ac1..8f9438f7de 100644 --- a/data/common/settings/AUTORUN.DAT +++ b/data/common/settings/AUTORUN.DAT @@ -8,7 +8,6 @@ #/SYS/DEVELOP/BOARD "" 0 # Load DEBUG board /SYS/SETUP BOOT 0 # Load device settings /SYS/LOADDRV RDC 0 # videodriver for RDC M2010/M2012 -/SYS/@KERNEL "" 0 # Start modify KERNEL /SYS/@TASKBAR "" 0 # Start taskbar /SYS/@ICON "" 0 # Multithread icon /SYS/ESKIN "" 0 # Set style diff --git a/kernel/trunk/core/syscall.inc b/kernel/trunk/core/syscall.inc index 9015cef375..83f6354018 100644 --- a/kernel/trunk/core/syscall.inc +++ b/kernel/trunk/core/syscall.inc @@ -179,75 +179,8 @@ iglobal dd undefined_syscall ; 78-free dd undefined_syscall ; 79-free dd fileSystemUnicode ; 80-File system interface for different encodings - dd setInt0x40 ; 81-Implementation of the function in the system times 255 - ( ($-servetable2) /4 ) dd undefined_syscall dd sys_end ; -1-end application endg - -; Author Pavel Iakovlev -align 32 -callSet0x40: - shl eax, 2 - push dword [memNewFunctionTable + eax] - pop dword [tempPointerAlloc] - mov eax, dword [memOldFunctionTable + eax] - call dword [tempPointerAlloc] - ret -align 4 -setInt0x40: - - and ebx, 0FFh - shl ebx, 2 - mov eax, dword [servetable2 + ebx] - - pushad - sub esi, edx - add esi, 16 - stdcall kernel_alloc, esi - mov dword [tempPointerAlloc], eax - popad - - push ebx - mov eax, dword [tempPointerAlloc] - mov ebx, eax - add eax, esi - sub eax, edx - - push edx - push ecx - loopCopyMemory: - - mov cl, byte[edx] - mov byte[ebx], cl - inc ebx - inc edx - cmp ebx, eax - jne loopCopyMemory - - pop ecx - pop edx - pop ebx - - mov eax, dword [tempPointerAlloc] - mov esi, dword [servetable2 + ebx] - cmp esi, undefined_syscall - jne .step1 - sub ecx, edx - add eax, ecx - mov dword [servetable2 + ebx], eax - ret - .step1: - mov dword [memOldFunctionTable + ebx], esi - sub ecx, edx - add eax, ecx - mov dword [memNewFunctionTable + ebx], eax - mov dword [servetable2 + ebx], callSet0x40 - ret - -align 4 -tempPointerAlloc dd 0 -memOldFunctionTable: times 255 dd 0 -memNewFunctionTable: times 255 dd 0 -;------------------- \ No newline at end of file diff --git a/programs/cmm/KERNEL/Tupfile.lua b/programs/cmm/KERNEL/Tupfile.lua deleted file mode 100644 index e99eed0da2..0000000000 --- a/programs/cmm/KERNEL/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("kernel.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "kernel.com")