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

Regard whitespace Rev 437 → Rev 438

/kernel/branches/flat_kernel/kernel16.inc
File deleted
\ No newline at end of file

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

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

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

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

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

 /kernel/branches/flat_kernel/blkdev/rd.inc
 ,10 → 1,14
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+$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
 ,6 → 1877,9
         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:
 Added: svn:keywords
 +Rev
 \ No newline at end of property

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

 /kernel/branches/flat_kernel/boot/bootcode.inc
 ,12 → 1,19
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+$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
 ,9 → 296,7
     mov    [si + 5], ah
     mov    [si + 7], al
     _setcursor 0, 3
     call    printplain
-    _setcursor d80x25_top_num,0
     ; ------------------
     mov    ax, 0x5304            ; Disconnect interface
 ,11 → 315,13
     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
 ,9 → 556,10
 .bSettingsChanged db ?
 .timer dd ?
 end virtual
+        org $+0x10000
 .loader_block dd -1
+        org $-0x10000
 .gettime:
     mov    ah, 0
     int    1Ah
     xchg    ax, cx
 ,11 → 1000,9
 ;       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
 ,7 → 1029,6
         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
 ,3 → 1,4
+$Revision: 437 $
 ;======================================================================
 ;
 ;                           BOOT DATA
 ,46 → 5,6
 ;
 ;======================================================================
-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
 ,3 → 1,4
+$Revision: 437 $
 ;======================================================================
 ;
 ;                           BOOT DATA
 ,46 → 5,6
 ;
 ;======================================================================
-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
 ,3 → 1,4
+$Revision: 437 $
 ;======================================================================
 ;
 ;                           BOOT DATA
 ,46 → 5,6
 ;
 ;======================================================================
-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
 ,3 → 1,4
+$Revision: 437 $
 ;======================================================================
 ;
 ;                           BOOT DATA
 ,46 → 5,6
 ;
 ;======================================================================
-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/boot/bootstr.inc
 ,0 → 1,52
+; boot data: common strings (for all languages)
+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
+cur_line_pos = 75
+        store byte ' ' at d80x25_top+cur_line_pos+1
+rev_var = __REV__
+while rev_var > 0
+        store byte rev_var mod 10 + '0' at d80x25_top+cur_line_pos
+        cur_line_pos = cur_line_pos - 1
+        rev_var = rev_var / 10
+end while
+        store byte ' ' at d80x25_top+cur_line_pos
+        store dword ' SVN' at d80x25_top+cur_line_pos-4
+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

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

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

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

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

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

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

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

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

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

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

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

 /kernel/branches/flat_kernel/core/taskman.inc
 ,8 → 839,6
            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 → 1016,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 0x1202
+           mov [ebx+REG_EFLAGS], dword 0x3202
            mov eax, [esi+0x0C]       ;app_esp
            mov [ebx+REG_APP_ESP], eax    ;app_stack
 Property changes:
 Added: svn:keywords
 +Rev
 \ No newline at end of property

 /kernel/branches/flat_kernel/kernel.asm
 ,8 → 52,10
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; $Revision$
+include 'macros.inc'
+$Revision$
 include "proc32.inc"
 include "kglobals.inc"
 include "lang.inc"
 ,6 → 109,7
 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
 ,6 → 5037,8
 include "data32.inc"
+__REV__ = __REV
 uglobals_size = $ - endofcode
 diff16 "end of kernel code",0,$

 /kernel/branches/flat_kernel/macros.inc
 ,0 → 1,97
+__REV = 0
+macro $Revision a {
+  match =: Num =$,a \{
+    if __REV < Num
+      __REV = Num
+    end if
+  \}
+}
+$Revision: 426 $
+; structure definition helper
+macro struct name, [arg]
+ {
+  common
+   name@struct equ name
+   struc name arg {
+ }
+macro struct_helper name
+ {
+  match xname,name
+  \{
+   virtual at 0
+   xname xname
+   sizeof.#xname = $ - xname
+   name equ sizeof.#xname
+   end virtual
+  \}
+ }
+ends fix } struct_helper name@struct
+;// mike.dld, 2006-29-01 [
+; macros definition
+macro diff16 title,l1,l2
+{
+  local s,d
+  s = l2-l1
+  display title,': 0x'
+  repeat 8
+    d = 48 + s shr ((8-%) shl 2) and $0F
+    if d > 57
+      d = d + 65-57-1
+    end if
+    display d
+  end repeat
+  display 13,10
+}
+macro diff10 title,l1,l2
+ {
+  local s,d,z,m
+  s = l2-l1
+  z = 0
+  m = 1000000000
+  display title,': '
+  repeat 10
+   d = '0' + s / m
+   s = s - (s/m)*m
+   m = m / 10
+   if d <> '0'
+    z = 1
+   end if
+   if z <> 0
+    display d
+   end if
+  end repeat
+  display 13,10
+ }
+; \begin{diamond}[29.09.2006]
+; may be useful for kernel debugging
+; example 1:
+;       dbgstr 'Hello, World!'
+; example 2:
+;       dbgstr 'Hello, World!', save_flags
+macro dbgstr string*, f
+{
+local a
+iglobal_nested
+a db 'K : ',string,13,10,0
+endg_nested
+if ~ f eq
+        pushfd
+end if
+        push    esi
+        mov     esi, a
+        call    sys_msg_board_str
+        pop     esi
+if ~ f eq
+        popfd
+end if
+}
+; \end{diamond}[29.09.2006]

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 437 → Rev 438