KolibriOS/kolibrios
13
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

Rhine: Improved interrupt handeling.

Browse Source 
git-svn-id: svn://kolibrios.org@9157 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2021-08-28 09:12:02 +00:00
parent 785dcb3341
commit 650af770ae
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
drivers/ethernet/rhine.asm
View File

@ -1,6 +1,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; Copyright (C) KolibriOS team 2010-2015. All rights reserved. ;;
;; Copyright (C) KolibriOS team 2010-2021. All rights reserved. ;;
;; Distributed under terms of the GNU General Public License ;;
;; ;;
;; rhine.asm ;;
@ -21,6 +21,8 @@
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; TODO: test for RX-overrun
format PE DLL native
entry START
@ -33,8 +35,8 @@ entry START
__DEBUG__ = 1
__DEBUG_LEVEL__ = 2 ; 1 = all, 2 = errors only
TX_RING_SIZE = 4
RX_RING_SIZE = 4
TX_RING_SIZE = 32
RX_RING_SIZE = 32
; max time out delay time
W_MAX_TIMEOUT = 0x0FFF
@ -1405,13 +1407,13 @@ read_mac:
;; ;;
;; In: buffer pointer in [esp+4] ;;
;; pointer to device structure in ebx ;;
;; Out: eax = 0 on success ;;
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
align 4
align 16
proc transmit stdcall bufferptr
pushf
cli
spin_lock_irqsave
mov esi, [bufferptr]
DEBUGF 1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [esi + NET_BUFF.length]
@ -1422,10 +1424,11 @@ proc transmit stdcall bufferptr
[eax+13]:2,[eax+12]:2
cmp [esi + NET_BUFF.length], 1514
ja .fail
ja .error
cmp [esi + NET_BUFF.length], 60
jb .fail
jb .error
; Program the descriptor
movzx eax, [ebx + device.cur_tx]
mov ecx, sizeof.tx_head
mul ecx
@ -1433,7 +1436,7 @@ proc transmit stdcall bufferptr
add edi, eax
cmp [edi + tx_head.buff_addr_virt], 0
jne .fail
jne .overrun
mov eax, esi
mov [edi + tx_head.buff_addr_virt], eax
@ -1463,18 +1466,29 @@ proc transmit stdcall bufferptr
add dword [ebx + device.bytes_tx], ecx
adc dword [ebx + device.bytes_tx + 4], 0
DEBUGF 1,"Transmit OK\n"
popf
spin_unlock_irqrestore
xor eax, eax
ret
.fail:
DEBUGF 2,"Transmit failed\n"
.error:
DEBUGF 2, "TX packet error\n"
inc [ebx + device.packets_tx_err]
invoke NetFree, [bufferptr]
popf
spin_unlock_irqrestore
or eax, -1
ret
.overrun:
DEBUGF 2, "TX overrun\n"
inc [ebx + device.packets_tx_ovr]
invoke NetFree, [bufferptr]
spin_unlock_irqrestore
or eax, -1
ret
endp
@ -1484,41 +1498,22 @@ endp
;; Interrupt handler ;;
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;
align 4
align 16
int_handler:
push ebx esi edi
DEBUGF 1,"INT\n"
; Find pointer of device which made IRQ occur
mov ecx, [devices]
test ecx, ecx
jz .nothing
mov esi, device_list
.nextdevice:
mov ebx, [esi]
mov ebx, [esp+4*4]
DEBUGF 1,"INT for 0x%x\n", ebx
set_io [ebx + device.io_addr], 0
set_io [ebx + device.io_addr], IntrStatus
in ax, dx
out dx, ax ; send it back to ACK
test ax, ax
jnz .got_it
.continue:
add esi, 4
dec ecx
jnz .nextdevice
.nothing:
pop edi esi ebx
xor eax, eax
jz .nothing
ret ; If no device was found, abort (The irq was probably for a device, not registered to this driver)
.got_it:
DEBUGF 1, "status=0x%x\n", ax
out dx, ax ; ACK interrupt
DEBUGF 1, "Status=0x%x\n", ax
push ax
@ -1652,6 +1647,11 @@ end if
ret
.nothing:
pop edi esi ebx
xor eax, eax
ret