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

Updated r6040 driver for net branch

Browse Source 
git-svn-id: svn://kolibrios.org@1889 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2011-02-25 16:14:21 +00:00
parent 62a811ce4f
commit 1b801e1c89
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
kernel/branches/net/drivers/R6040.asm
View File

@ -195,6 +195,7 @@ virtual at ebx
.cur_rx dw ? .cur_rx dw ?
.cur_tx dw ? .cur_tx dw ?
.last_tx dw ?
.phy_addr dw ? .phy_addr dw ?
.phy_mode dw ? .phy_mode dw ?
.mcr0 dw ? .mcr0 dw ?
@ -205,7 +206,7 @@ virtual at ebx
.pci_dev db ? .pci_dev db ?
.irq_line db ? .irq_line db ?
rb 3 ; dword alignment rb 1 ; dword alignment
.tx_ring: rb (((x_head.sizeof*TX_RING_SIZE)+32) and 0xfffffff0) .tx_ring: rb (((x_head.sizeof*TX_RING_SIZE)+32) and 0xfffffff0)
.rx_ring: rb (((x_head.sizeof*RX_RING_SIZE)+32) and 0xfffffff0) .rx_ring: rb (((x_head.sizeof*RX_RING_SIZE)+32) and 0xfffffff0)
@ -650,6 +651,7 @@ init_txbufs:
.next_desc: .next_desc:
mov [esi + x_head.ndesc], eax mov [esi + x_head.ndesc], eax
mov [edi + x_head.skb_ptr], 0
mov [esi + x_head.status], DSC_OWNER_MAC mov [esi + x_head.status], DSC_OWNER_MAC
add eax, x_head.sizeof add eax, x_head.sizeof
@ -831,7 +833,7 @@ transmit:
xor eax, eax xor eax, eax
dec eax dec eax
.fail: .fail:
DEBUGF 1,"R6040: Send timeout\n" DEBUGF 1,"Send timeout\n"
ret 8 ret 8
@ -876,14 +878,16 @@ int_handler:
add esi, 4 add esi, 4
dec ecx dec ecx
jnz .nextdevice jnz .nextdevice
; If no device was found, abort (The irq was probably for a device, not registered to this driver)
.fail: ; If no device was found, abort (The irq was probably for a device, not registered to this driver)
ret ret
; At this point, test for all possible reasons, and handle accordingly ; At this point, test for all possible reasons, and handle accordingly
.got_it: .got_it:
push ax
test ax, RX_FINISH test word [esp], RX_FINISH
jz .no_RX jz .no_RX
push ebx push ebx
@ -942,11 +946,37 @@ int_handler:
jmp EthReceiver jmp EthReceiver
.no_RX: .no_RX:
.fail: test word [esp], TX_FINISH
jz .no_TX
.loop_tx:
movzx edi, [device.last_tx]
shl edi, 5
lea edi, [device.tx_ring + edi]
test [edi + x_head.status], DSC_OWNER_MAC
jnz .tx_loop_end
cmp [edi + x_head.skb_ptr], 0
je .tx_loop_end
DEBUGF 1,"Freeing buffer 0x%x\n", [edi + x_head.skb_ptr]
push [edi + x_head.skb_ptr]
call KernelFree
mov [edi + x_head.skb_ptr], 0
inc [device.last_tx]
and [device.last_tx], TX_RING_SIZE - 1
jmp .loop_tx
.tx_loop_end:
.no_TX:
pop ax
ret ret