sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Net-branch:

Browse Source 
Added statistics to 3c59x driver.
Fixed mixed up DNS and Gateway of static settings for zeroconf

git-svn-id: svn://kolibrios.org@1481 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2010-06-06 19:04:46 +00:00
parent f5372bd676
commit 049d796e81
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/branches/net/applications/zeroconf/zeroconf.asm
View File

@ -204,12 +204,12 @@ START: ; start of execution
invoke ini.get_str, path, str_ipconfig, str_dns, inibuf, 16, 0 invoke ini.get_str, path, str_ipconfig, str_dns, inibuf, 16, 0
mov edx, inibuf mov edx, inibuf
call Ip2dword call Ip2dword
mcall 75, 7, edx mcall 75, 5, edx
invoke ini.get_str, path, str_ipconfig, str_subnet, inibuf, 16, 0 invoke ini.get_str, path, str_ipconfig, str_subnet, inibuf, 16, 0
mov edx, inibuf mov edx, inibuf
call Ip2dword call Ip2dword
mcall 75, 5, edx mcall 75, 7, edx
mcall -1 mcall -1

19
kernel/branches/net/drivers/3c59x.asm
View File

@ -827,6 +827,11 @@ reset:
out dx, ax out dx, ax
xor eax, eax xor eax, eax
; clear packet/byte counters
lea edi, [device.bytes_tx]
mov ecx, 6
rep stosd
ret ret
@ -2308,9 +2313,15 @@ boomerang_transmit:
DEBUGF 1,"Found place in TX buffer: %x\n", edi DEBUGF 1,"Found place in TX buffer: %x\n", edi
push edi ;<<<<<<<<<<<<<<<<<<<<<<<<<<<< push edi ;<<<<<<<<<<<<<<<<<<<<<<<<<<<<
; update statistics
inc [device.packets_tx]
mov ecx, [esp+8+8]
add dword [device.bytes_tx], ecx
adc dword [device.bytes_tx + 4], 0
; copy packet data ; copy packet data
mov esi, [esp+4+8] mov esi, [esp+4+8]
mov ecx, [esp+8+8]
DEBUGF 1,"Copying %u bytes from %x to %x\n", ecx, esi, edi DEBUGF 1,"Copying %u bytes from %x to %x\n", ecx, esi, edi
shr cx , 1 shr cx , 1
jnc .nb jnc .nb
@ -2775,6 +2786,12 @@ int_boomerang:
DEBUGF 1, " copying %u bytes from %x to %x\n", ecx, esi, edi DEBUGF 1, " copying %u bytes from %x to %x\n", ecx, esi, edi
; update statistics
inc [device.packets_rx]
add dword [device.bytes_rx], ecx
adc dword [device.bytes_rx + 4], 0
; copy packet data ; copy packet data
shr cx , 1 shr cx , 1
jnc .nb jnc .nb

14
kernel/branches/net/drivers/netdrv.inc
View File

@ -44,20 +44,6 @@ macro set_io addr {
} }
macro diff16 title,l1,l2
{
local s,d
s = l2-l1
display title,': 0x'
repeat 16
d = 48 + s shr ((16-%) shl 2) and $0F
if d > 57
d = d + 65-57-1
end if
display d
end repeat
display 13,10
}
macro allocate_and_clear dest, size, err { macro allocate_and_clear dest, size, err {