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

         DSB_OWNbit              = 0x80000000
         DSB_EORbit              = 0x40000000
         DSB_FSbit               = 0x20000000
         DSB_LSbit               = 0x10000000
-        RX_BUF_SIZE             = 1536          ; Rx Buffer size
+        RX_BUF_SIZE             = 1514          ; Rx Buffer size
 ; max supported gigabit ethernet frame size -- must be at least (dev->mtu+14+4)
-        MAX_ETH_FRAME_SIZE      = 1536
+        MAX_ETH_FRAME_SIZE      = 1514
         TIMER_EXPIRE_TIME       = 100
         ETH_HDR_LEN             = 14
         DEFAULT_MTU             = 1500
-        DEFAULT_RX_BUF_LEN      = 1536
+        DEFAULT_RX_BUF_LEN      = 1514
 reset:
         DEBUGF  1,"resetting\n"
+        call    init_ring
+        test    eax, eax
         jnz     .err
         call    init_ring
         call    hw_start
         DEBUGF  2,"init OK!\n"
         xor     eax, eax
         ret
+  .err:
+        DEBUGF  2,"failed!\n"
         or      eax, -1
         ret
         lea     edi, [ebx + device.rx_ring]
         mov     ecx, NUM_RX_DESC
   .loop:
         push    ecx
+        invoke  NetAlloc, RX_BUF_SIZE+NET_BUFF.data
+        test    eax, eax
-        invoke  KernelAlloc, RX_BUF_SIZE
+        jz      .err
         mov     dword [edi + rx_desc.buf_soft_addr], eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     dword [edi + rx_desc.buf_addr], eax
         mov     [edi + rx_desc.status], DSB_OWNbit or RX_BUF_SIZE
         add     edi, sizeof.rx_desc
         pop     ecx
         dec     ecx
         jnz     .loop
+        or      [edi - sizeof.rx_desc + rx_desc.status], DSB_EORbit
         or      [edi - sizeof.rx_desc + rx_desc.status], DSB_EORbit
+        xor     eax, eax
+        ret
+  .err:
         pop     eax
-        ret
+        or      eax, -1
         ret
 ;   Destroyed registers
 ;      eax, edx, esi, edi
+;
 ;***************************************************************************
-proc transmit stdcall bufferptr, buffersize
+proc transmit stdcall bufferptr
+        pushf
-        pushf
+        cli
-        cli
         mov     esi, [bufferptr]
-        DEBUGF  1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [buffersize]
+        DEBUGF  1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [esi + NET_BUFF.length]
-        mov     eax, [bufferptr]
+        lea     eax, [esi + NET_BUFF.data]
         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+06]:2,[eax+07]:2,[eax+08]:2,[eax+09]:2,[eax+10]:2,[eax+11]:2,\
         [eax+13]:2,[eax+12]:2
-        cmp     [buffersize], 1514
+        cmp     [esi + NET_BUFF.length], 1514
         ja      .fail
 ;---------------------------
 ; Program the packet pointer
         mov     eax, [bufferptr]
+        mov     ecx, [eax + NET_BUFF.length]
-        mov     eax, [bufferptr]
+        mov     [esi + tx_desc.buf_soft_addr], eax
-        mov     [esi + tx_desc.buf_soft_addr], eax
+        add     eax, [eax + NET_BUFF.offset]
         invoke  GetPhysAddr
         mov     dword [esi + tx_desc.buf_addr], eax
-;------------------------
-; Program the packet size
+;------------------------
 ; Program the packet size
         mov     eax, [buffersize]
-    @@:
+        mov     eax, ecx
         or      eax, DSB_OWNbit or DSB_FSbit or DSB_LSbit
 ;-------------
 ; Update stats
-        inc     [ebx + device.packets_tx]
-        mov     eax, [buffersize]
+        inc     [ebx + device.packets_tx]
-        add     dword [ebx + device.bytes_tx], eax
+        add     dword [ebx + device.bytes_tx], ecx
         adc     dword [ebx + device.bytes_tx + 4], 0
         popf
         xor     eax, eax
         ret
   .desc:
         DEBUGF  2,"Descriptor is still in use!\n"
   .fail:
         DEBUGF  2,"Transmit failed\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         mov     eax, sizeof.rx_desc
         mul     [ebx + device.cur_rx]
         lea     esi, [ebx + device.rx_ring + eax]
         DEBUGF  1,"RxDesc.status = 0x%x\n", [esi + rx_desc.status]
-        mov     eax, [esi + rx_desc.status]
+        mov     ecx, [esi + rx_desc.status]
-        test    eax, DSB_OWNbit ;;;
+        test    ecx, DSB_OWNbit ;;;
-        jnz     .no_own
+        jnz     .rx_return
         DEBUGF  1,"cur_rx = %u\n", [ebx + device.cur_rx]
-        test    eax, SD_RxRES
+        test    ecx, SD_RxRES
         jnz     .rx_return      ;;;;; RX error!
+        push    ebx
+        push    .check_more
-        push    ebx
+        and     ecx, 0x00001FFF
+        add     ecx, -4                         ; we dont need CRC
-        push    .check_more
+        DEBUGF  1,"data length = %u\n", ecx
+        mov     eax, [esi + rx_desc.buf_soft_addr]
+        push    eax
-        and     eax, 0x00001FFF
+        mov     [eax + NET_BUFF.length], ecx
-        add     eax, -4                         ; we dont need CRC
+        mov     [eax + NET_BUFF.device], ebx
-        push    eax
+        mov     [eax + NET_BUFF.offset], NET_BUFF.data
         DEBUGF  1,"data length = %u\n", ax
+;-------------
-        ; Update stats
 ; Update stats
-        add     dword [ebx + device.bytes_rx], eax
-        adc     dword [ebx + device.bytes_rx + 4], 0
+        add     dword [ebx + device.bytes_rx], eax
-        inc     [ebx + device.packets_rx]
+        adc     dword [ebx + device.bytes_rx + 4], 0
+        inc     [ebx + device.packets_rx]
+;----------------------
-        pushd   [esi + rx_desc.buf_soft_addr]
+; Allocate a new buffer
-        ; Allocate a new buffer
+        invoke  NetAlloc, RX_BUF_SIZE+NET_BUFF.data
         mov     [esi + rx_desc.buf_soft_addr], eax
-        invoke  KernelAlloc, RX_BUF_SIZE
+        invoke  GetPhysAddr
-        mov     [esi + rx_desc.buf_soft_addr], eax
+        add     eax, NET_BUFF.data
-        invoke  GetPhysAddr
+        mov     dword [esi + rx_desc.buf_addr], eax
-        mov     dword [esi + rx_desc.buf_addr], eax
+;---------------
 ; re set OWN bit
         ; reset OWN bit
+        mov     eax, DSB_OWNbit or RX_BUF_SIZE
-        mov     eax, DSB_OWNbit or RX_BUF_SIZE
+        cmp     [ebx + device.cur_rx], NUM_RX_DESC - 1
-        cmp     [ebx + device.cur_rx], NUM_RX_DESC - 1
         jne     @f
         or      eax, DSB_EORbit
     @@:
         mov     [esi + rx_desc.status], eax
-        ; Update rx ptr
+;--------------
 ; Update rx ptr
         inc     [ebx + device.cur_rx]
-        and     [ebx + device.cur_rx], NUM_RX_DESC - 1
-        jmp     [Eth_input]
-  .rx_return:
+        and     [ebx + device.cur_rx], NUM_RX_DESC - 1
+        jmp     [EthInput]
-        DEBUGF  1,"RX error!\n"
+  .rx_return:
-  .no_own:
         pop     ax
   .no_rx:
+;-----------------
-;-----------------
+; Transmit cleanup
-; Transmit cleanup
         test    ax, ISB_TxOK or ISB_TxErr or ISB_TxDescUnavail
-        jz      .no_tx
+        jz      .no_tx
-        DEBUGF  1,"TX done!\n"
+        push    ax
-  .txloop:
-        mov     esi, [ebx + device.last_tx]
+        DEBUGF  1,"TX done!\n"
+        mov     ecx, NUM_TX_DESC
-        imul    esi, sizeof.tx_desc
+        lea     esi, [ebx + device.tx_ring]
-        lea     esi, [ebx + device.tx_ring + esi]
+  .txloop:
         cmp     dword [esi + tx_desc.buf_soft_addr], 0
-        cmp     dword [esi + tx_desc.buf_soft_addr], 0
+        jz      .maybenext
 ; 8168DP family.
 dd 0x7cf00000, 0x28800000, 27, name_27
 dd 0x7cf00000, 0x28a00000, 28, name_27
 ; 8168C family.
-dd 0x7cf00000, 0x3cb00000, 24, name_23
+dd 0x7cf00000, 0x3cb00000, 24, name_18
-dd 0x7cf00000, 0x3c900000, 23, name_23
+dd 0x7cf00000, 0x3c900000, 23, name_18
 dd 0x7cf00000, 0x3c800000, 18, name_18
-dd 0x7c800000, 0x3c800000, 24, name_23
+dd 0x7c800000, 0x3c800000, 24, name_18
 dd 0x7cf00000, 0x3c000000, 19, name_19
 dd 0x7cf00000, 0x3c200000, 20, name_19
 dd 0x7cf00000, 0x3c300000, 21, name_19
 dd 0x7cf00000, 0x3c400000, 22, name_19
 name_18 db "RTL8168cp/8111cp",0
 name_19 db "RTL8168c/8111c",0
 ;name_20 db "RTL8168c/8111c",0
 ;name_21 db "RTL8168c/8111c",0
 ;name_22 db "RTL8168c/8111c",0
-name_23 db "RTL8168cp/8111cp",0
+;name_23 db "RTL8168cp/8111cp",0
 ;name_24 db "RTL8168cp/8111cp",0
 name_25 db "RTL8168d/8111d",0
 ;name_26 db "RTL8168d/8111d",0
 name_27 db "RTL8168dp/8111dp",0
 ;name_28 db "RTL8168dp/8111dp",0

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/RTL8169.asm – Rev 5498 → 5522