WebSVN – Kolibri OS – Diff – /drivers/ethernet/RTL8169.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2018. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2021. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  RTL8169 driver for KolibriOS                                   ;;
 ;;                                                                 ;;
 ;;  Copyright 2007 mike.dld,                                       ;;
         CURRENT_API             = 0x0200
         COMPATIBLE_API          = 0x0100
         API_VERSION             = (COMPATIBLE_API shl 16) + CURRENT_API
+; configureable area
-        MAX_DEVICES             = 16
+        MAX_DEVICES             = 16    ; Maximum number of devices this driver may handle
-        __DEBUG__               = 1
+        __DEBUG__               = 1     ; 1 = on, 0 = off
+        __DEBUG_LEVEL__         = 2     ; 1 = verbose, 2 = errors only
-        __DEBUG_LEVEL__         = 2     ; 1 = verbose, 2 = errors only
+        NUM_TX_DESC             = 32    ; Number of packets in send ring buffer
         NUM_RX_DESC             = 32    ; Number of packets in receive ring buffer
         NUM_TX_DESC             = 4
-        NUM_RX_DESC             = 4
+; end configureable area
 section '.flat' readable writable executable
+include '../proc32.inc'
+include '../struct.inc'
+include '../macros.inc'
+include '../fdo.inc'
+include '../netdrv.inc'
+if (bsr NUM_TX_DESC)>(bsf NUM_TX_DESC)
+  display 'NUM_TX_DESC must be a power of two'
+  err
 end if
 include '../proc32.inc'
-include '../struct.inc'
+if (bsr NUM_RX_DESC)>(bsf NUM_RX_DESC)
-include '../macros.inc'
+  display 'NUM_RX_DESC must be a power of two'
-include '../fdo.inc'
+  err
         ISB_TxOK                = 0x04
         ISB_RxErr               = 0x02
         ISB_RxOK                = 0x01
+        ; RxStatusDesc
+        SD_RxBOVF               = (1 shl 24)
-        ; RxStatusDesc
+        SD_RxFOVF               = (1 shl 23)
-        SD_RxRES                = 0x00200000
+        SD_RxRWT                = (1 shl 22)
-        SD_RxCRC                = 0x00080000
+        SD_RxRES                = (1 shl 21)
-        SD_RxRUNT               = 0x00100000
+        SD_RxRUNT               = (1 shl 20)
-        SD_RxRWT                = 0x00400000
+        SD_RxCRC                = (1 shl 19)
         ; ChipCmdBits
         CMD_Reset               = 0x10
         [eax+00]:2,[eax+01]:2,[eax+02]:2,[eax+03]:2,[eax+04]:2,[eax+05]:2,\
         [eax+06]:2,[eax+07]:2,[eax+08]:2,[eax+09]:2,[eax+10]:2,[eax+11]:2,\
         [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
 ;----------------------------------
 ;----------------------------------
 ; Check if the descriptor is in use
         test    [esi + tx_desc.status], DSB_OWNbit
-        jnz     .desc
+        jnz     .overrun
         popf
         xor     eax, eax
         ret
+  .error:
+        DEBUGF  2, "TX packet error\n"
+        inc     [ebx + device.packets_tx_err]
+        invoke  NetFree, [bufferptr]
+        popf
+        or      eax, -1
-  .desc:
+        ret
-        DEBUGF  2,"Descriptor is still in use!\n"
+  .overrun:
-  .fail:
+        DEBUGF  2, "TX overrun\n"
+        inc     [ebx + device.packets_tx_ovr]
-        DEBUGF  2,"Transmit failed\n"
+        invoke  NetFree, [bufferptr]
         invoke  NetFree, [bufferptr]
         popf
         or      eax, -1
         lea     esi, [ebx + device.rx_ring + eax]
         DEBUGF  1,"RxDesc.status = 0x%x\n", [esi + rx_desc.status]
         mov     ecx, [esi + rx_desc.status]
         test    ecx, DSB_OWNbit
-        jnz     .rx_return
+        jnz     .rx_done
         DEBUGF  1,"cur_rx = %u\n", [ebx + device.cur_rx]
-        DEBUGF  1,"cur_rx = %u\n", [ebx + device.cur_rx]
         test    ecx, SD_RxRES
-        jnz     .rx_reuse
+        jnz     .rx_error
         push    ebx
 ; Allocate a new buffer
         mov     [esi + rx_desc.status], 0
         invoke  NetAlloc, RX_BUF_SIZE+NET_BUFF.data
         test    eax, eax
-        jz      .no_more_buffers
+        jz      .rx_overrun
         mov     [esi + rx_desc.buf_soft_addr], eax
         invoke  GetPhysAddr
         add     eax, NET_BUFF.data
         jne     @f
         or      eax, DSB_EORbit
     @@:
         mov     [esi + rx_desc.status], eax
   .no_more_buffers:
 ;--------------
 ; Update rx ptr
         inc     [ebx + device.cur_rx]
+        and     [ebx + device.cur_rx], NUM_RX_DESC - 1
+        jmp     [EthInput]
+  .rx_overrun:
+        DEBUGF  2,"RX FIFO overrun\n"
+        inc     [ebx + device.packets_rx_ovr]
+        jmp     .rx_next
+  .rx_error:
+        inc     [ebx + device.packets_rx_err]
+        test    ecx, SD_RxRWT or SD_RxRUNT
+        jz      @f
+        DEBUGF  2,"RX length error"
+  @@:
+        test    ecx, SD_RxCRC
+        jz      @f
+        DEBUGF  2,"RX CRC error"
+  @@:
+        test    ecx, SD_RxFOVF
-        and     [ebx + device.cur_rx], NUM_RX_DESC - 1
+        jz      @f
         DEBUGF  2,"RX FIFO error"
-        jmp     [EthInput]
+  @@:
-  .rx_reuse:
+  .rx_next:
         mov     eax, DSB_OWNbit or RX_BUF_SIZE
         cmp     [ebx + device.cur_rx], NUM_RX_DESC - 1
         jne     @f
         or      eax, DSB_EORbit
     @@:
         mov     [esi + rx_desc.status], eax
         push    ebx
         jmp     .rx_loop

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/RTL8169.asm – Rev 7299 → 8997