WebSVN – Kolibri OS – Path Comparison – / – /kernel/branches/ Rev 438 and /kernel/branches/ Rev 437

Regard whitespace Rev 438 → Rev 437

/kernel/branches/flat_kernel/macros.inc
File deleted

/kernel/branches/flat_kernel/core/fpu.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/sched.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/sys32.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/syscall.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/dll.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/memory.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

 /kernel/branches/flat_kernel/core/taskman.inc
 ,6 → 839,8
            rep    stosd               ;clean extended information about new thread
            mov    esi,ebx
            mov    edi,edx
+           mov byte [edi], '@'
+           inc    edi
            mov    ecx,11
            rep    movsb               ;copy process name
 ,7 → 1018,7
            mov eax, [esi+0x08]       ;app_eip
            mov [ebx+REG_EIP],  eax   ;app_entry
            mov [ebx+REG_CS], dword app_code
-           mov [ebx+REG_EFLAGS], dword 0x3202
+           mov [ebx+REG_EFLAGS], dword 0x1202
            mov eax, [esi+0x0C]       ;app_esp
            mov [ebx+REG_APP_ESP], eax    ;app_stack
 Property changes:
 Deleted: svn:keywords
 -Rev
 \ No newline at end of property

/kernel/branches/flat_kernel/core/debug.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/heap.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/malloc.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/sync.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/core/exports.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

 /kernel/branches/flat_kernel/kernel.asm
 ,10 → 52,8
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-include 'macros.inc'
+; $Revision$
-$Revision$
 include "proc32.inc"
 include "kglobals.inc"
 include "lang.inc"
 ,7 → 107,6
 version db    'Kolibri OS  version 0.6.5.0      ',13,10,13,10,0
-include "boot/bootstr.inc"     ; language-independent boot messages
 include "boot/preboot.inc"
 if lang eq en
 ,8 → 5034,6
 include "data32.inc"
-__REV__ = __REV
 uglobals_size = $ - endofcode
 diff16 "end of kernel code",0,$

/kernel/branches/flat_kernel/blkdev/hd_drv.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

 /kernel/branches/flat_kernel/blkdev/rd.inc
 ,14 → 1,10
-$Revision$
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                      ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
 ;; RAMDISK functions                                                    ;;
 ;; (C) 2004 Ville Turjanmaa, License: GPL                               ;;
 ;; Addings by M.Lisovin                                                 ;;
 ;; LFN support by diamond                                               ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; calculate fat chain
 ,9 → 1873,6
         mov     byte [edi-32+11], 10h
         mov     eax, [esp+16+8]
         mov     word [edi-32+26], ax
-        xor     eax, eax
-        mov     ecx, (512-32*2)/4
-        rep     stosd
         pop     edi edi ecx edx
         add     esp, 20
         popad
 Property changes:
 Deleted: svn:keywords
 -Rev
 \ No newline at end of property

/kernel/branches/flat_kernel/blkdev/fdc.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/blkdev/flp_drv.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/blkdev/cdrom.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/blkdev/rdsave.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/blkdev/cd_drv.inc
Property changes:
Deleted: svn:keywords
-Rev
\ No newline at end of property

/kernel/branches/flat_kernel/boot/bootstr.inc
File deleted

 /kernel/branches/flat_kernel/boot/bootcode.inc
 ,19 → 1,12
-$Revision: 437 $
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
-;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
 ;;  BOOTCODE.INC                                                ;;
 ;;                                                              ;;
 ;;  KolibriOS 16-bit loader,                                    ;;
 ;;                        based on bootcode for MenuetOS        ;;
 ;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;==========================================================================
 ;
 ;                           16 BIT FUNCTIONS
 ,7 → 289,9
     mov    [si + 5], ah
     mov    [si + 7], al
     _setcursor 0, 3
     call    printplain
+    _setcursor d80x25_top_num,0
     ; ------------------
     mov    ax, 0x5304            ; Disconnect interface
 ,13 → 310,11
     mov [es:0x9054], dx
 apm_end:
-        _setcursor d80x25_top_num, 0
-; -----------------------------------------
 ; DISPLAY VESA INFORMATION
     push    0
     pop    es
         mov     ax,0x4f00
         mov     di,0xa000
         int     0x10
 ,10 → 549,9
 .bSettingsChanged db ?
 .timer dd ?
 end virtual
-        org $+0x10000
 .loader_block dd -1
-        org $-0x10000
 .gettime:
     mov    ah, 0
     int    1Ah
     xchg    ax, cx
 ,9 → 992,11
 ;       readdone:
 ;        pop     ax
+        mov     si,backspace2
         call    printplain
         mov     si,okt
         call    printplain
        no_sys_on_floppy:
         xor    ax, ax        ; reset drive
         xor    dx, dx
 ,6 → 1023,7
         test    ah,ah
         mov    si, fatalsel
         jnz    sayerr
 ; set mode 0x12 graphics registers:
         cmp     bx,0x12
         jne     gmok2

 /kernel/branches/flat_kernel/boot/booteng.inc
 ,4 → 1,3
-$Revision: 437 $
 ;======================================================================
 ;
 ;                           BOOT DATA
 ,6 → 4,46
 ;
 ;======================================================================
+macro line_full_top {
+          db       201
+          times    78   db 205
+          db       187
+}
+macro line_full_bottom {
+          db       200
+          times    78   db 205
+          db       188
+}
+macro line_half {
+          db      186,' '
+          times    76   db 0xc4
+          db      ' ',186
+}
+macro line_space {
+          db      186
+          times   78 db 32
+          db      186
+}
+d80x25_top:
+                line_full_top
+space_msg:      line_space
+verstr:
+;               line_space
+; version string
+        db 186,32
+        repeat 78
+                load a byte from version+%-1
+                if a = 13
+                        break
+                end if
+                db a
+        end repeat
+        repeat 78 - ($-verstr)
+                db      ' '
+        end repeat
+        db 32,186
+                line_half
+d80x25_top_num = 4
 d80x25_bottom:
           db       186,' KolibriOS based on MenuetOS and comes with ABSOLUTELY '
           db       'NO WARRANTY            ',186

 /kernel/branches/flat_kernel/boot/bootet.inc
 ,4 → 1,3
-$Revision: 437 $
 ;======================================================================
 ;
 ;                           BOOT DATA
 ,6 → 4,46
 ;
 ;======================================================================
+macro line_full_top {
+          db       201
+          times    78   db 205
+          db       187
+}
+macro line_full_bottom {
+          db       200
+          times    78   db 205
+          db       188
+}
+macro line_half {
+          db      186,' '
+          times    76   db 0xc4
+          db      ' ',186
+}
+macro line_space {
+          db      186
+          times   78 db 32
+          db      186
+}
+d80x25_top:
+                line_full_top
+space_msg:      line_space
+verstr:
+;               line_space
+; version string
+        db 186,32
+        repeat 78
+                load a byte from version+%-1
+                if a = 13
+                        break
+                end if
+                db a
+        end repeat
+        repeat 78 - ($-verstr)
+                db      ' '
+        end repeat
+        db 32,186
+                line_half
+d80x25_top_num = 4
 d80x25_bottom:
           db       186,' KolibriOS based on MenuetOS and comes with ABSOLUTELY '
           db       'NO WARRANTY            ',186

 /kernel/branches/flat_kernel/boot/bootge.inc
 ,4 → 1,3
-$Revision: 437 $
 ;======================================================================
 ;
 ;                           BOOT DATA
 ,6 → 4,46
 ;
 ;======================================================================
+macro line_full_top {
+          db       201
+          times    78   db 205
+          db       187
+}
+macro line_full_bottom {
+          db       200
+          times    78   db 205
+          db       188
+}
+macro line_half {
+          db      186,' '
+          times    76   db 0xc4
+          db      ' ',186
+}
+macro line_space {
+          db      186
+          times   78 db 32
+          db      186
+}
+d80x25_top:
+                line_full_top
+space_msg:      line_space
+verstr:
+;               line_space
+; version string
+        db 186,32
+        repeat 78
+                load a byte from version+%-1
+                if a = 13
+                        break
+                end if
+                db a
+        end repeat
+        repeat 78 - ($-verstr)
+                db      ' '
+        end repeat
+        db 32,186
+                line_half
+d80x25_top_num = 4
 d80x25_bottom:
 ;          db       186,' KolibriOS based on MenuetOS and comes with ABSOLUTELY '
 ;          db       'NO WARRANTY            ',186

 /kernel/branches/flat_kernel/boot/bootru.inc
 ,4 → 1,3
-$Revision: 437 $
 ;======================================================================
 ;
 ;                           BOOT DATA
 ,6 → 4,46
 ;
 ;======================================================================
+macro line_full_top {
+          db       201
+          times    78   db 205
+          db       187
+}
+macro line_full_bottom {
+          db       200
+          times    78   db 205
+          db       188
+}
+macro line_half {
+          db      186,' '
+          times    76   db 0xc4
+          db      ' ',186
+}
+macro line_space {
+          db      186
+          times   78 db 32
+          db      186
+}
+d80x25_top:
+                line_full_top
+space_msg:      line_space
+verstr:
+;               line_space
+; version string
+        db 186,32
+        repeat 78
+                load a byte from version+%-1
+                if a = 13
+                        break
+                end if
+                db a
+        end repeat
+        repeat 78 - ($-verstr)
+                db      ' '
+        end repeat
+        db 32,186
+                line_half
+d80x25_top_num = 4
 d80x25_bottom:
           db       186,' Kolibri OS ®á®¢     Menuet OS ¨ ¥ ¯à¥¤®áâ ¢«ï¥â '
           db       '¨ª ª¨å £ àaâ¨©.        ',186

 /kernel/branches/flat_kernel/kernel16.inc
 ,0 → 1,40
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                            ;;
+;; KERNEL16.INC                                               ;;
+;;                                                            ;;
+;; Included 16 bit kernel files for MenuetOS                  ;;
+;;                                                            ;;
+;; This file is kept separate as it will be easier to         ;;
+;; maintain and compile with an automated SETUP program       ;;
+;; in the future.                                             ;;
+;;                                                            ;;
+;; Copyright Ville Turjanmaa, see file COPYING for details.   ;;
+;;                                                            ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;% +include
+;!!!
+if lang eq en
+include "boot/booteng.inc"     ; english system boot messages
+else if lang eq ru
+include "boot/bootru.inc"      ; russian system boot messages
+else if lang eq et
+include "boot/bootet.inc"      ; estonian system boot messages
+else
+include "boot/bootge.inc"      ; german system boot messages
+;!!!
+end if
+if lang eq et
+include "boot/et.inc"          ; Estonian font
+else
+include "boot/ru.inc"          ; Russian font
+end if
+org $-0x10000
+include "boot/bootcode.inc"    ; 16 bit system boot code
+include "bus/pci/pci16.inc"
+;% -include

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 438 → Rev 437