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

         ; - Remove device from local list (device_list)
         ; - call unregister function in kernel
         ; - Remove all allocated structures and buffers the card used
-        or      eax, -1
+        or      eax, -1
-ret
+        ret
         xor     eax, eax
         inc     eax
         out     dx, eax
+        call    init_ring
+        test    eax, eax
-        call    init_ring
+        jnz     .err
 ; Initialize other registers.
 ; Configure the PCI bus bursts and FIFO thresholds.
         mov     [ebx + device.bcrvalue], 0x10         ; little-endian, 8 burst length
         mov     [ebx + device.crvalue], 0xa00         ; 128 burst length
         cmp     [ebx + device.dev_id], 0x891
         jne     @f
         or      [ebx + device.bcrvalue], 0x200       ; set PROG bit
         or      [ebx + device.crvalue], 0x02000000   ; set enhanced bit
-       @@:
+  @@:
         mov     [ebx + device.mtu], 1514
         xor     eax, eax
+        ret
+  .err:
+        DEBUGF  2, "Error!\n"
+        or      eax, -1
         ret
 align 4
 init_ring:
-        DEBUGF  1,"initializing rx and tx ring\n"
+        DEBUGF  1, "initializing rx and tx ring\n"
 ; Initialize all Rx descriptors
         lea     esi, [ebx + device.rx_desc]
         mov     [ebx + device.cur_rx], esi
         mov     ecx, NUM_RX_DESC
   .rx_desc_loop:
         mov     [esi + descriptor.status], RXOWN
-        mov     [esi + descriptor.control], 1536 shl RBSShift
+        mov     [esi + descriptor.control], 1514 shl RBSShift
+        lea     eax, [esi + sizeof.descriptor]
+        mov     [esi + descriptor.next_desc_logical], eax
-        lea     eax, [esi + sizeof.descriptor]
+        push    ecx esi
-        mov     [esi + descriptor.next_desc_logical], eax
+        invoke  GetPhysAddr
+        mov     [esi + descriptor.next_desc], eax
         push    ecx esi
-        invoke  GetPhysAddr
+        invoke  NetAlloc, 1514+NET_BUFF.data
-        mov     [esi + descriptor.next_desc], eax
+        pop     esi ecx
         test    eax, eax
         push    esi
         invoke  GetPhysAddr
         pop     esi
         mov     [esi - sizeof.descriptor + descriptor.next_desc], eax
-        set_io  [ebx + device.io_addr],   0
+        set_io  [ebx + device.io_addr], 0
-        set_io  [ebx + device.io_addr],   TXLBA
+        set_io  [ebx + device.io_addr], TXLBA
+        out     dx, eax
+        xor     eax, eax
+        ret
-        out     dx, eax
+  .out_of_mem:
         or      eax, -1
         ret
 ;;     size of buffer in [esp+8]           ;;
 ;;     pointer to device structure in ebx  ;;
 ;;                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-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
-        cmp     [buffersize], 60
+        ja      .fail
-        jb      .fail
+        cmp     [esi + NET_BUFF.length], 60
         jb      .fail
         mov     esi, [ebx + device.cur_tx]
         mov     esi, [ebx + device.cur_tx]
         test    [esi + descriptor.status], TXOWN
+        jnz     .fail
         jnz     .fail
         push    [esi + descriptor.next_desc_logical]
-        push    [esi + descriptor.next_desc_logical]
+        pop     [ebx + device.cur_tx]
-        pop     [ebx + device.cur_tx]
+        mov     eax, [bufferptr]
         mov     [esi + descriptor.skbuff], eax
-        mov     eax, [bufferptr]
+        add     eax, [eax + NET_BUFF.offset]
-        mov     [esi + descriptor.skbuff], eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        mov     [esi + descriptor.buffer], eax
         mov     [esi + descriptor.buffer], eax
         mov     eax, [bufferptr]
-        mov     eax, [buffersize]
+        mov     eax, [eax + NET_BUFF.length]
         mov     ecx, eax
         shl     eax, PKTSShift               ; packet size
+        shl     ecx, TBSShift
-        shl     ecx, TBSShift
+        or      eax, ecx
-        or      eax, ecx
+        or      eax, TXIC + TXLD + TXFD + CRCEnable + PADEnable
-        or      eax, TXIC + TXLD + TXFD + CRCEnable + PADEnable
+        mov     [esi + descriptor.control], eax
-        mov     [esi + descriptor.control], eax
+        mov     [esi + descriptor.status], TXOWN
         mov     [esi + descriptor.status], TXOWN
         xor     eax, eax
         ret
   .fail:
         DEBUGF  2,"Transmit failed\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         popf
         or      eax, -1
         ret
         push    .rx_complete
         mov     ecx, [esi + descriptor.status]
         shr     ecx, FLNGShift
-        sub     ecx, 4                  ; we dont need CRC
-        push    ecx
+        sub     ecx, 4                  ; we dont need CRC
+        DEBUGF  1,"Received %u bytes\n", ecx
+        mov     eax, [esi + descriptor.skbuff]
+        push    eax
+        mov     [eax + NET_BUFF.length], ecx
+        mov     [eax + NET_BUFF.device], ebx
-        DEBUGF  1,"Received %u bytes\n", ecx
+        mov     [eax + NET_BUFF.offset], NET_BUFF.data
 ; Update stats
         add     dword[ebx + device.bytes_rx], ecx
-        adc     dword[ebx + device.bytes_rx + 4], 0
-        inc     [ebx + device.packets_rx]
+        adc     dword[ebx + device.bytes_rx + 4], 0
         inc     [ebx + device.packets_rx]
         push    [esi + descriptor.skbuff]
-        jmp     [Eth_input]
+        jmp     [EthInput]
   .rx_complete:
         pop     ebx
         mov     esi, [ebx + device.cur_rx]
+        mov     [esi + descriptor.control], 1514 shl RBSShift
+        push    esi
-        mov     [esi + descriptor.control], 1536 shl RBSShift
+        invoke  NetAlloc, 1514+NET_BUFF.data
-        push    esi
+        pop     esi
+;        test    eax, eax
-        invoke  KernelAlloc, 1536
+;        jz      .rx_loop
-        pop     esi
+        mov     [esi + descriptor.skbuff], eax
-        mov     [esi + descriptor.skbuff], eax
+        invoke  GetPhysAddr
-        invoke  GetPgAddr
+        add     eax, NET_BUFF.data
         mov     eax, [esi + descriptor.skbuff]
         test    eax, eax
         je      .skip_this_one
         mov     [esi + descriptor.skbuff], 0
         DEBUGF  1,"freeing buffer: 0x%x\n", eax
-        invoke  KernelFree, eax
+        invoke  NetFree, eax
   .skip_this_one:
         mov     esi, [esi + descriptor.next_desc_logical]
         loop    .tx_loop
         pop     ax
   .no_tx:

Subversion Repositories Kolibri OS

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