diff --git a/kernel/branches/Kolibri-A/trunk/bus/HT.INC b/kernel/branches/Kolibri-A/trunk/bus/HT.inc similarity index 94% rename from kernel/branches/Kolibri-A/trunk/bus/HT.INC rename to kernel/branches/Kolibri-A/trunk/bus/HT.inc index 25e2ccbcc9..2bbdc13ffb 100644 --- a/kernel/branches/Kolibri-A/trunk/bus/HT.INC +++ b/kernel/branches/Kolibri-A/trunk/bus/HT.inc @@ -3,7 +3,6 @@ ;; Copyright (C) 2010 KolibriOS team. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; -;; HT.inc ;; ;; ;; ;; ;; AMD HyperTransport bus control ;; ;; ;; diff --git a/kernel/branches/Kolibri-A/trunk/kernel.asm b/kernel/branches/Kolibri-A/trunk/kernel.asm index 0681a3f61e..67423fc2d0 100644 --- a/kernel/branches/Kolibri-A/trunk/kernel.asm +++ b/kernel/branches/Kolibri-A/trunk/kernel.asm @@ -68,7 +68,6 @@ USE_COM_IRQ equ 1 ; make irq 3 and irq 4 available for PCI devices include "proc32.inc" include "kglobals.inc" -include "lang.inc" include "const.inc" max_processes equ 255 @@ -125,12 +124,7 @@ version db 'Kolibri OS version 0.7.7.0+ ',13,10,13,10,0 include "boot/bootstr.inc" ; language-independent boot messages include "boot/preboot.inc" -if lang eq en include "boot/booteng.inc" ; english system boot messages -else -include "boot/bootru.inc" ; russian system boot messages -include "boot/ru.inc" ; Russian font -end if include "boot/bootcode.inc" ; 16 bit system boot code include "bus/pci/pci16.inc" @@ -1920,6 +1914,7 @@ sysfn_terminate: ; 18.2 = TERMINATE cmp edx,[application_table_status] ; clear app table stat jne noatsc + and [application_table_status],0 noatsc: noprocessterminate: diff --git a/kernel/branches/Kolibri-A/trunk/kernel32.inc b/kernel/branches/Kolibri-A/trunk/kernel32.inc index 1aae78cd1d..ee7fdbed35 100644 --- a/kernel/branches/Kolibri-A/trunk/kernel32.inc +++ b/kernel/branches/Kolibri-A/trunk/kernel32.inc @@ -246,8 +246,8 @@ include "gui/skincode.inc" ; Pci functions include "bus/pci/pci32.inc" -include "bus/pci/pcie.inc" -include "bus/ht.inc" ; AMD HyperTransport bus control +include "bus/pci/PCIe.inc" +include "bus/HT.inc" ; AMD HyperTransport bus control ; Floppy drive controller diff --git a/kernel/branches/Kolibri-A/trunk/kmake.sh b/kernel/branches/Kolibri-A/trunk/kmake.sh new file mode 100755 index 0000000000..b4caf44034 --- /dev/null +++ b/kernel/branches/Kolibri-A/trunk/kmake.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# This is a simplified script to compile Kolibri-A kernel +# please place *fasm program to the topmost KOS directory +# and create an empty /bin folder there before run this script + + ../../../../../fasm -m 65536 kernel.asm ../../../../../bin/kernel.mnt + exit 0 + + diff --git a/kernel/branches/Kolibri-A/trunk/make.sh b/kernel/branches/Kolibri-A/trunk/make.sh deleted file mode 100755 index d49fd1221e..0000000000 --- a/kernel/branches/Kolibri-A/trunk/make.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# This script does for linux the same as build.bat for DOS, -# it compiles the KoOS kernel, hopefully ;-) - -CLANG=$1; - -usage() -{ - echo "Usage: make.sh [en|ru|ge|et]" - exit 1 -} - -compile() -{ - fasm -m 65536 kernel.asm bin/kernel.mnt - rm -f lang.inc - exit 0 -} - - -if [ ! $CLANG ] ; then - usage -fi - -for i in "en" "ru" "ge" "et"; do - if [ $i == $CLANG ] ; then - echo "lang fix $i" > lang.inc - compile - fi -done -usage - -