Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1195 → Rev 1196

/kernel/branches/net/applications/netcfg/netcfg.asm
38,8 → 38,8
jne @f
mcall -1 ; close this program
@@:
cmp eax,0x0000fe00
jg @f
cmp eax,0x0000ff00
jg load_drv
 
cmp ah, 4
je hook
51,19 → 51,11
je unload
 
jmp still
@@:
shr eax, 16
mov word [selected], ax
 
call load_drv
call draw_window
 
jmp still
 
load_drv:
; mov ax , [selected]
test ax , ax
jz still
shr eax, 16
mov word [selected], ax
 
mov bl , 6 ; get a dword
mov bh , ah ; bus
81,8 → 73,16
 
mov [IOCTL.handle], eax
 
ret
call draw_window
 
cmp [IOCTL.handle], 0
jne still
 
mcall 4, 20 shl 16 + 30, 1 shl 31 + 0x00ff0000 , load_error
 
jmp still
 
 
hook:
mov ax , [selected]
test ax , ax
101,26 → 101,24
 
mov byte[drivernumber], al
 
jmp still
 
reset:
movzx ebx, byte[drivernumber]
mcall 73,,2
 
ret
jmp still
 
unload:
movzx ebx, byte[drivernumber]
mcall 73,,3
 
ret
jmp still
 
draw_window:
mcall 12, 1 ; start of draw
mcall 0, dword [Form], dword [Form + 4], 0x13ffffff, 0x805080d0, title
 
; mcall 73, 1,
; mov ecx, eax
; mcall 47, 1 shl 18, , 50 shl 16 + 10, 0x00000000
 
call Get_PCI_Info ; get pci version and last bus, scan for and draw each pci device
 
cmp edx, 20 shl 16 + 110
128,9 → 126,10
 
mcall 4, 20 shl 16 + 100, 1 shl 31 + 0x00000000 , caption
 
mov ax , [selected]
test ax, ax
cmp [selected], 0
jz .done
cmp [IOCTL.handle] ,0
jz .done
 
mcall 8, 18 shl 16 + 100, 35 shl 16 + 18, 4, 0x00007f00
mcall ,, 55 shl 16 + 18, 5, 0x0000007f
379,8 → 378,8
driverfound:
ret
 
include 'VENDORS.INC'
include 'DRIVERS.INC'
include 'vendors.inc'
include 'drivers.inc'
;------------------------------------------------------------------
; DATA AREA
DATA
404,6 → 403,7
lbl_none db 'none',0
;lbl_unknown db 'unknown',0
;lbl_ethernet db 'ethernet',0
load_error db 'Could not load driver!',0
 
devicename db 'test'
rb 64
/kernel/branches/net/applications/zeroconf/zeroconf.asm
42,14 → 42,11
DEFEND_INTERVAL equ 10 ; seconds (min. wait between defensive ARPs)
 
 
 
 
AF_INET4 equ 2 ;;;;;
IP_PROTO_UDP equ 17
 
 
 
 
include '../proc32.inc'
include '../macros.inc'
include '../debug-fdo.inc'
197,22 → 194,22
invoke ini.get_str, path, str_ipconfig, str_ip, inibuf, 16, 0
mov edx, inibuf
call Ip2dword
mcall 73, 3, edx
mcall 75, 3, edx
 
invoke ini.get_str, path, str_ipconfig, str_gateway, inibuf, 16, 0
mov edx, inibuf
call Ip2dword
mcall 73, 9, edx
mcall 75, 9, edx
 
invoke ini.get_str, path, str_ipconfig, str_dns, inibuf, 16, 0
mov edx, inibuf
call Ip2dword
mcall 73, 7, edx
mcall 75, 7, edx
 
invoke ini.get_str, path, str_ipconfig, str_subnet, inibuf, 16, 0
mov edx, inibuf
call Ip2dword
mcall 73, 5, edx
mcall 75, 5, edx
 
 
mcall -1
478,11 → 475,11
call random
mov ecx,0xfea9 ; IP 169.254.0.0 link local net, see RFC3927
mov cx,ax
mcall 73, 3, ecx ; mask is 255.255.0.0
mcall 75, 3, ecx ; mask is 255.255.0.0
DEBUGF 1,"Link Local IP assinged: 169.254.%u.%u\n",[generator+2]:1,[generator+3]:1
mcall 73, 5, 0xffff
mcall 73, 9, 0x0
mcall 73, 7, 0x0
mcall 75, 5, 0xffff
mcall 75, 9, 0x0
mcall 75, 7, 0x0
 
mcall 5, PROBE_WAIT*100
 
559,7 → 556,7
libini,'libini.obj'
 
import libini, \
ini.get_str,'ini.get_str'
ini.get_str,'ini_get_str'
 
include_debug_strings
 
575,7 → 572,7
sockaddr1:
 
dw AF_INET4
dw 68 ; local port
dw 68 shl 8 ; local port
dd 0 ; local IP
 
rb 10
584,7 → 581,7
sockaddr2:
 
dw AF_INET4
dw 67 ; destination port
dw 67 shl 8 ; destination port
dd -1 ; destination IP
 
rb 10