Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 2288 → Rev 2287

/kernel/trunk/const.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/malloc.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/apic.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/irq.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/sys32.inc
20,8 → 20,7
mov esi, sys_int
mov ecx, 0x40
mov eax, (10001110b shl 24) + os_code
@@:
movsw ;low word of code-entry
@@: movsw ;low word of code-entry
stosd ;interrupt gate type : os_code selector
movsw ;high word of code-entry
loop @b
139,15 → 138,13
cmp bl, 14 ; #PF
jne @f
call page_fault_handler ; SEE: core/memory.inc
@@:
mov esi, [current_slot]
@@: mov esi, [current_slot]
btr [esi+APPDATA.except_mask], ebx
jnc @f
mov eax, [esi+APPDATA.exc_handler]
test eax, eax
jnz IRetToUserHook
@@:
cli
@@: cli
mov eax, [esi+APPDATA.debugger_slot]
test eax, eax
jnz .debug
168,12 → 165,10
mov dr6, edx
mov edx, dr7
mov cl, not 8
.l1:
shl dl, 2
.l1: shl dl,2
jc @f
and bl, cl
@@:
sar cl, 1
@@: sar cl,1
jc .l1
mov cl, 3 ; debug_message code=debug_exception
.notify:
218,10 → 213,8
jb .l0
cmp bl, 0x0e
jbe .l1
.l0:
mov bl, 0x09
.l1:
mov eax, [msg_fault_sel+ebx*4 - 0x08*4]
.l0: mov bl, 0x09
.l1: mov eax,[msg_fault_sel+ebx*4 - 0x08*4]
DEBUGF 1, "K : %s\n", eax
mov eax, [reg_cs3+4]
mov edi, msg_sel_app
230,8 → 223,7
je @f
mov edi, msg_sel_ker
mov ebx, [reg_esp0+4]
@@:
DEBUGF 1, "K : EAX : %x EBX : %x ECX : %x\n", [reg_eax+4], [reg_ebx+4], [reg_ecx+4]
@@: DEBUGF 1, "K : EAX : %x EBX : %x ECX : %x\n", [reg_eax+4], [reg_ebx+4], [reg_ecx+4]
DEBUGF 1, "K : EDX : %x ESI : %x EDI : %x\n", [reg_edx+4], [reg_esi+4], [reg_edi+4]
DEBUGF 1, "K : EBP : %x EIP : %x ESP : %x\n", [reg_ebp+4], [reg_eip+4], ebx
DEBUGF 1, "K : Flags : %x CS : %x (%s)\n", [reg_eflags+4], eax, edi
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/memory.inc
470,8 → 470,7
pop eax
call free_page
 
.next:
add edi, 1
.next: add edi, 1
cmp edi, esi
jb @B
 
798,8 → 797,7
; and eax, 0xFFFFF000
; stdcall map_page, edi, eax
 
@@:
mov edi, [lin_addr]
@@: mov edi, [lin_addr]
and edi, 0xFFFFF000
mov ecx, [buf_size]
add ecx, 4095
859,8 → 857,7
jz .exit
stdcall map_page, edi, eax, PG_UW
 
@@:
mov edi, [lin_addr]
@@: mov edi, [lin_addr]
and edi, 0xFFFFF000
mov ecx, [buf_size]
add ecx, 4095
991,8 → 988,7
add edx, 4095
and edx, not 4095
 
.touch:
mov eax, [ecx]
.touch: mov eax, [ecx]
add ecx, 0x1000
cmp ecx, edx
jb .touch
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/heap.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/peload.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/sched.inc
60,8 → 60,7
end if
call find_next_task
jz .return ; the same task -> skip switch
@@:
mov byte[DONT_SWITCH], 1
@@: mov byte[DONT_SWITCH], 1
call do_change_task
.return:
popad
122,8 → 121,7
jb @f
xor bh, bh
mov edi, CURRENT_TASK
@@:
inc bh ; ebx += APPDATA.size
@@: inc bh ; ebx += APPDATA.size
add edi, 0x20; edi += TASKDATA.size
mov al, [edi+TASKDATA.state]
test al, al
142,8 → 140,7
sub ecx, [ebx+APPDATA.wait_begin]
cmp ecx, [ebx+APPDATA.wait_timeout]
jb .loop
@@:
mov [ebx+APPDATA.wait_param], eax ; retval for wait
@@: mov [ebx+APPDATA.wait_param], eax ; retval for wait
mov [edi+TASKDATA.state], 0
.found:
mov [CURRENT_TASK], bh
217,8 → 214,7
mov reg, eax
} lodsReg dr0, dr1, dr2, dr3, dr7
purge lodsReg
@@:
ret
@@: ret
;end.
 
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/v86.inc
371,8 → 371,7
jne @f
xor eax, eax
mov dr6, eax
@@:
mov eax, [esp+v86_regs.size+10h+18h]
@@: mov eax, [esp+v86_regs.size+10h+18h]
cmp word [esp+v86_regs.eip], ax
jnz @f
shr eax, 16
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/taskman.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/syscall.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/exports.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/timers.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/dll.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/debug.inc
13,8 → 13,7
cmp ebx, 9
ja @f
jmp dword [sys_debug_services_table+ebx*4]
@@:
ret
@@: ret
iglobal
align 4
sys_debug_services_table:
94,8 → 93,7
cmp cl, 5
jnz .ret
mov cl, 2
.2:
mov [CURRENT_TASK+eax+TASKDATA.state], cl
.2: mov [CURRENT_TASK+eax+TASKDATA.state], cl
.ret:
sti
ret
110,12 → 108,9
cmp cl, 2
jnz .ret
mov cl, 5
.2:
mov [CURRENT_TASK+eax+TASKDATA.state], cl
.ret:
ret
.1:
dec ecx
.2: mov [CURRENT_TASK+eax+TASKDATA.state], cl
.ret: ret
.1: dec ecx
jmp .2
 
debug_resume:
127,8 → 122,7
shl eax, 5
jz .ret
call do_resume
.ret:
sti
.ret: sti
ret
 
debug_getcontext:
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/test_malloc.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/ext_lib.inc
158,8 → 158,7
 
proc dll.Load, import_table:dword
mov esi, [import_table]
.next_lib:
mov edx, [esi]
.next_lib: mov edx,[esi]
or edx, edx
jz .exit
push esi
169,8 → 168,7
mov al, '/'
stosb
mov esi, sysdir_path
@@:
lodsb
@@: lodsb
stosb
or al, al
jnz @b
181,8 → 179,7
pop esi
push esi
mov esi, [esi+4]
@@:
lodsb
@@: lodsb
stosb
or al, al
jnz @b
198,11 → 195,9
pop esi
add esi, 8
jmp .next_lib
.exit:
xor eax, eax
.exit: xor eax,eax
ret
.fail:
add esp, 4
.fail: add esp,4
xor eax, eax
inc eax
ret
213,8 → 208,7
mov esi, [imp]
test esi, esi
jz .done
.next:
lodsd
.next: lodsd
test eax, eax
jz .done
stdcall dll.GetProcAddress, [exp], eax
222,10 → 216,8
jz @f
mov [esi-4], eax
jmp .next
@@:
mov dword[esp], 0
.done:
pop eax
@@: mov dword[esp],0
.done: pop eax
ret
endp
 
242,8 → 234,7
 
proc dll.GetProcAddress, exp:dword,sz_name:dword
mov edx, [exp]
.next:
test edx, edx
.next: test edx,edx
jz .end
stdcall strncmp, [edx], [sz_name], dword -1
test eax, eax
250,10 → 241,8
jz .ok
add edx, 8
jmp .next
.ok:
mov eax, [edx+4]
.end:
ret
.ok: mov eax,[edx+4]
.end: ret
endp
 
;-----------------------------------------------------------------------------
287,8 → 276,7
add ecx, -4
cmp ecx, [eax-4]
je .exit
@@:
mov eax, ebx
@@: mov eax,ebx
call mem.Alloc
xchg eax, [esp]
or eax, eax
300,8 → 288,7
cmp ecx, [edi-4]
jbe @f
mov ecx, [edi-4]
@@:
add ecx, 3
@@: add ecx,3
shr ecx, 2
cld
rep movsd
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/conf_lib.inc
13,8 → 13,7
$Revision$
 
iglobal
conf_path_sect:
db 'path',0
conf_path_sect: db 'path',0
 
conf_fname db '/sys/sys.conf',0
endg
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/fpu.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/export.inc
28,8 → 28,7
local name
dd (name-OS_BASE)
common
ordinal:
count = 0
ordinal: count = 0
forward
dw count
count = count+1
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/string.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/core/sync.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/kernel.asm
171,20 → 171,17
mov al, 255 ; mask all irqs
out 0xa1, al
out 0x21, al
l.5:
in al, 0x64 ; Enable A20
l.5: in al, 0x64 ; Enable A20
test al, 2
jnz l.5
mov al, 0xD1
out 0x64, al
l.6:
in al, 0x64
l.6: in al, 0x64
test al, 2
jnz l.6
mov al, 0xDF
out 0x60, al
l.7:
in al, 0x64
l.7: in al, 0x64
test al, 2
jnz l.7
mov al, 0xFF
985,8 → 982,7
if preboot_blogesc
mov esi, boot_tasking
call boot_log
.bll1:
in al, 0x60 ; wait for ESC key press
.bll1: in al, 0x60 ; wait for ESC key press
cmp al, 129
jne .bll1
end if
1982,8 → 1978,7
exit_for_anyone:
ret
uglobal
shutdown_processes:
dd 0x0
shutdown_processes: dd 0x0
endg
;------------------------------------------------------------------------------
sysfn_terminate: ; 18.2 = TERMINATE
2784,8 → 2779,7
sys_clock:
cli
; Mikhail Lisovin xx Jan 2005
@@:
mov al, 10
@@: mov al, 10
out 0x70, al
in al, 0x71
test al, al
2822,8 → 2816,7
sys_date:
 
cli
@@:
mov al, 10
@@: mov al, 10
out 0x70, al
in al, 0x71
test al, al
3336,8 → 3329,7
mov ah, al
cld
 
cnt1:
in al, 0x61
cnt1: in al,0x61
and al, 0x10
cmp al, ah
jz cnt1
4186,8 → 4178,7
ret
 
uglobal
msg_board_data:
times 4096 db 0
msg_board_data: times 4096 db 0
msg_board_count dd 0x0
endg
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/bootcode.inc
712,8 → 712,7
sub word [cursor_pos], size_of_step
jmp .loops
 
.down:
cmp ah, 0x50;x,0x50E0 ; down
.down: cmp ah,0x50;x,0x50E0 ; down
jne .pgup
cmp word[es:si+10], -1
je .loops
720,8 → 719,7
add word [cursor_pos], size_of_step
jmp .loops
 
.pgup:
cmp ah, 0x49 ; page up
.pgup: cmp ah,0x49 ; page up
jne .pgdn
sub si, size_of_step*long_v_table
cmp si, modes_table
738,8 → 736,7
mov word [home_cursor], si
jmp .loops
 
.pgdn:
cmp ah, 0x51 ; page down
.pgdn: cmp ah,0x51 ; page down
jne .enter
mov ax, [end_cursor]
add si, size_of_step*long_v_table
759,8 → 756,7
mov word [home_cursor], si
jmp .loops
 
.enter:
cmp al, 0x0D;x,0x1C0D ; enter
.enter: cmp al,0x0D;x,0x1C0D ; enter
jne .loops
push word [cursor_pos]
pop bp
805,8 → 801,7
popf
jz @f
mov si, off_msg
@@:
jmp printplain
@@: jmp printplain
; novesa and vervesa strings are not used at the moment of executing this code
virtual at novesa
.oldtimer dd ?
855,8 → 850,7
mov cl, 'ã'
jz @f
mov cl, 'ë'
@@:
mov [time_str+9], cl
@@: mov [time_str+9], cl
else if lang eq et
cmp al, 1
ja @f
869,8 → 863,7
mov cl, 's'
ja @f
mov cl, ' '
@@:
mov [time_str+9], cl
@@: mov [time_str+9], cl
end if
add al, '0'
mov [time_str+1], al
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/booteng.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/bootet.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/bootge.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/bootru.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/parsers.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/preboot.inc
35,8 → 35,7
end if
 
if $>0x200
ERROR:
prebooting parameters must fit in first sector!!!
ERROR: prebooting parameters must fit in first sector!!!
end if
hdsysimage db 'KOLIBRI IMG' ; load from
image_save db 'KOLIBRI IMG' ; save to
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/bootvesa.inc
94,8 → 94,7
push edx
call int2str
pop eax
@@:
or al, 0x30
@@: or al,0x30
mov [ds:di], al
inc di
ret
108,8 → 107,7
push edx
call int2strnz
pop eax
@@:
or al, 0x30
@@: or al,0x30
mov [es:di], al
inc di
ret
246,8 → 244,7
jb .lp1
 
or cx, 0x4000 ; use LFB
.lp1:
mov [es:bx+6], cx ; +6 : mode number
.lp1: mov [es:bx+6],cx ; +6 : mode number
movzx ax, byte [es:mi.BitsPerPixel]
mov word [es:bx+8], ax ; +8 : bits per pixel
add bx, size_of_step ; size of record
366,8 → 363,7
je .ok_found_mode
cmp word [es:si+8], 24
je .ok_found_mode
@@:
add si, size_of_step
@@: add si,size_of_step
cmp word [es:si], -1
jnz .findvbemode
.novbemode:
442,8 → 438,7
 
mov ecx, long_v_table
 
.loop:
add ax, size_of_step
.loop: add ax,size_of_step
cmp ax, word [end_cursor]
jae .next_step
loop .loop
476,16 → 471,13
je .ok
cmp word [es:si+8], 24
je .ok
.next:
add si, size_of_step
.next: add si,size_of_step
cmp word [es:si], -1
je .exit
jmp .loops
.ok:
xor ax, ax
.ok: xor ax,ax
ret
.exit:
or ax, -1
.exit: or ax,-1
ret
 
 
528,8 → 520,7
jmp .ok
 
 
.low:
sub cx, size_of_step
.low: sub cx,size_of_step
cmp cx, modes_table
jb .ok
push cx
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/shutdown.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/ru.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/bootstr.inc
42,8 → 42,7
store byte ' ' at d80x25_top+cur_line_pos
store dword ' SVN' at d80x25_top+cur_line_pos-4
 
space_msg:
line_space
space_msg: line_space
verstr:
; line_space
; version string
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/et.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/boot/rdload.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/data16.inc
12,8 → 12,7
preboot_lfb db 0
preboot_bootlog db 0
boot_drive db 0
bx_from_load:
dw 'r1' ; ñòðóêòóðà äëÿ õðàíåíèÿ ïàðàìåòðîâ- îòêóäà ãàøðóçèëèñü, áåðåòñÿ íèæå èç bx ; {SPraid}[13.03.2007]
bx_from_load: dw 'r1' ; ñòðóêòóðà äëÿ õðàíåíèÿ ïàðàìåòðîâ- îòêóäà ãàøðóçèëèñü, áåðåòñÿ íèæå èç bx ; {SPraid}[13.03.2007]
; a,b,c,d - âèí÷åñòåðû, r - ðàì äèñê
; # äèñêà... ñèìâîë, à íå áàéò. '1', à íå 1
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/disk.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/disk_cache.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/cd_drv.inc
170,15 → 170,13
MaxCDWaitTime equ 1000 ;200 ;10 ñåêóíä
uglobal
; Îáëàñòü ïàìÿòè äëÿ ôîðìèðîâàíèÿ ïàêåòíîé êîìàíäû
PacketCommand:
rb 12 ;DB 12 DUP (?)
PacketCommand: rb 12 ;DB 12 DUP (?)
; Îáëàñòü ïàìÿòè äëÿ ïðèåìà äàííûõ îò äèñêîâîäà
;CDDataBuf DB 4096 DUP (0)
; Ðàçìåð ïðèíèìàåìîãî áëîêà äàííûõ â áàéòàõ
;CDBlockSize DW ?
; Àäðåñ ñ÷èòûâàåìîãî ñåêòîðà äàííûõ
CDSectorAddress:
DD ?
CDSectorAddress: DD ?
; Âðåìÿ íà÷àëà î÷åðåäíîé îïåðàöèè ñ äèñêîì
TickCounter_1 DD 0
; Âðåìÿ íà÷àëà îæèäàíèÿ ãîòîâíîñòè óñòðîéñòâà
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/hd_drv.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/rd.inc
1169,8 → 1169,7
add edi, 6
cmp word [edi], ' '
jnz .insert_tilde
@@:
dec edi
@@: dec edi
cmp byte [edi], ' '
jz @b
inc edi
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/rdsave.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/flp_drv.inc
176,8 → 176,7
@@GetByteFromFDC:
inc DX
in AL, DX
@@End_6:
pop DX
@@End_6: pop DX
pop ECX
ret
 
223,8 → 222,7
; Îøèáêà òàéì-àóòà
mov [FDC_Status], FDC_TimeOut
; mov [flp_status],0
@@End_7:
popa
@@End_7: popa
ret
 
;*********************************
458,8 → 456,7
jnz @@Err_1
mov [FDC_Status], FDC_Normal
jmp @@Exit_1
@@Err_1:
mov [FDC_Status], FDC_SectorNotFound
@@Err_1: mov [FDC_Status],FDC_SectorNotFound
; mov [flp_status],0
@@Exit_1:
call save_timer_fdd_motor
558,8 → 555,7
jnz @@Err_2
mov [FDC_Status], FDC_Normal
jmp @@Exit_3
@@Err_2:
mov [FDC_Status], FDC_SectorNotFound
@@Err_2: mov [FDC_Status],FDC_SectorNotFound
@@Exit_3:
call save_timer_fdd_motor
popad
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/fdc.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/ide_cache.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/blkdev/cdrom.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/data32.inc
293,8 → 293,7
 
align 16
cur_saved_data rb 4096
fpu_data:
rb 512
fpu_data: rb 512
 
mem_block_list rd 64*2
mem_used_list rd 64*2
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/com_mouse.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/sb16/sb16.asm
344,8 → 344,7
align 4
version dd (5 shl 16) or (API_VERSION and 0xFFFF)
 
sb_base_port:
dd 200h ;don't ask me why - see the code&docs
sb_base_port: dd 200h ;don't ask me why - see the code&docs
 
sound_dma dd sb_dma_num
 
377,10 → 376,8
msgDSPFound db 'DSP found at port 2'
label port_second_digit_num dword at $
db '00h',13,10,'DSP version '
sb_DSP_version:
db '0.00 - SB'
sb_DSP_description:
db 32,32,32,32,13,10,0
sb_DSP_version: db '0.00 - SB'
sb_DSP_description: db 32,32,32,32,13,10,0
;-------------------------------------------------------------------------------
end if
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/sb16/CONFIG.INC
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/sb16/SB16.INC
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/sound.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/apm.asm
42,20 → 42,16
mcall 4,10*65536+3,0x80000000,text.4
bts [flags], 1
jmp .end
@@:
cmp al, 0
@@: cmp al,0
jne @f
mov edx, text.1
jmp .0
@@:
cmp al, 1
@@: cmp al,1
jne @f
mov edx, text.2
jmp .0
@@:
mov edx, text.3
.0:
push edx
@@: mov edx,text.3
.0: push edx
mcall 4,169*65536+3,0x80dddddd,text.0
pop edx
add ebx, 47*65536
69,20 → 65,16
jne @f
mov edx, text.01
jmp .1
@@:
cmp bh, 1
@@: cmp bh,1
jne @f
mov edx, text.02
jmp .1
@@:
cmp bh, 2
@@: cmp bh,2
jne @f
mov edx, text.03
jmp .1
@@:
mov edx, text.04
.1:
push edx
@@: mov edx,text.04
.1: push edx
mcall 4,10*65536+10,0x80000000,text.00
pop edx
mcall ,100*65536+10,;0x80000000
93,25 → 85,20
jne @f
mov edx, text.11
jmp .2
@@:
cmp bl, 1
@@: cmp bl,1
jne @f
mov edx, text.12
jmp .2
@@:
cmp bl, 2
@@: cmp bl,2
jne @f
mov edx, text.13
jmp .2
@@:
cmp bl, 3
@@: cmp bl,3
jne @f
mov edx, text.14
jmp .2
@@:
mov edx, text.04
.2:
push edx
@@: mov edx,text.04
.2: push edx
mcall 4,10*65536+20,0x80000000,text.10
pop edx
mcall ,100*65536+20,
124,12 → 111,10
mcall ,100*65536+30,0x80000000,text.04
pop eax
jmp .end
@@:
shl ecx, 24
@@: shl ecx,24
shr ecx, 24
mcall 47,0x80030000,,100*65536+30,0x347636
.3:
mcall 4,115*65536+30,0x80000000,text.15
.3: mcall 4,115*65536+30,0x80000000,text.15
mov dx, [esp]
shl edx, 17
shr edx, 17
140,8 → 125,7
bt cx, 15
jc @f
mov edx, text.22
@@:
mcall 4,160*65536+30,0x80000000
@@: mcall 4,160*65536+30,0x80000000
pop si
.error:
.end:
153,8 → 137,7
bt [flags], 1
jc @f
mcall ,65*65536+45,,2,
@@:
mcall 4,10*65536+50,0x80564242,text.30
@@: mcall 4,10*65536+50,0x80564242,text.30
mcall 12,2
 
still:
184,34 → 167,28
jne @f
mcall -1
 
@@:
cmp ah, 2
@@: cmp ah,2
jne @f
mcall 5,50
mcall 49,0x0001,0x0001,0x5307
jmp redraw
 
@@:
cmp ah, 4
@@: cmp ah,4
jg @f
mov edx, 0x01f7 ;primary chan.
call reserv_ports
jc redraw
sub bh, 3
.1:
call set_drive
.1: call set_drive
btc [flags], 2
jnc .2
call device_reset
jmp .3
.2:
call standby_hdd
.3:
call free_ports
.2: call standby_hdd
.3: call free_ports
jmp redraw
 
@@:
cmp ah, 6
@@: cmp ah,6
jg redraw
mov edx, 0x0177 ;secondary chan.
call reserv_ports
225,12 → 202,10
test bh, bh
jnz @f
btr ax, 4
.1:
out dx, al
.1: out dx,al
inc dx
ret
@@:
bts ax, 4
@@: bts ax,4
jmp .1
 
 
242,8 → 217,7
; 98h E5h nondata check power mode
; 99h E6h nondata set sleep mode
xor ecx, ecx
@@:
in al, dx
@@: in al,dx
dec cx
jz @f
bt ax, 6
265,15 → 239,13
pop bx
clc
ret
@@:
pop bx
@@: pop bx
stc
ret
 
device_reset:
xor ecx, ecx
@@:
in al, dx
@@: in al,dx
dec cx
jz @f
bt ax, 6
295,49 → 267,29
flags dw 0
 
text:
.0:
db 'APM v.1.',0
.1:
db '0',0
.2:
db '1',0
.3:
db '2',0
.4:
db 'APM not supported',0
.0: db 'APM v.1.',0
.1: db '0',0
.2: db '1',0
.3: db '2',0
.4: db 'APM not supported',0
 
.00:
db 'power status:',0
.01:
db 'off-line',0
.02:
db 'on-line',0
.03:
db 'on backup power',0
.04:
db 'unknown',0
.00: db 'power status:',0
.01: db 'off-line',0
.02: db 'on-line',0
.03: db 'on backup power',0
.04: db 'unknown',0
 
.10:
db 'battery flag:',0
.11:
db 'high',0
.12:
db 'low',0
.13:
db 'critical',0
.14:
db 'charging',0
.15:
db ' % ,',0
.10: db 'battery flag:',0
.11: db 'high',0
.12: db 'low',0
.13: db 'critical',0
.14: db 'charging',0
.15: db ' % ,',0
 
.20:
db 'battery life:',0
.21:
db 'min',0
.22:
db 'sec',0
.20: db 'battery life:',0
.21: db 'min',0
.22: db 'sec',0
 
.30:
db 'STAND-BY: SYSTEM HDD: 0 1 2 3',0
.30: db 'STAND-BY: SYSTEM HDD: 0 1 2 3',0
 
I_END:
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/sceletone.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/infinity.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/vidintel.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/imports.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/main.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/mixer.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/vt823x.asm
1053,7 → 1053,7
mov eax, 20000 ; wait 20 ms
call StallExec
 
stdcall codec_valid
stdcall codec_valid,
cmp eax, 0
pop eax
jge .ok
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/codec.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/fm801.asm
560,8 → 560,7
mov [brg_bus], eax
mov eax, [devfn]
mov [brg_devfn], eax
.no_bridge:
pop eax
.no_bridge:pop eax
 
mov edi, devices
@@:
/kernel/trunk/drivers/uart.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/ensoniq.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/proc32.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/sis.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/usb/urb.inc
94,22 → 94,22
}
 
 
;void usb_fill_control_urb (struct urb *urb,
; struct usb_device *dev,
; unsigned int pipe,
; unsigned char *setup_packet,
; void *transfer_buffer,
; int buffer_length,
; usb_complete_t complete_fn,
; void *context)
;{
;
; urb->dev = dev;
; urb->pipe = pipe;
; urb->setup_packet = setup_packet;
; urb->transfer_buffer = transfer_buffer;
; urb->transfer_buffer_length = buffer_length;
; urb->complete = complete_fn;
; urb->context = context;
;}
;
void usb_fill_control_urb (struct urb *urb,
struct usb_device *dev,
unsigned int pipe,
unsigned char *setup_packet,
void *transfer_buffer,
int buffer_length,
usb_complete_t complete_fn,
void *context)
{
 
urb->dev = dev;
urb->pipe = pipe;
urb->setup_packet = setup_packet;
urb->transfer_buffer = transfer_buffer;
urb->transfer_buffer_length = buffer_length;
urb->complete = complete_fn;
urb->context = context;
}
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/usb/usb.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/mix_mmx.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/drivers/mix_sse2.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/gui/window.inc
56,8 → 56,7
call drawwindow_I
jmp window._.draw_window_caption.2
 
@@:
dec al
@@: dec al
jnz @f
 
; type II - only reserve area, no draw
66,8 → 65,7
call [draw_pointer]
jmp .exit
 
@@:
dec al
@@: dec al
jnz @f
 
; type III - new style
75,8 → 73,7
jmp window._.draw_window_caption.2
 
; type IV & V - skinned window (resizable & not)
@@:
mov eax, [TASK_COUNT]
@@: mov eax, [TASK_COUNT]
movzx eax, word[WIN_POS + eax * 2]
cmp eax, [CURRENT_TASK]
setz al
136,8 → 133,7
cmp ebx, .sizeof.ftable / 4
ja @f
jmp [.ftable + ebx * 4]
@@:
ret
@@: ret
 
 
align 4
214,13 → 210,11
or eax, eax
jge @f
xor eax, eax
@@:
mov [screen_workarea.left], eax
@@: mov [screen_workarea.left], eax
cmp ebx, edi
jle @f
mov ebx, edi
@@:
mov [screen_workarea.right], ebx
@@: mov [screen_workarea.right], ebx
 
.check_horizontal:
mov edi, [Screen_Max_Y]
233,13 → 227,11
or eax, eax
jge @f
xor eax, eax
@@:
mov [screen_workarea.top], eax
@@: mov [screen_workarea.top], eax
cmp ebx, edi
jle @f
mov ebx, edi
@@:
mov [screen_workarea.bottom], ebx
@@: mov [screen_workarea.bottom], ebx
 
.check_if_redraw_needed:
or esi, esi
336,21 → 328,17
cmp ebx, -1
jne @f
mov ebx, [edi + WDATA.box.left]
@@:
cmp ecx, -1
@@: cmp ecx, -1
jne @f
mov ecx, [edi + WDATA.box.top]
@@:
cmp edx, -1
@@: cmp edx, -1
jne @f
mov edx, [edi + WDATA.box.width]
@@:
cmp esi, -1
@@: cmp esi, -1
jne @f
mov esi, [edi + WDATA.box.height]
 
@@:
push esi edx ecx ebx
@@: push esi edx ecx ebx
mov eax, esp
mov bl, [edi + WDATA.fl_wstate]
call window._.set_window_box
411,8 → 399,7
push eax ecx
xor eax, eax
mov ecx, WIN_STACK
@@:
inc eax
@@: inc eax
add ecx, 2
; process no
mov [ecx + 0x000], ax
479,21 → 466,17
cmp eax, [esp + RECT.left]
jae @f
mov eax, [esp + RECT.left]
@@:
cmp ebx, [esp + RECT.top]
@@: cmp ebx, [esp + RECT.top]
jae @f
mov ebx, [esp + RECT.top]
@@:
cmp ecx, [esp + RECT.right]
@@: cmp ecx, [esp + RECT.right]
jbe @f
mov ecx, [esp + RECT.right]
@@:
cmp edx, [esp + RECT.bottom]
@@: cmp edx, [esp + RECT.bottom]
jbe @f
mov edx, [esp + RECT.bottom]
 
@@:
push esi
@@: push esi
movzx esi, word[WIN_POS + esi * 2]
call window._.set_screen
pop esi
537,8 → 520,7
sub eax, ebx
jle @f
mov [edi + WDATA.box.width], ebx
@@:
sub ebx, [edi + WDATA.box.width]
@@: sub ebx, [edi + WDATA.box.width]
mov [edi + WDATA.box.left], ebx
 
.fix_vertical:
551,8 → 533,7
sub eax, ebx
jle @f
mov [edi + WDATA.box.height], ebx
@@:
sub ebx, [edi + WDATA.box.height]
@@: sub ebx, [edi + WDATA.box.height]
mov [edi + WDATA.box.top], ebx
jmp .fix_client_box
 
674,8 → 655,7
cmp ebx, eax
jbe @f
mov ebx, eax
@@:
push ebx
@@: push ebx
 
xor edi, edi
 
694,8 → 674,7
jz @f
sub ecx, 0x00040404
mov [esi + WDATA.cl_titlebar], ecx
@@:
and ecx, 0x00ffffff
@@: and ecx, 0x00ffffff
call [draw_line]
inc edx
cmp edx, [esp]
774,8 → 753,7
cmp ebx, eax
jb @f
mov ebx, eax
@@:
push ebx
@@: push ebx
 
xor edi, edi
 
792,12 → 770,10
test ecx, 0x40000000
jz @f
add ecx, 0x00040404
@@:
test ecx, 0x80000000
@@: test ecx, 0x80000000
jz @f
sub ecx, 0x00040404
@@:
mov [esi + WDATA.cl_titlebar], ecx
@@: mov [esi + WDATA.cl_titlebar], ecx
and ecx, 0x00ffffff
call [draw_line]
inc edx
1011,8 → 987,7
cmp eax, [TASK_COUNT]
jz @f
mov ebp, calculatescreen
@@:
mov eax, [edi + WDATA.box.left]
@@: mov eax, [edi + WDATA.box.left]
mov ebx, [edi + WDATA.box.top]
mov ecx, [edi + WDATA.box.width]
mov edx, [edi + WDATA.box.height]
1047,8 → 1022,7
call minimize_window
jmp .exit
 
@@:
call restore_minimized_window
@@: call restore_minimized_window
 
.exit:
ret
1109,8 → 1083,7
mov [ecx + BOX.height], eax
xchg eax, ecx
 
@@:
call window._.set_window_box
@@: call window._.set_window_box
add esp, BOX.sizeof
 
.exit:
1151,8 → 1124,7
lea eax, [edx + APPDATA.saved_box]
jmp .set_box
 
@@:
mov eax, [screen_workarea.top]
@@: mov eax, [screen_workarea.top]
push [screen_workarea.bottom] \
[edi + WDATA.box.width] \
eax \
1260,8 → 1232,7
cmp ecx, edx
jle @f
mov ecx, edx
@@:
mov [draw_limits.left], ecx
@@: mov [draw_limits.left], ecx
mov ecx, [eax + BOX.left]
add ecx, [eax + BOX.width]
add edx, [ebx + BOX.width]
1268,15 → 1239,13
cmp ecx, edx
jae @f
mov ecx, edx
@@:
mov [draw_limits.right], ecx
@@: mov [draw_limits.right], ecx
mov ecx, [eax + BOX.top]
mov edx, [ebx + BOX.top]
cmp ecx, edx
jle @f
mov ecx, edx
@@:
mov [draw_limits.top], ecx
@@: mov [draw_limits.top], ecx
mov ecx, [eax + BOX.top]
add ecx, [eax + BOX.height]
add edx, [ebx + BOX.height]
1283,8 → 1252,7
cmp ecx, edx
jae @f
mov ecx, edx
@@:
mov [draw_limits.bottom], ecx
@@: mov [draw_limits.bottom], ecx
 
; recalculate screen buffer at old position
push ebx
1509,8 → 1477,7
 
xor eax, eax
 
@@:
mov [edi + APPDATA.wnd_caption], eax
@@: mov [edi + APPDATA.wnd_caption], eax
 
mov esi, [esp]
add edi, APPDATA.saved_box
1634,8 → 1601,7
jne @f
mov eax, [_skinh]
ret
@@:
mov eax, 21
@@: mov eax, 21
ret
 
align 4
1653,13 → 1619,11
mov eax, [_skinh]
add eax, 3
ret
@@:
or al, al
@@: or al, al
jnz @f
mov eax, 21
ret
@@:
mov eax, 21 + 2
@@: mov eax, 21 + 2
ret
 
align 4
1806,8 → 1770,7
mov eax, esi
mov [ebp], al
; -- end body --
@@:
inc ebp
@@: inc ebp
inc edx
cmp edx, [ff_xsz]
jb .ff_new_x
2051,8 → 2014,7
cmp edx, [CURRENT_TASK]
jne @f
inc eax
@@:
mov edx, [CURRENT_TASK]
@@: mov edx, [CURRENT_TASK]
shl edx, 5
add edx, window_data
movzx ebx, [edx + WDATA.fl_wstyle]
2083,8 → 2045,7
 
call drawwindow_I_caption
 
.2:
mov edi, [CURRENT_TASK]
.2: mov edi, [CURRENT_TASK]
shl edi, 5
test [edi + window_data + WDATA.fl_wstyle], WSTYLE_HASCAPTION
jz .exit
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/gui/event.inc
32,8 → 32,7
mov ecx, EV_SPACE ; current - in allocated space
mov ebx, FreeEvents ; previos - íà÷àëî ñïèñêà
push ebx ; îíî æå è êîíåö ïîòîì áóäåò
@@:
mov [ebx+EVENT.fd], eax
@@: mov [ebx+EVENT.fd],eax
mov [eax+EVENT.bk], ebx
mov ebx, eax ; previos <- current
add eax, EVENT.size ; new current
41,8 → 40,7
pop eax ; âîò îíî êîíöîì è ñòàëî
mov [ebx+EVENT.fd], eax
mov [eax+EVENT.bk], ebx
.fail:
ret
.fail: ret
 
EVENT_WATCHED equ 0x10000000 ;áèò 28
EVENT_SIGNALED equ 0x20000000 ;áèò 29
89,8 → 87,7
call init_events
popad
jz RemoveEventTo.break ; POPF+RET
@@:
mov eax, [eax+EVENT.fd]
@@: mov eax,[eax+EVENT.fd]
mov [eax+EVENT.magic], 'EVNT'
mov [eax+EVENT.destroy], destroy_event.internal
mov [eax+EVENT.state], ecx
118,8 → 115,7
xchg ecx, [eax+EVENT.fd] ; Self.fd=NewRight, ecx=OldRight
mov [ebx+EVENT.fd], ecx ; OldLeft.fd=OldRight
mov [ecx+EVENT.bk], ebx ; OldRight.bk=OldLeft
.break:
popfd
.break: popfd
ret
 
align 4
217,11 → 213,9
jne @f
cmp [eax+EVENT.id], ebx
je .ret
@@:
pop eax
@@: pop eax
xor eax, eax
.ret:
ret
.ret: ret
 
 
align 4
260,8 → 254,7
mov [eax+TASKDATA.state], 5
call change_task
mov eax, [esi+APPDATA.wait_param]
@@:
ret
@@: ret
 
align 4
wait_event: ;; EXPORT use
353,8 → 346,7
mov eax, [ebx+APPOBJ.bk] ; âûáèðàåì ñ êîíöà, ïî ïðèíöèïó FIFO
cmp eax, ebx ; empty ???
je get_event_alone.ret0
.ret:
ret
.ret: ret
 
align 4
get_event_alone:
372,10 → 364,8
test byte[eax+EVENT.state+3], EVENT_SIGNALED shr 24
jnz .ret
or byte[eax+EVENT.state+3], EVENT_WATCHED shr 24
.ret0:
xor eax, eax; NO event!!!
.ret:
ret
.ret0: xor eax,eax ; NO event!!!
.ret: ret
 
align 4
sys_sendwindowmsg: ;; f72
403,8 → 393,7
.result:
setae byte[esp+32] ;ñ÷èòàåì, ÷òî èñõîäíî: dword[esp+32]==72
.retf: ;popfd
.ret:
ret
.ret: ret
 
align 4
sys_getevent: ;; f11
498,10 → 487,8
jne @f ; not Top ???
cmp [KEY_COUNT], al; al==1
jae .result ; not empty ???
@@:
mov edx, hotkey_buffer
@@:
cmp [edx], bh ; bh - slot for testing
@@: mov edx, hotkey_buffer
@@: cmp [edx],bh ; bh - slot for testing
je .result
add edx, 8
cmp edx, hotkey_buffer+120*8
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/gui/mouse.inc
72,8 → 72,7
jmp .exit
 
; is there any system button under cursor?
@@:
call mouse._.find_sys_button_under_cursor
@@: call mouse._.find_sys_button_under_cursor
or eax, eax
jz .check_buttons_released
 
120,14 → 119,12
mov eax, [esp + 4]
call .call_left_button_handler
 
@@:
test byte[esp], mouse.RIGHT_BUTTON_FLAG
@@: test byte[esp], mouse.RIGHT_BUTTON_FLAG
jz @f
mov eax, [esp + 4]
call .call_right_button_handler
 
@@:
test byte[esp], mouse.MIDDLE_BUTTON_FLAG
@@: test byte[esp], mouse.MIDDLE_BUTTON_FLAG
jz .check_position
mov eax, [esp + 4]
call .call_middle_button_handler
225,8 → 222,7
call sys_window_maximize_handler
jmp .exit
 
@@:
test [edi + WDATA.fl_wstate], WSTATE_MAXIMIZED
@@: test [edi + WDATA.fl_wstate], WSTATE_MAXIMIZED
jnz .exit
mov [mouse.active_sys_window.pslot], esi
lea eax, [edi + WDATA.box]
242,18 → 238,15
call .calculate_w_delta
jmp .call_window_handler
 
@@:
test dl, mouse.WINDOW_RESIZE_W_FLAG
@@: test dl, mouse.WINDOW_RESIZE_W_FLAG
jz @f
call .calculate_w_delta
 
@@:
test dl, mouse.WINDOW_RESIZE_S_FLAG
@@: test dl, mouse.WINDOW_RESIZE_S_FLAG
jz @f
call .calculate_s_delta
 
@@:
test dl, mouse.WINDOW_RESIZE_E_FLAG
@@: test dl, mouse.WINDOW_RESIZE_E_FLAG
jz .call_window_handler
call .calculate_e_delta
 
396,20 → 389,17
jge @f
xor eax, eax
mov [mouse.active_sys_window.new_box.left], eax
@@:
add eax, [mouse.active_sys_window.new_box.width]
@@: add eax, [mouse.active_sys_window.new_box.width]
cmp eax, [Screen_Max_X]
jl @f
sub eax, [Screen_Max_X]
sub [mouse.active_sys_window.new_box.left], eax
@@:
mov eax, [mouse.active_sys_window.new_box.top]
@@: mov eax, [mouse.active_sys_window.new_box.top]
or eax, eax
jge @f
xor eax, eax
mov [mouse.active_sys_window.new_box.top], eax
@@:
add eax, [mouse.active_sys_window.new_box.height]
@@: add eax, [mouse.active_sys_window.new_box.height]
cmp eax, [Screen_Max_Y]
jle .call_window_handler
sub eax, [Screen_Max_Y]
431,8 → 421,7
jge @f
add [mouse.active_sys_window.new_box.left], eax
mov [mouse.active_sys_window.new_box.width], 127
@@:
mov eax, [mouse.active_sys_window.new_box.left]
@@: mov eax, [mouse.active_sys_window.new_box.left]
or eax, eax
jge .check_resize_s
add [mouse.active_sys_window.new_box.width], eax
460,8 → 449,7
jge @f
mov eax, ecx
mov [mouse.active_sys_window.new_box.height], eax
@@:
add eax, [mouse.active_sys_window.new_box.top]
@@: add eax, [mouse.active_sys_window.new_box.top]
cmp eax, [Screen_Max_Y]
jle .check_resize_e
sub eax, [Screen_Max_Y]
486,8 → 474,7
jge @f
mov eax, 127
mov [mouse.active_sys_window.new_box.width], eax
@@:
add eax, [mouse.active_sys_window.new_box.left]
@@: add eax, [mouse.active_sys_window.new_box.left]
cmp eax, [Screen_Max_X]
jle .call_window_handler
sub eax, [Screen_Max_X]
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/gui/button.inc
131,8 → 131,7
call button._.incecx2
 
; set button height counter
@@:
mov edx, edi
@@: mov edx, edi
 
.next_line:
call button._.button_dececx
381,17 → 380,14
sub cl, 0x20
jnc @f
xor cl, cl
@@:
sub ch, 0x20
@@: sub ch, 0x20
jnc @f
xor ch, ch
@@:
rol ecx, 16
@@: rol ecx, 16
sub cl, 0x20
jnc @f
xor cl, cl
@@:
rol ecx, 16
@@: rol ecx, 16
ret
 
;------------------------------------------------------------------------------
402,17 → 398,14
add cl, 0x20
jnc @f
or cl, -1
@@:
add ch, 0x20
@@: add ch, 0x20
jnc @f
or ch, -1
@@:
rol ecx, 16
@@: rol ecx, 16
add cl, 0x20
jnc @f
or cl, -1
@@:
rol ecx, 16
@@: rol ecx, 16
ret
 
;------------------------------------------------------------------------------
423,17 → 416,14
add cl, 0x14
jnc @f
or cl, -1
@@:
add ch, 0x14
@@: add ch, 0x14
jnc @f
or ch, -1
@@:
rol ecx, 16
@@: rol ecx, 16
add cl, 0x14
jnc @f
or cl, -1
@@:
rol ecx, 16
@@: rol ecx, 16
ret
 
;------------------------------------------------------------------------------
450,21 → 440,17
jg @f
mov al, 2
 
@@:
sub cl, al
@@: sub cl, al
jnc @f
xor cl, cl
@@:
sub ch, al
@@: sub ch, al
jnc @f
xor ch, ch
@@:
rol ecx, 16
@@: rol ecx, 16
sub cl, al
jnc @f
xor cl, cl
@@:
rol ecx, 16
@@: rol ecx, 16
 
pop eax
 
/kernel/trunk/gui/mousepointer.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/gui/skincode.inc
127,8 → 127,7
 
mov ebx, [ebp+SKIN_HEADER.bitmaps]
add ebx, skin_data
.lp1:
cmp dword[ebx], 0
.lp1: cmp dword[ebx],0
je .end_bitmaps
movzx eax, [ebx+SKIN_BITMAPS.kind]
movzx ecx, [ebx+SKIN_BITMAPS.type]
139,8 → 138,7
or ecx, ecx
jnz @f
mov edx, skin_inactive.left.data
@@:
jmp .next_bitmap
@@: jmp .next_bitmap
.not_left:
dec eax
jnz .not_oper
152,8 → 150,7
or ecx, ecx
jnz @f
mov edx, skin_inactive.oper.data
@@:
jmp .next_bitmap
@@: jmp .next_bitmap
.not_oper:
dec eax
jnz .not_base
163,8 → 160,7
jnz @f
mov eax, [skin_inactive.left.width]
mov edx, skin_inactive.base.data
@@:
jmp .next_bitmap
@@: jmp .next_bitmap
.not_base:
add ebx, 8
jmp .lp1
182,8 → 178,7
 
mov ebx, [ebp+SKIN_HEADER.buttons]
add ebx, skin_data
.lp2:
cmp dword[ebx], 0
.lp2: cmp dword[ebx],0
je .end_buttons
mov eax, [ebx+SKIN_BUTTONS.type]
dec eax
218,8 → 213,7
or ebx, ebx
jz @f
call sys_putimage.forced
@@:
ret
@@: ret
 
drawwindow_IV_caption:
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/gui/font.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/gui/skindata.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/init.inc
288,8 → 288,7
mov esi, edi
xor eax, eax
cld ; paranoia
@@:
lodsb
@@: lodsb
add ah, al
loop @b
jnz .pcibios_nxt2; control summ must be zero
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/kernel32.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/socket.inc
473,8 → 473,7
cmp esi, SOCKET_PASSIVE
je @f
mov ebx, TCB_SYN_SENT
@@:
mov [eax + SOCKET.TCBState], ebx ; Indicate the state of the TCB
@@: mov [eax + SOCKET.TCBState], ebx ; Indicate the state of the TCB
 
cmp ebx, TCB_LISTEN
je .exit
571,8 → 570,7
add esi, 8
jmp .next_resendq
 
@@:
mov dword[esi + 4], 0
@@: mov dword[esi + 4], 0
inc ecx
add esi, 8
jmp .next_resendq
963,8 → 961,7
jnz @f
mov ax, 0xffff
 
@@:
xchg al, ah
@@: xchg al, ah
mov [edx + 20 + UDP_PACKET.Checksum], ax
 
; Fill in the IP header checksum
1082,8 → 1079,7
add esi, 8
jmp .next_resendq
 
@@:
push ebx
@@: push ebx
 
; OK, we have a buffer descriptor ptr in esi.
; resend entry # in ecx
1102,8 → 1098,7
; Now get buffer location, and copy buffer across. argh! more copying,,
mov edi, resendBuffer - IPBUFFSIZE
 
@@:
add edi, IPBUFFSIZE
@@: add edi, IPBUFFSIZE
loop @b
 
; we have dest buffer location in edi
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/tcp.inc
669,8 → 669,7
add esi, 8
jmp .next_resendq
 
@@:
mov dword[esi + 4], 0
@@: mov dword[esi + 4], 0
inc ecx
add esi, 8
jmp .next_resendq
912,8 → 911,7
add esi, 8
jmp .next_resendq
 
@@:
mov dword[esi + 4], 0
@@: mov dword[esi + 4], 0
inc ecx
add esi, 8
jmp .next_resendq
1054,14 → 1052,12
mov [ebx + SOCKET.TCBState], TCB_FIN_WAIT_2
jmp .exit
 
@@:
mov [ebx + SOCKET.TCBState], TCB_CLOSING
@@: mov [ebx + SOCKET.TCBState], TCB_CLOSING
cmp al, TH_FIN
je @f
mov [ebx + SOCKET.TCBState], TCB_TIMED_WAIT
 
@@:
lea esi, [ebx + SOCKET.RCV_NXT]
@@: lea esi, [ebx + SOCKET.RCV_NXT]
call inc_inet_esi
 
; Send an ACK
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/r6040.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/rtl8139.inc
183,21 → 183,18
 
uglobal
align 4
rtl8139_rx_buff_offset:
dd 0
rtl8139_rx_buff_offset: dd 0
curr_tx_desc dd 0
endg
 
iglobal
hw_ver_array:
db VER_RTL8139, VER_RTL8139A, VER_RTL8139B, VER_RTL8139C
hw_ver_array: db VER_RTL8139, VER_RTL8139A, VER_RTL8139B, VER_RTL8139C
db VER_RTL8100, VER_RTL8139D, VER_RTL8139CP, VER_RTL8101
HW_VER_ARRAY_SIZE = $-hw_ver_array
endg
 
uglobal
hw_ver_id:
db 0
hw_ver_id: db 0
endg
 
;***************************************************************************
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/3c59x.inc
344,68 → 344,42
e3c59x_upd_buff = e3c59x_dpd_buff+(E3C59X_DPD_SIZE*E3C59X_NUM_TX_DESC)
 
uglobal
e3c59x_curr_upd:
dd 0
e3c59x_prev_dpd:
dd 0
e3c59x_prev_tx_frame:
dd 0
e3c59x_transmit_function:
dd 0
e3c59x_receive_function:
dd 0
e3c59x_curr_upd: dd 0
e3c59x_prev_dpd: dd 0
e3c59x_prev_tx_frame: dd 0
e3c59x_transmit_function: dd 0
e3c59x_receive_function: dd 0
endg
 
iglobal
e3c59x_ver_id:
db 17
e3c59x_ver_id: db 17
endg
 
uglobal
e3c59x_full_bus_master:
db 0
e3c59x_has_hwcksm:
db 0
e3c59x_preamble:
db 0
e3c59x_dn_list_ptr_cleared:
db 0
e3c59x_self_directed_packet:
rb 6
e3c59x_full_bus_master: db 0
e3c59x_has_hwcksm: db 0
e3c59x_preamble: db 0
e3c59x_dn_list_ptr_cleared: db 0
e3c59x_self_directed_packet: rb 6
endg
 
if defined E3C59X_DEBUG
e3c59x_hw_type_str:
db "Detected hardware type : ", 0
e3c59x_device_str:
db "Device ID : 0x"
e3c59x_device_id_str:
db "ffff", 13, 10, 0
e3c59x_vendor_str:
db "Vendor ID : 0x"
e3c59x_vendor_id_str:
db "ffff", 13, 10, 0
e3c59x_io_info_str:
db "IO address : 0x"
e3c59x_io_addr_str:
db "ffff", 13, 10, 0
e3c59x_mac_info_str:
db "MAC address : "
e3c59x_mac_addr_str:
db "ff:ff:ff:ff:ff:ff", 13, 10, 0
e3c59x_boomerang_str:
db " (boomerang)", 13, 10, 0
e3c59x_vortex_str:
db " (vortex)", 13, 10, 0
e3c59x_link_type_str:
db "Established link type : ", 0
e3c59x_new_line_str:
db 13, 10, 0
e3c59x_link_type:
dd 0
e3c59x_hw_type_str: db "Detected hardware type : ", 0
e3c59x_device_str: db "Device ID : 0x"
e3c59x_device_id_str: db "ffff", 13, 10, 0
e3c59x_vendor_str: db "Vendor ID : 0x"
e3c59x_vendor_id_str: db "ffff", 13, 10, 0
e3c59x_io_info_str: db "IO address : 0x"
e3c59x_io_addr_str: db "ffff", 13, 10, 0
e3c59x_mac_info_str: db "MAC address : "
e3c59x_mac_addr_str: db "ff:ff:ff:ff:ff:ff", 13, 10, 0
e3c59x_boomerang_str: db " (boomerang)", 13, 10, 0
e3c59x_vortex_str: db " (vortex)", 13, 10, 0
e3c59x_link_type_str: db "Established link type : ", 0
e3c59x_new_line_str: db 13, 10, 0
e3c59x_link_type: dd 0
 
e3c59x_charset:
db '0123456789abcdef'
e3c59x_charset: db '0123456789abcdef'
 
strtbl e3c59x_link_str, \
"No valid link type detected", \
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/forcedeth.inc
819,8 → 819,7
jz @f
and eax, PCI_BASE_ADDRESS_IO_MASK
jmp .next
@@:
push eax
@@: push eax
and eax, PCI_BASE_ADDRESS_MEM_TYPE_MASK
cmp eax, PCI_BASE_ADDRESS_MEM_TYPE_64
jne .not64
879,8 → 878,7
jz @f
and eax, PCI_BASE_ADDRESS_IO_MASK
jmp .next2
@@:
and eax, PCI_BASE_ADDRESS_MEM_MASK
@@: and eax, PCI_BASE_ADDRESS_MEM_MASK
.next2:
; Find the lowest bit set
mov ecx, eax
915,8 → 913,7
je .ver1
mov dword [forcedeth_desc_ver], DESC_VER_2
jmp @f
.ver1:
mov dword [forcedeth_desc_ver], DESC_VER_1
.ver1: mov dword [forcedeth_desc_ver], DESC_VER_1
@@:
; read the mac address
; map memory
984,8 → 981,7
jne @f
or dword [forcedeth_txflags], NV_TX_LASTPACKET1
jmp .end_switch
@@:
or dword [forcedeth_txflags], NV_TX2_LASTPACKET1
@@: or dword [forcedeth_txflags], NV_TX2_LASTPACKET1
jmp .end_switch
 
.next_0x0086:
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/rtl8169.inc
550,8 → 550,7
jz @f
and eax, PCI_BASE_ADDRESS_IO_MASK
jmp .exit
@@:
push eax
@@: push eax
and eax, PCI_BASE_ADDRESS_MEM_TYPE_MASK
cmp eax, PCI_BASE_ADDRESS_MEM_TYPE_64
jne .not64
584,8 → 583,7
 
; Check that the chip has finished the reset
mov ecx, 1000
@@:
RTL_R8 RTL8169_REG_ChipCmd
@@: RTL_R8 RTL8169_REG_ChipCmd
test al, RTL8169_CMD_Reset
jz @f
stdcall udelay, 10
596,8 → 594,7
and eax, 0x7c800000
; DEBUGF 1,"K : rtl8169_init_board: TxConfig & 0x7c800000 = 0x%x\n",eax
mov esi, mac_info-8
@@:
add esi, 8
@@: add esi,8
mov ecx, eax
and ecx, [esi]
cmp ecx, [esi]
612,8 → 609,7
jnz @f
mov [rtl8169_tpc.pcfg], PCFG_METHOD_1
jmp .pconf
@@:
dec al
@@: dec al
jnz .pconf
mov [rtl8169_tpc.pcfg], PCFG_METHOD_2
.pconf:
621,8 → 617,7
; identify chip attached to board
mov ecx, 10
mov eax, [rtl8169_tpc.mcfg]
@@:
dec ecx
@@: dec ecx
js @f
cmp eax, [rtl_chip_info+ecx*8]
jne @b
666,8 → 661,7
je @f
cmp [rtl8169_tpc.mcfg], MCFG_METHOD_03
jne .not_2_or_3
@@:
stdcall RTL8169_WRITE_GMII_REG, 0x1F, 0x0001
@@: stdcall RTL8169_WRITE_GMII_REG,0x1F,0x0001
stdcall RTL8169_WRITE_GMII_REG, 0x15, 0x1000
stdcall RTL8169_WRITE_GMII_REG, 0x18, 0x65C7
stdcall RTL8169_WRITE_GMII_REG, 0x04, 0x0000
733,8 → 727,7
 
mov ecx, 2000
; Check if the RTL8169 has completed writing to the specified MII register
@@:
RTL_R32 RTL8169_REG_PHYAR
@@: RTL_R32 RTL8169_REG_PHYAR
test eax, 0x80000000
jz .exit
stdcall udelay, 1 ;;;100
756,8 → 749,7
 
mov ecx, 2000
; Check if the RTL8169 has completed retrieving data from the specified MII register
@@:
RTL_R32 RTL8169_REG_PHYAR
@@: RTL_R32 RTL8169_REG_PHYAR
test eax, 0x80000000
jnz .exit
stdcall udelay, 1 ;;;100
810,8 → 802,7
mov edi, rtl8169_tpc.Tx_skbuff
mov eax, rtl8169_txb
mov ecx, NUM_TX_DESC
@@:
stosd
@@: stosd
inc eax ; add eax,RX_BUF_SIZE ???
loop @b
 
827,8 → 818,7
mov edi, [rtl8169_tpc.RxDescArray]
mov eax, rtl8169_rxb
mov ecx, NUM_RX_DESC
@@:
mov [esi], eax
@@: mov [esi],eax
mov [edi+rtl8169_RxDesc.buf_addr], eax
sub [edi+rtl8169_RxDesc.buf_addr], OS_BASE ; shurf 28.09.2008
mov [edi+rtl8169_RxDesc.status], RTL8169_DSB_OWNbit or RX_BUF_SIZE
850,8 → 840,7
RTL_W8 RTL8169_REG_ChipCmd,RTL8169_CMD_Reset
; Check that the chip has finished the reset
mov ecx, 1000
@@:
RTL_R8 RTL8169_REG_ChipCmd
@@: RTL_R8 RTL8169_REG_ChipCmd
and al, RTL8169_CMD_Reset
jz @f
stdcall udelay, 10
883,8 → 872,7
; DEBUGF 1,"K : Set MAC Reg C+CR Offset 0xE0: bit-3 and bit-14\n"
jmp .set
@@:;DEBUGF 1,"K : Set MAC Reg C+CR Offset 0xE0: bit-3\n"
.set:
RTL_W16 RTL8169_REG_CPlusCmd,ax
.set: RTL_W16 RTL8169_REG_CPlusCmd,ax
 
; RTL_W16 0xE2,0x1517
; RTL_W16 0xE2,0x152a
941,8 → 929,7
add edx, RTL8169_REG_MAC0
xor ebx, ebx
; Get MAC address. FIXME: read EEPROM
@@:
RTL_R8 dx
@@: RTL_R8 dx
mov [node_addr+ebx], al
inc edx
inc ebx
982,8 → 969,7
stdcall udelay, 100
mov ecx, 10000
; wait for auto-negotiation process
@@:
dec ecx
@@: dec ecx
jz @f
stdcall RTL8169_READ_GMII_REG, RTL8169_PHY_STAT_REG
stdcall udelay, 100
1095,14 → 1081,12
and ecx, 0x0FFF
xor al, al
add edi, ecx
@@:
cmp ecx, ETH_ZLEN
@@: cmp ecx,ETH_ZLEN
jae @f
stosb
inc ecx
jmp @b
@@:
pop eax
@@: pop eax
 
mov ebx, eax
mov eax, sizeof.rtl8169_TxDesc
1116,13 → 1100,11
cmp eax, ETH_ZLEN
jae @f
mov eax, ETH_ZLEN
@@:
or eax, RTL8169_DSB_OWNbit or RTL8169_DSB_FSbit or RTL8169_DSB_LSbit
@@: or eax,RTL8169_DSB_OWNbit or RTL8169_DSB_FSbit or RTL8169_DSB_LSbit
cmp [rtl8169_tpc.cur_tx], NUM_TX_DESC - 1
jne @f
or eax, RTL8169_DSB_EORbit
@@:
mov [ebx + rtl8169_TxDesc.status], eax
@@: mov [ebx + rtl8169_TxDesc.status],eax
 
RTL_W8 RTL8169_REG_TxPoll,0x40 ; set polling bit
 
1132,8 → 1114,7
;!!! to = currticks() + TX_TIMEOUT;
;!!! while ((tpc->TxDescArray[entry].status & OWNbit) && (currticks() < to)); /* wait */
mov ecx, TX_TIMEOUT / 10
@@:
test [ebx + rtl8169_TxDesc.status], RTL8169_DSB_OWNbit
@@: test [ebx + rtl8169_TxDesc.status],RTL8169_DSB_OWNbit
jnz @f
stdcall udelay, 10
loop @b
1214,8 → 1195,7
cmp [rtl8169_tpc.cur_rx], NUM_RX_DESC - 1
jne @f
or eax, RTL8169_DSB_EORbit
@@:
mov [ebx + rtl8169_RxDesc.status], eax
@@: mov [ebx + rtl8169_RxDesc.status],eax
 
mov [ebx + rtl8169_RxDesc.buf_addr], edx
sub [ebx + rtl8169_RxDesc.buf_addr], OS_BASE ; shurf 28.09.2008
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/i8255x.inc
50,61 → 50,39
 
 
uglobal
eeprom_data:
times 16 dd 0
eeprom_data: times 16 dd 0
 
align 4
 
lstats:
tx_good_frames:
dd 0
tx_coll16_errs:
dd 0
tx_late_colls:
dd 0
tx_underruns:
dd 0
tx_lost_carrier:
dd 0
tx_deferred:
dd 0
tx_one_colls:
dd 0
tx_multi_colls:
dd 0
tx_total_colls:
dd 0
rx_good_frames:
dd 0
rx_crc_errs:
dd 0
rx_align_errs:
dd 0
rx_resource_errs:
dd 0
rx_overrun_errs:
dd 0
rx_colls_errs:
dd 0
rx_runt_errs:
dd 0
done_marker:
dd 0
tx_good_frames: dd 0
tx_coll16_errs: dd 0
tx_late_colls: dd 0
tx_underruns: dd 0
tx_lost_carrier: dd 0
tx_deferred: dd 0
tx_one_colls: dd 0
tx_multi_colls: dd 0
tx_total_colls: dd 0
rx_good_frames: dd 0
rx_crc_errs: dd 0
rx_align_errs: dd 0
rx_resource_errs: dd 0
rx_overrun_errs: dd 0
rx_colls_errs: dd 0
rx_runt_errs: dd 0
done_marker: dd 0
 
align 4
 
confcmd:
confcmd_status:
dw 0
confcmd_command:
dw 0
confcmd_link:
dd 0
confcmd_status: dw 0
confcmd_command: dw 0
confcmd_link: dd 0
endg
 
iglobal
confcmd_data:
db 22, 0x08, 0, 0, 0, 0x80, 0x32, 0x03, 1
confcmd_data: db 22, 0x08, 0, 0, 0, 0x80, 0x32, 0x03, 1
db 0, 0x2e, 0, 0x60, 0, 0xf2, 0x48, 0, 0x40, 0xf2
db 0x80, 0x3f, 0x05
endg
113,34 → 91,22
align 4
 
txfd:
txfd_status:
dw 0
txfd_command:
dw 0
txfd_link:
dd 0
txfd_tx_desc_addr:
dd 0
txfd_count:
dd 0
txfd_tx_buf_addr0:
dd 0
txfd_tx_buf_size0:
dd 0
txfd_tx_buf_addr1:
dd 0
txfd_tx_buf_size1:
dd 0
txfd_status: dw 0
txfd_command: dw 0
txfd_link: dd 0
txfd_tx_desc_addr: dd 0
txfd_count: dd 0
txfd_tx_buf_addr0: dd 0
txfd_tx_buf_size0: dd 0
txfd_tx_buf_addr1: dd 0
txfd_tx_buf_size1: dd 0
 
align 4
 
hdr:
hdr_dst_addr:
times 6 db 0
hdr_src_addr:
times 6 db 0
hdr_type:
dw 0
hdr_dst_addr: times 6 db 0
hdr_src_addr: times 6 db 0
hdr_type: dw 0
endg
 
 
791,4 → 757,4
mov edx, [io_addr]
in ax, dx
 
ret
ret
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/pcnet32.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/sis900.inc
80,10 → 80,8
 
uglobal
align 4
txd:
times (3 * NUM_TX_DESC) dd 0
rxd:
times (3 * NUM_RX_DESC) dd 0
txd: times (3 * NUM_TX_DESC) dd 0
rxd: times (3 * NUM_RX_DESC) dd 0
endg
 
txb equ eth_data_start
220,8 → 218,7
SIS900_EEDONE equ 0x00000200
SIS900_EEGNT equ 0x00000100
;General Varibles
SIS900_pci_revision:
db 0
SIS900_pci_revision: db 0
SIS900_Status dd 0x03000000
sis900_specific_table:
; dd SIS630A_900_REV,Get_Mac_SIS630A_900_REV,0
233,12 → 230,9
dd SIS900_960_REV,SIS960_get_mac_addr,0
dd SIS900B_900_REV,SIS900_get_mac_addr,0
dd 0,0,0,0 ; end of list
sis900_get_mac_func:
dd 0
sis900_special_func:
dd 0
sis900_table_entries:
db 8
sis900_get_mac_func: dd 0
sis900_special_func: dd 0
sis900_table_entries: db 8
 
;***************************************************************************
; Function
573,8 → 567,7
;* 0x00600000 = 128 bytes
;* 0x00700000 = 256 bytes
;***************************************************************************
SIS900_mc_filter:
times 16 dw 0
SIS900_mc_filter: times 16 dw 0
SIS900_set_rx_mode:
mov ebp, [io_addr]
;**************update Multicast Hash Table in Receive Filter
1088,8 → 1081,7
 
SIS900_Char_String db '0','1','2','3','4','5','6','7','8','9'
db 'A','B','C','D','E','F'
Mac_str_build:
times 20 db 0
Mac_str_build: times 20 db 0
Create_Mac_String:
pusha
xor ecx, ecx
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/drivers/rtl8029.inc
143,46 → 143,29
ISA_MAX_ADDR equ 0x400
 
uglobal
eth_flags:
db 0
eth_vendor:
db 0
eth_nic_base:
dw 0
eth_asic_base:
dw 0
eth_memsize:
db 0
eth_rx_start:
db 0
eth_tx_start:
db 0
eth_bmem:
dd 0
eth_rmem:
dd 0
romdata:
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
eth_flags: db 0
eth_vendor: db 0
eth_nic_base: dw 0
eth_asic_base: dw 0
eth_memsize: db 0
eth_rx_start: db 0
eth_tx_start: db 0
eth_bmem: dd 0
eth_rmem: dd 0
romdata: db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
endg
 
iglobal
test_data:
db 'NE*000 memory',0
test_buffer:
db ' ',0
test_data: db 'NE*000 memory',0
test_buffer: db ' ',0
endg
 
uglobal
eth_type:
dw 0
pkthdr:
db 0,0,0,0 ; status, next, (short) len
pktoff:
dw 0
eth_rx_data_ptr:
dd 0
eth_tmp_len:
dw 0
eth_type: dw 0
pkthdr: db 0,0,0,0 ; status, next, (short) len
pktoff: dw 0
eth_rx_data_ptr: dd 0
eth_tmp_len: dw 0
endg
 
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/ethernet.inc
243,49 → 243,31
 
uglobal
;Net-stack's interface's settings
node_addr:
db 0,0,0,0,0,0
gateway_ip:
dd 0
dns_ip:
dd 0
node_addr: db 0,0,0,0,0,0
gateway_ip: dd 0
dns_ip: dd 0
 
eth_rx_data_len:
dw 0
eth_status:
dd 0
io_addr:
dd 0
hdrtype:
db 0
vendor_device:
dd 0
pci_data:
dd 0
pci_dev:
dd 0
pci_bus:
dd 0
eth_rx_data_len: dw 0
eth_status: dd 0
io_addr: dd 0
hdrtype: db 0
vendor_device: dd 0
pci_data: dd 0
pci_dev: dd 0
pci_bus: dd 0
 
; These will hold pointers to the selected driver functions
drvr_probe:
dd 0
drvr_reset:
dd 0
drvr_poll:
dd 0
drvr_transmit:
dd 0
drvr_cable:
dd 0
drvr_probe: dd 0
drvr_reset: dd 0
drvr_poll: dd 0
drvr_transmit: dd 0
drvr_cable: dd 0
 
endg
 
iglobal
broadcast_add:
db 0xff,0xff,0xff,0xff,0xff,0xff
subnet_mask:
dd 0x00ffffff ; 255.255.255.0
broadcast_add: db 0xff,0xff,0xff,0xff,0xff,0xff
subnet_mask: dd 0x00ffffff ; 255.255.255.0
endg
 
include "arp.inc" ;arp-protocol functions
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/arp.inc
67,8 → 67,7
endg
 
iglobal
NumARP:
dd ARP_TABLE_ENTRIES
NumARP: dd ARP_TABLE_ENTRIES
ARPTable_ptr dd ARPTable ;pointer to ARPTable
endg
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/eth_drv/pci.inc
348,4 → 348,4
mov [io_addr], eax
 
sb_exit2:
ret
ret
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/stack.inc
36,14 → 36,10
uglobal
StackCounters:
dumped_rx_count dd 0
arp_tx_count:
dd 0
arp_rx_count:
dd 0
ip_rx_count:
dd 0
ip_tx_count:
dd 0
arp_tx_count: dd 0
arp_rx_count: dd 0
ip_rx_count: dd 0
ip_tx_count: dd 0
endg
 
; socket buffers
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/queue.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/udp.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/ip.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/network/icmp.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/hid/keyboard.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/hid/mousedrv.inc
28,8 → 28,7
 
iglobal
mouse_delay dd 10
mouse_speed_factor:
dd 3
mouse_speed_factor: dd 3
mouse_timer_ticks dd 0
endg
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/hid/set_dtc.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/macros.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/fat32.inc
94,13 → 94,10
 
uglobal
align 4
fat_cache:
times 512 db 0
fat_cache: times 512 db 0
Sector512: ; label for dev_hdcd.inc
buffer:
times 512 db 0
fsinfo_buffer:
times 512 db 0
buffer: times 512 db 0
fsinfo_buffer: times 512 db 0
endg
 
uglobal
2348,8 → 2345,7
sub dword [esp], 0x200
jae @f
and dword [esp], 0
@@:
jmp .write_loop
@@: jmp .write_loop
 
hd_extend_file.zero_size:
xor eax, eax
2458,8 → 2454,7
cmp [hd_error], 0
jz @f
mov al, 11
@@:
stc
@@: stc
ret
 
;----------------------------------------------------------------
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/fs_lfn.inc
1018,11 → 1018,9
stosb
mov ecx, edx
rep movsb ;copy string
.ret:
ret
.ret: ret
 
.error:
add esp, 8
.error: add esp,8
or dword [esp+32], -1 ;error not found zerro at string ->[eax+APPDATA.cur_dir]
ret
.set:
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/iso9660.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/ntfs.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/ext2.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/part_set.inc
55,8 → 55,7
fs_dependent_data_end:
file_system_data_size = $ - PARTITION_START
if file_system_data_size > 96
ERROR:
sizeof(file system data) too big!
ERROR: sizeof(file system data) too big!
end if
 
virtual at fs_dependent_data_start
76,8 → 75,7
.cur_index_size dd ?
.cur_index_buf dd ?
if $ > fs_dependent_data_end
ERROR:
increase sizeof(fs_dependent_data)!
ERROR: increase sizeof(fs_dependent_data)!
end if
end virtual
 
101,8 → 99,7
.sb dd ? ; superblock
.groups_count dd ?
if $ > fs_dependent_data_end
ERROR:
increase sizeof(fs_dependent_data)!
ERROR: increase sizeof(fs_dependent_data)!
end if
end virtual
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/fs.inc
21,14 → 21,12
 
 
iglobal
dir0:
db 'HARDDISK '
dir0: db 'HARDDISK '
db 'RAMDISK '
db 'FLOPPYDISK '
db 0
 
dir1:
db 'FIRST '
dir1: db 'FIRST '
db 'SECOND '
db 'THIRD '
db 'FOURTH '
36,8 → 34,7
 
not_select_IDE db 0
 
hd_address_table:
dd 0x1f0,0x00,0x1f0,0x10
hd_address_table: dd 0x1f0,0x00,0x1f0,0x10
dd 0x170,0x00,0x170,0x10
endg
 
796,6 → 793,5
stc
jmp i4
 
partition_string:
dd 0
partition_string: dd 0
db 32
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/fat12.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fs/parse_fn.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/video/blitter.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/video/vesa20.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/video/vesa12.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/video/cursors.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/video/vga.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/detect/dev_fd.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/detect/biosdisk.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/detect/sear_par.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/detect/dev_hdcd.inc
124,8 → 124,7
ret
@@Error6:
mov [DevErrorCode], 6
@@End:
ret
@@End: ret
 
 
iglobal
259,20 → 258,15
mov [DevErrorCode], 0
ret
; Çàïèñàòü êîä îøèáêè
@@Err1:
mov [DevErrorCode], 1
@@Err1: mov [DevErrorCode],1
ret
@@Err2:
mov [DevErrorCode], 2
@@Err2: mov [DevErrorCode],2
ret
@@Err3:
mov [DevErrorCode], 3
@@Err3: mov [DevErrorCode],3
ret
@@Err4:
mov [DevErrorCode], 4
@@Err4: mov [DevErrorCode],4
ret
@@Err5:
mov [DevErrorCode], 5
@@Err5: mov [DevErrorCode],5
; Çàâåðøåíèå ðàáîòû ïðîãðàììû
ret
 
379,14 → 373,11
mov [DevErrorCode], 0
ret
; Îáðàáîòêà îøèáîê
@@Err1_2:
mov [DevErrorCode], 1
@@Err1_2: mov [DevErrorCode],1
ret
@@Err3_2:
mov [DevErrorCode], 3
@@Err3_2: mov [DevErrorCode],3
ret
@@Err4_2:
mov [DevErrorCode], 4
@@Err4_2: mov [DevErrorCode],4
; Çàïèñàòü êîä îøèáêè
ret
 
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/detect/getcache.inc
209,4 → 209,4
; mov [cache_ide0_pointer],HD_CACHE
; mov [cache_ide0_system_data],HD_CACHE+65536
; mov [cache_ide0_system_sad_size],1919
popa
popa
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/detect/biosmem.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/detect/disks.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/extended_primary_loader/fat32/kordldr.f32.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/extended_primary_loader/fat32/bootsect.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/extended_primary_loader/after_win/kordldr.win.asm
47,8 → 47,7
mov si, load_question + 100h - 600h
call out_string
; mov si, answer + 100h - 0600h ; already is
xxy:
mov ah, 0
xxy: mov ah, 0
int 16h
or al, 20h
mov [si], al
905,8 → 904,7
 
rootcache_size dw ? ; must be immediately before foldcache_clus
if $-dat >= 0x80
warning:
unoptimal data displacement!
warning: unoptimal data displacement!
end if
foldcache_clus rd 7
foldcache_mark rw 7
914,8 → 912,7
fat_filename rb 11
 
if $ > 2000h
error:
file is too big
error: file is too big
end if
 
; for NT/2k/XP, file must be 16 sectors = 0x2000 bytes long
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/extended_primary_loader/after_win/fat.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/extended_primary_loader/after_win/ntfs.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/extended_primary_loader/cdfs/bootsect.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/extended_primary_loader/fat1x/kordldr.f1x.asm
684,6 → 684,5
foldcache_size rw 7
filename rb 11
if $ > 0x8200
error:
table overwritten
error: table overwritten
end if
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/extended_primary_loader/fat1x/bootsect.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/boot_fat12.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/floppy1440.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/floppy1680.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/floppy1743.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bootloader/floppy2880.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bus/pci/pci32.inc
545,8 → 545,7
uglobal
align 4
; VendID (2), DevID (2), Revision = 0 (1), Class Code (3), FNum (1), Bus (1)
pci_emu_dat:
times 30*10 db 0
pci_emu_dat: times 30*10 db 0
endg
;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
align 4
580,8 → 579,7
cmp ebp, 2 ; FIND_PCI_DEVICE
jne .not_FIND_PCI_DEVICE
mov ebx, pci_emu_dat
..nxt:
cmp [ebx], dx
..nxt: cmp [ebx], dx
jne ..no
cmp [ebx + 2], cx
jne ..no
590,8 → 588,7
mov bx, [ebx + 4]
xor ah, ah
jmp .return_ab
..no:
cmp word[ebx], 0
..no: cmp word[ebx], 0
je ..dev_not_found
add ebx, 10
jmp ..nxt
604,14 → 601,12
jne .not_FIND_PCI_CLASS_CODE
mov esi, pci_emu_dat
shl ecx, 8
..nxt2:
cmp [esi], ecx
..nxt2: cmp [esi], ecx
jne ..no2
mov bx, [esi]
xor ah, ah
jmp .return_ab
..no2:
cmp dword[esi], 0
..no2: cmp dword[esi], 0
je ..dev_not_found
add esi, 10
jmp ..nxt2
646,8 → 641,7
.not_WRITE_CONFIG:
.unsupported_func:
mov ah, 0x81 ; FUNC_NOT_SUPPORTED
.return:
mov dword[esp + 4 ], edi
.return:mov dword[esp + 4 ], edi
mov dword[esp + 8], esi
.return_abcd:
mov dword[esp + 24], edx
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bus/pci/PCIe.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/bus/pci/pci16.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sound/playnote.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/memmap.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/unpacker.inc
219,8 → 219,7
cmp bl, 10
jb @f
mov al, 6
@@:
sub bl, al
@@: sub bl, al
jmp .main_loop
.1:
lea eax, [.IsRep*4 + ebx*4]
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/fdo.inc
252,8 → 252,7
debug_func fdo_debug_outstr
debug_beginf
mov eax, 1
.l1:
dec esi
.l1: dec esi
js .l2
movzx ebx, byte[edx]
or bl, bl
262,8 → 261,7
call ecx ; sys_msg_board
inc edx
jmp .l1
.l2:
ret
.l2: ret
debug_endf
 
debug_func fdo_debug_outdec
277,24 → 275,20
mov al, '-'
call fdo_debug_outchar
pop eax
@@:
push 10
@@: push 10
pop ecx
push -'0'
.l1:
xor edx, edx
.l1: xor edx,edx
div ecx
push edx
test eax, eax
jnz .l1
.l2:
pop eax
.l2: pop eax
add al, '0'
jz .l3
call fdo_debug_outchar
jmp .l2
.l3:
ret
.l3: ret
debug_endf
 
debug_func fdo_debug_outhex
305,8 → 299,7
add cl, 8
shl cl, 2
rol eax, cl
.l1:
rol eax, 4
.l1: rol eax,4
push eax
and eax, 0x0000000F
mov al, [__fdo_hexdigits+eax]
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/debug_msg.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/parse_def_sect.inc
135,8 → 135,7
mov word [es:di-4], ax
mov word [es:di-2], 16 ;êîë-âî áëîêîâ ïî 4 êá =64 êá ò.å. áîëüøå íå ñ÷èòàåì
;;;;;; ïîèñê êîíöà ñòðî÷êè
@@:
mov al, byte [es:di]
@@: mov al,byte [es:di]
cmp al, ' '
jz .found_end_str
cmp al, 0xa
281,8 → 280,7
;;;;;;;;;;;;;;;;;;;;;;;;;;
xor bx, bx
mov cx, 5
@@:
mov al, byte [es:di]
@@: mov al,byte [es:di]
cmp al, '0'
jb .CS
cmp al, '9'
496,11 → 494,9
test ax, ax
jnz @f ;îøèáêà åñëè ñþäà ïðûãíóëè âñå òàêè ...
 
.RS1:
mov word [fat12_buffer.BPB_BytsPerSec], 512
.RS1: mov word [fat12_buffer.BPB_BytsPerSec],512
;;;;;;;;;;ñêàæåì ÷òî ïî äåôîëòó áóäåì þçàòü çíà÷åíèå...
@@:
mov word [fat12_buffer.BPB_BytsPerSec], ax;òóò âñå îê
@@: mov word [fat12_buffer.BPB_BytsPerSec],ax ;òóò âñå îê
 
;BPB_SecPerClus êîë-âî ñåêòîðîâ â êëàñòåðå
use_RamdiskCluster ;âîçðàùàåìîå çíà÷åíèå â al
762,8 → 758,7
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
xor bx, bx
mov cx, 4
@@:
movzx ax, byte [es:di]
@@: movzx ax,byte [es:di]
cmp al, '0'
jb .end_RamdiskSector
cmp al, '9'
857,8 → 852,7
inc cx
dec di
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@:
movzx ax, byte [es:di]
@@: movzx ax,byte [es:di]
cmp al, '0'
jb .end_RamdiskCluster
cmp al, '9'
961,8 → 955,7
mov word [es:di-4], ax
mov word [es:di-2], 16 ;êîë-âî áëîêîâ ïî 4 êá =64 êá ò.å. áîëüøå íå ñ÷èòàåì
;;;;;; ïîèñê êîíöà ñòðî÷êè
@@:
mov al, byte [es:di]
@@: mov al,byte [es:di]
cmp al, ' '
jz .found_end_str
cmp al, 0xa
1096,8 → 1089,7
;ñîõðàíèëè ïåâûå 2 word
 
;
@@:
mov al, byte [es:di]
@@: mov al,byte [es:di]
cmp al, ',' ; ò.å. èùåì ðàçäåëèòåëü
jz .found_end_str
inc di
1438,8 → 1430,7
mov si, shot_name_fat
mov cx, 11
;çàïèøåì â ñòðóêòóðó èìÿ
@@:
lodsb
@@: lodsb
stosb
loop @b
 
1498,8 → 1489,7
;ìû îáðàáîòàåì çàïèñü äëÿ ôàò ïîëíîñòüþ, â íå çàâèñèìîñòè îò ïðåäåëà áóôåðà ãäå âîçìîæíà ÷àñòü ôàéëà.
mov ebx, save_file_size ;ðàçìåð ôàéëà â áàéòàõ
@@:
sub ebx, eax
@@: sub ebx,eax
cmp ebx, eax
jbe .eof_file
 
1520,8 → 1510,7
add cx, ax
jmp @b
 
.step2:
and cx, 0x0FFF
.step2: and cx,0x0FFF
mov word[es:si], cx
inc si
add cx, ax
1535,12 → 1524,10
mov word[es:si], cx
jmp .end
 
.step3:
and cx, 0x0FFF
.step3: and cx,0x0FFF
mov word[es:si], cx
 
.end:
inc point_next_fat_str
.end: inc point_next_fat_str
 
pop di
;DIR_FileSize 32-áèòíûé DWORD ñîäåðæèò ðàçìåð ôàéëà â áàéòàõ.
1562,8 → 1549,7
mov cx, 11
 
;çàïèøåì â ñòðóêòóðó èìÿ
@@:
mov al, byte [es:di]
@@: mov al,byte [es:di]
inc di
mov byte [ds:si], al
inc si
1790,8 → 1776,7
lea si, [check_name_fat_msg_y]
call printplain
lea si, [alarm_msg]
@@:
call printplain
@@: call printplain
popad
end if
 
1898,28 → 1883,23
jbe .st2_l
xor al, 0x20;ñäåëàåì çàãëàâíûå áóêâû
.st2_l:
mov byte [si], al
.st2_l: mov byte [si],al
inc di
inc si
; dec cx
; jnz @b
loop @b
.st5:
xor ax, ax
.st5: xor ax,ax
jmp @f
 
;;;;;;;;ôàéë çàêîí÷èëñÿ, è íóæíî âíåñòè â êîíåö ïðîáåëû
.st4_s:
mov al, ' '
.st4:
mov byte [si], al
.st4_s: mov al,' '
.st4: mov byte [si],al
inc si
loop .st4
jmp .st5
 
.error:
or ax, -1
.error: or ax,-1
@@:
 
if DEBUG
1929,8 → 1909,7
test ax, ax
jz @f
mov si, convertion_file_name_msg_n
@@:
call printplain
@@: call printplain
 
mov si, shot_name_fat
mov byte [si+12], 0
1992,8 → 1971,7
 
mov dl, 0x10
 
@@:
cmp eax, 0x00010000
@@: cmp eax,0x00010000
jb @f
 
sub eax, 0x00010000
2001,8 → 1979,7
jmp @b
 
 
@@:
mov byte [si+8*3+3], dl ;êóäà ïèñàòü
@@: mov byte [si+8*3+3],dl ;êóäà ïèñàòü
mov word [si+8*3+2], ax
 
mov ecx, save_file_size ;ðàçìåð ôàéëà â áàéòàõ.
2023,15 → 2000,13
;/óçíàåì ðàçìåð êëàñòåðà
pop eax ;restore size of claster
push ecx
@@:
inc data_offset
@@: inc data_offset
 
cmp eax, ecx
jae @f
sub ecx, eax
jmp @b
@@:
pop ecx
@@: pop ecx
 
 
 
2039,8 → 2014,7
test ecx, 0x1
jz .st1
inc ecx
.st1:
shr ecx, 1 ; ïðåîáðàçîâàòü çíà÷åíèå äëÿ 0x87 function
.st1: shr ecx,1 ; ïðåîáðàçîâàòü çíà÷åíèå äëÿ 0x87 function
 
;ïåðåíåñåì áëîê çà 1 ìá
push es
2094,8 → 2068,7
test ecx, 0x1
jz .st1
inc ecx
.st1:
shr ecx, 1
.st1: shr ecx,1
 
push es
push ds
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/sl_proc.inc
48,8 → 48,7
push edx
call decode
pop eax
@@:
or al, 0x30
@@: or al,0x30
mov [ds:di], al
inc di
ret
147,8 → 146,7
.not_space:
cmp al, ';'
jz .first_com
.exit:
ret
.exit: ret
;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
show_name_section:
228,9 → 226,8
jz @f
cmp al, "'"
jnz .end_sh_name_sec
@@: lodsb
@@:
lodsb
@@:
stosw
lodsb
cmp al, '"'
476,8 → 473,7
push dx
call .decode
pop ax
@@:
or al, 0x30
@@: or al,0x30
push ax
mov ah, 9
stosw
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/booteng.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/bootru.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/kolibri_ldm.asm
455,8 → 455,7
sub word [cursor_pos], size_of_step
jmp .loops
 
.down:
cmp ah, 0x50;x,0x50E0 ; down
.down: cmp ah,0x50;x,0x50E0 ; down
jne .pgup
cmp word[es:si+10], -1
je .loops
463,8 → 462,7
add word [cursor_pos], size_of_step
jmp .loops
 
.pgup:
cmp ah, 0x49 ; page up
.pgup: cmp ah,0x49 ; page up
jne .pgdn
sub si, size_of_step*long_v_table
cmp si, modes_table
481,8 → 479,7
mov word [home_cursor], si
jmp .loops
 
.pgdn:
cmp ah, 0x51 ; page down
.pgdn: cmp ah,0x51 ; page down
jne .enter
mov ax, [end_cursor]
add si, size_of_step*long_v_table
502,8 → 499,7
mov word [home_cursor], si
jmp .loops
 
.enter:
cmp al, 0x0D;x,0x1C0D ; enter
.enter: cmp al,0x0D;x,0x1C0D ; enter
jne .loops
push word [cursor_pos]
pop bp
539,8 → 535,7
popf
jz @f
mov si, off_msg
@@:
jmp printplain
@@: jmp printplain
; novesa and vervesa strings are not used at the moment of executing this code
virtual at novesa
.oldtimer dd ?
581,8 → 576,7
mov cl, 'ã'
jz @f
mov cl, 'ë'
@@:
mov [time_str+9], cl
@@: mov [time_str+9], cl
else if lang eq et
cmp al, 1
ja @f
595,8 → 589,7
mov cl, 's'
ja @f
mov cl, ' '
@@:
mov [time_str+9], cl
@@: mov [time_str+9], cl
end if
add al, '0'
mov [time_str+1], al
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/bootet.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/bootge.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/bootstr.inc
35,8 → 35,7
; store byte ' ' at d80x25_top+cur_line_pos
; store dword ' SVN' at d80x25_top+cur_line_pos-4
 
space_msg:
line_space
space_msg: line_space
;verstr:
; line_space
; version string
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/bootvesa.inc
93,8 → 93,7
push edx
call int2str
pop eax
@@:
or al, 0x30
@@: or al,0x30
mov [ds:di], al
inc di
ret
107,8 → 106,7
push edx
call int2strnz
pop eax
@@:
or al, 0x30
@@: or al,0x30
mov [es:di], al
inc di
ret
245,8 → 243,7
jb .lp1
 
or cx, 0x4000 ; use LFB
.lp1:
mov [es:bx+6], cx ; +6 : mode number
.lp1: mov [es:bx+6],cx ; +6 : mode number
movzx ax, byte [es:mi.BitsPerPixel]
mov word [es:bx+8], ax ; +8 : bits per pixel
add bx, size_of_step ; size of record
405,8 → 402,7
 
mov ecx, long_v_table
 
.loop:
add ax, size_of_step
.loop: add ax,size_of_step
cmp ax, word [end_cursor]
jae .next_step
loop .loop
439,16 → 435,13
je .ok
cmp word [es:si+8], 24
je .ok
.next:
add si, size_of_step
.next: add si,size_of_step
cmp word [es:si], -1
je .exit
jmp .loops
.ok:
xor ax, ax
.ok: xor ax,ax
ret
.exit:
or ax, -1
.exit: or ax,-1
ret
 
 
491,8 → 484,7
jmp .ok
 
 
.low:
sub cx, size_of_step
.low: sub cx,size_of_step
cmp cx, modes_table
jb .ok
push cx
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/et.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/macros.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/preboot.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/rdload.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/ru.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/kolibri_ldm/shutdown.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/loader.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/sl_equ.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/mkfloppy.inc
82,10 → 82,9
 
macro stof id, name
{
id#_base:
file name
id#_base: file name
id#_size=$-id#_base
reset id
}
 
defdir fix macro
defdir fix macro
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/after_win/fat.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/after_win/kordldr.win.asm
47,8 → 47,7
mov si, load_question + 100h - 600h
call out_string
; mov si, answer + 100h - 0600h ; already is
xxy:
mov ah, 0
xxy: mov ah, 0
int 16h
or al, 20h
mov [si], al
905,8 → 904,7
 
rootcache_size dw ? ; must be immediately before foldcache_clus
if $-dat >= 0x80
warning:
unoptimal data displacement!
warning: unoptimal data displacement!
end if
foldcache_clus rd 7
foldcache_mark rw 7
914,8 → 912,7
fat_filename rb 11
 
if $ > 2000h
error:
file is too big
error: file is too big
end if
 
; for NT/2k/XP, file must be 16 sectors = 0x2000 bytes long
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/after_win/ntfs.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/cdfs/bootsect.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/fat1x/bootsect.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/fat1x/kordldr.f1x.asm
663,6 → 663,5
foldcache_size rw 7
filename rb 11
if $ > 0x8200
error:
table overwritten
error: table overwritten
end if
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/fat32/bootsect.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot/fat32/kordldr.f32.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/boot_st.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/listing.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/parse.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/parse_any.inc
219,8 → 219,7
mov point_default, ax
jmp .show_active_cursor
 
@@:
call find_next_sect
@@: call find_next_sect
jmp .show_all_scr
 
.pgup:
625,8 → 624,7
push di
xor ax, ax
 
@@:
mov cx, 38
@@: mov cx,38
push di
rep stosw
pop di
639,8 → 637,7
dec bx
jnz @b
 
@@:
pop di
@@: pop di
;enter in mess
.show_mess_prev_eq:
lodsb
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/parse_dat.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/parse_loader.inc
130,8 → 130,7
mov bx, cx
mov dx, di
 
@@:
mov al, byte [es:di]
@@: mov al,byte [es:di]
inc di
dec cx
test cx, cx
292,8 → 291,7
push cx
xor bx, bx
mov cx, 2
@@:
mov al, byte [es:di]
@@: mov al,byte [es:di]
cmp al, '0'
jb .end_get_val_t
cmp al, '9'
319,8 → 317,7
mov word [value_timeout], default_timeout_value
mov si, set_default_timeout_val
call printplain
@@:
pop cx
@@: pop cx
jmp .get_next_str
 
;///////here end block loader
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/sec_loader/trunk/parse_err.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/imports.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/kglobals.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/proc32.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/skin/default.asm
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property
/kernel/trunk/skin/me_skin.inc
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property