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

* fixed return value for udp send()

Browse Source 
* added required zero-initialization of some fields in pcnet driver
* fixed debug output in pcnet driver


git-svn-id: svn://kolibrios.org@1263 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2009-11-10 11:49:07 +00:00
parent 6d7d0d57eb
commit e71825c2b1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/branches/net/drivers/pcnet32.asm
View File

@ -634,6 +634,8 @@ proc service_proc stdcall, ioctl:dword
mov [edi + buf_head.base], eax mov [edi + buf_head.base], eax
mov [edi + buf_head.length], PCNET_PKT_BUF_SZ_NEG mov [edi + buf_head.length], PCNET_PKT_BUF_SZ_NEG
mov [edi + buf_head.status], 0x8000 mov [edi + buf_head.status], 0x8000
and dword [edi + buf_head.msg_length], 0
and dword [edi + buf_head.reserved], 0
add eax, PCNET_PKT_BUF_SZ add eax, PCNET_PKT_BUF_SZ
; inc eax ; inc eax
add edi, buf_head.size add edi, buf_head.size
@ -645,6 +647,9 @@ proc service_proc stdcall, ioctl:dword
call GetPgAddr call GetPgAddr
.tx_init: .tx_init:
mov [edi + buf_head.base], eax mov [edi + buf_head.base], eax
and dword [edi + buf_head.length], 0
and dword [edi + buf_head.msg_length], 0
and dword [edi + buf_head.reserved], 0
add eax, PCNET_PKT_BUF_SZ add eax, PCNET_PKT_BUF_SZ
add edi, buf_head.size add edi, buf_head.size
loop .tx_init loop .tx_init
@ -1138,7 +1143,7 @@ reset:
;; ;; ;; ;;
;; Transmit ;; ;; Transmit ;;
;; ;; ;; ;;
;; In: buffer pointer in [esp+4] ;; ;; In: buffer pointer in [esp+4] ;;
;; size of buffer in [esp+8] ;; ;; size of buffer in [esp+8] ;;
;; pointer to device structure in ebx ;; ;; pointer to device structure in ebx ;;
;; ;; ;; ;;
@ -1146,7 +1151,7 @@ reset:
align 4 align 4
transmit: transmit:
DEBUGF 1,"Transmitting packet, buffer:%x, size:%u\n",[esp],[esp+4] DEBUGF 1,"Transmitting packet, buffer:%x, size:%u\n",[esp+4],[esp+8]
mov eax, [esp+4] mov eax, [esp+4]
DEBUGF 1,"To: %x-%x-%x-%x-%x-%x From: %x-%x-%x-%x-%x-%x Type:%x%x\n",\ DEBUGF 1,"To: %x-%x-%x-%x-%x-%x From: %x-%x-%x-%x-%x-%x Type:%x%x\n",\
[eax+00]:2,[eax+01]:2,[eax+02]:2,[eax+03]:2,[eax+04]:2,[eax+05]:2,\ [eax+00]:2,[eax+01]:2,[eax+02]:2,[eax+03]:2,[eax+04]:2,[eax+05]:2,\

2
kernel/branches/net/network/socket.inc
View File

@ -665,7 +665,7 @@ socket_send:
call UDP_socket_send call UDP_socket_send
mov [esp+32], eax and dword [esp+32], 0
ret ret
.tcp: .tcp: