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

         DEBUGF  1, "21040 compatibility mode\n"
         mov     [ebx + device.id], DC21040
   @@:
 ;;; Find connected mii xceivers? 993-1043
 ; Reset the xcvr interface and turn on heartbeat.
         cmp     [ebx + device.id], DC21041
         jne     @f
         mov     ecx, RX_RING_SIZE
   .loop_rx_des:
         DEBUGF  1,"RX descriptor 0x%x\n", edi
         add     edx, sizeof.desc
         mov     [edi + desc.status], DES0_OWN
-        mov     [edi + desc.length], 1536
+        mov     [edi + desc.length], 1514
         push    edx edi ecx
-        invoke  KernelAlloc, 1536
+        invoke  NetAlloc, 1514+NET_BUFF.data
         pop     ecx edi edx
         test    eax, eax
         jz      .out_of_mem
         mov     [edi + RX_RING_SIZE*sizeof.desc], eax
+        push    edx
         invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
+        pop     edx
         mov     [edi + desc.buffer1], eax
         mov     [edi + desc.buffer2], edx
         add     edi, sizeof.desc
         dec     ecx
         jnz     .loop_rx_des
 ; set last descriptor as LAST
         or      [edi - sizeof.desc + desc.length], RDES1_RER           ; EndOfRing
         pop     [edi - sizeof.desc + desc.buffer2]                     ; point it to the first descriptor
         xor     eax, eax
         mov     [ebx + device.cur_tx], eax
         mov     [ebx + device.last_tx], eax
         mov     [ebx + device.cur_rx], eax
 ;        xor     eax, eax
         ret
   .out_of_mem:
 align 4
 create_setup_frame:
         DEBUGF  1,"Creating setup packet\n"
-        invoke  KernelAlloc, 192
+        invoke  NetAlloc, 192 + NET_BUFF.data
+        test    eax, eax
+        jz      .err
-        test    eax, eax
+        mov     [eax + NET_BUFF.device], ebx
-        jz      .err
+        mov     [eax + NET_BUFF.length], 192
         push    eax
-        mov     edi, eax
+        lea     edi, [eax + NET_BUFF.data]
         xor     eax, eax
 ; setup descriptor
         lea     edi, [ebx + device.tx_ring]
         DEBUGF  1, "attaching setup packet 0x%x to descriptor 0x%x\n", eax, edi
         mov     [edi + TX_RING_SIZE*sizeof.desc], eax
         invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     [edi + desc.buffer1], eax
-        mov     [edi + desc.length], TDES1_SET + 192        ; size must be EXACTLY 192 bytes + TDES1_IC
+        mov     [edi + desc.length], TDES1_SET or 192       ; size must be EXACTLY 192 bytes + TDES1_IC
         mov     [edi + desc.status], DES0_OWN
         DEBUGF  1, "descriptor 0x%x\n", edi
 ; go to next descriptor
+        inc     [ebx + device.cur_tx]
+        and     [ebx + device.cur_tx], TX_RING_SIZE-1
         inc     [ebx + device.cur_tx]
         xor     eax, eax
         ret
   .err:
-  .err:
+        DEBUGF  2, "Out of memory!\n"
-        DEBUGF  2, "Out of memory!\n"
+        or      eax, -1
         ret
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                         ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Transmit                                ;;
+;;                                         ;;
-;;                                         ;;
+;; Transmit                                ;;
-;; In: buffer pointer in [esp+4]           ;;
+;;                                         ;;
-;;     size of buffer in [esp+8]           ;;
+;; In:  ebx = pointer to device structure  ;;
+;; Out: eax = 0 on success                 ;;
-;;     pointer to device structure in ebx  ;;
+;;                                         ;;
-;;                                         ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 proc transmit stdcall bufferptr
 proc transmit stdcall bufferptr, buffersize
         pushf
-        pushf
+        cli
         cli
+        mov     esi, [bufferptr]
+        DEBUGF  1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [esi + NET_BUFF.length]
         lea     eax, [esi + NET_BUFF.data]
-        DEBUGF  1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [buffersize]
+        DEBUGF  1,"To: %x-%x-%x-%x-%x-%x From: %x-%x-%x-%x-%x-%x Type:%x%x\n",\
-        mov     eax, [bufferptr]
+        [eax+00]:2,[eax+01]:2,[eax+02]:2,[eax+03]:2,[eax+04]:2,[eax+05]:2,\
-        DEBUGF  1,"To: %x-%x-%x-%x-%x-%x From: %x-%x-%x-%x-%x-%x Type:%x%x\n",\
+        [eax+06]:2,[eax+07]:2,[eax+08]:2,[eax+09]:2,[eax+10]:2,[eax+11]:2,\
-        [eax+00]:2,[eax+01]:2,[eax+02]:2,[eax+03]:2,[eax+04]:2,[eax+05]:2,\
+        [eax+13]:2,[eax+12]: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
+        cmp     [esi + NET_BUFF.length], 60
         jb      .fail
-        mov     eax, [ebx + device.cur_tx]
-        mov     edx, sizeof.desc
+        mov     eax, [ebx + device.cur_tx]
-        mul     edx
+        mov     edx, sizeof.desc
-        lea     esi, [ebx + device.tx_ring + eax]
+        mul     edx
-        test    [esi + desc.status], DES0_OWN
+        lea     edi, [ebx + device.tx_ring + eax]
-        jnz     .fail
+        test    [edi + desc.status], DES0_OWN
+        jnz     .fail
         DEBUGF  1, "Descriptor is free\n"
+        mov     eax, [bufferptr]
-        mov     eax, [bufferptr]
+        mov     [edi + TX_RING_SIZE*sizeof.desc], eax
-        mov     [esi + TX_RING_SIZE*sizeof.desc], eax
+        add     eax, [eax + NET_BUFF.offset]
         invoke  GetPhysAddr
-        mov     [esi + desc.buffer1], eax
+        mov     [edi + desc.buffer1], eax
   .do_it:
         out     dx, eax
 ; Update stats
         inc     [ebx + device.packets_tx]
-        mov     eax, [buffersize]
+        mov     ecx, [esi + NET_BUFF.length]
-        add     dword [ebx + device.bytes_tx], eax
+        add     dword [ebx + device.bytes_tx], ecx
         adc     dword [ebx + device.bytes_tx + 4], 0
 ; go to next descriptor
         popf
         xor     eax, eax
         ret
   .fail:
-        DEBUGF  2,"Transmit failed\n"
+        DEBUGF  1,"Transmit failed\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         popf
         or      eax, -1
         ret
         cmp     [eax + desc.buffer1], 0                 ; empty descriptor?
         je      .end_tx
         mov     [eax + desc.buffer1], 0
-        DEBUGF  1,"Free buffer 0x%x\n", [eax + TX_RING_SIZE*sizeof.desc]
+        DEBUGF  1, "Free buffer 0x%x\n", [eax + TX_RING_SIZE*sizeof.desc]
-        invoke  KernelFree, [eax + TX_RING_SIZE*sizeof.desc]
+        invoke  NetFree, [eax + TX_RING_SIZE*sizeof.desc]
         ; advance to next descriptor
         pop     ecx esi eax
   .not_tx:
 ;----------------------------------
-; RX irq
 ; RX irq
         test    eax, CSR5_RI
         jz      .not_rx
         push    eax esi ecx
         mov     eax, [ebx + device.cur_rx]
         mov     edx, sizeof.desc
         mul     edx
         lea     edi, [ebx + device.rx_ring + eax]
-; Check current RX descriptor status
+        ; now check status
         mov     eax, [edi + desc.status]
         test    eax, DES0_OWN
         shr     ecx, RDES0_FL_SH
         and     ecx, RDES0_FL_MASK
         sub     ecx, 4                                  ; throw away the CRC
         DEBUGF  1,"got %u bytes\n", ecx
-; Push arguments for Eth_input (and some more...)
+; Push arguments for EthInput (and some more...)
         push    ebx
         push    .rx_loop                                ; return addr
+        mov     eax, dword[edi + RX_RING_SIZE*sizeof.desc]
+        push    eax
+        mov     [eax + NET_BUFF.length], ecx
-        push    ecx                                     ; packet size
+        mov     [eax + NET_BUFF.device], ebx
-        push    dword[edi + RX_RING_SIZE*sizeof.desc]   ; packet ptr
+        mov     [eax + NET_BUFF.offset], NET_BUFF.data
 ; update statistics
         inc     [ebx + device.packets_rx]
         add     dword[ebx + device.bytes_rx], ecx
         adc     dword[ebx + device.bytes_rx + 4], 0
 ; Allocate new descriptor
+        push    edi ebx
-        push    edi ebx
+        invoke  NetAlloc, 1514 + NET_BUFF.data          ; Allocate a buffer to put packet into
-        invoke  KernelAlloc, 1536                       ; Allocate a buffer to put packet into
+        pop     ebx edi
+        jz      .fail
-        pop     ebx edi
+        mov     [edi + RX_RING_SIZE*sizeof.desc], eax
-        mov     [edi + RX_RING_SIZE*sizeof.desc], eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     [edi + desc.buffer1], eax
         mov     [edi + desc.status], DES0_OWN           ; mark descriptor as being free
 ; Move to next rx desc
+        inc     [ebx + device.cur_rx]                   ; next descriptor
+        and     [ebx + device.cur_rx], RX_RING_SIZE-1
         inc     [ebx + device.cur_rx]                   ; next descriptor
-        and     [ebx + device.cur_rx], RX_RING_SIZE-1
+        jmp     [EthInput]
   .end_rx:

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/dec21x4x.asm – Rev 5363 → 5522