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

 ; If an error occured, remove all allocated data and exit (returning -1 in eax)
-  .destroy:
+  .destroy:
         ; todo: reset device into virgin state
         add     eax, NET_BUFF.data
         dec     [devices]
   .err:
         ; - 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
         lea     edi, [ebx + device.phys_addr]
         movsd
         movsw
+        call    init_ring
+        test    eax, eax
-        call    init_ring
+        jnz     .fail
         mov     edx, [ebx + device.io_addr]   ; init ring destroys edx
         call    check_media
+        DEBUGF  1,"reset complete\n"
-        DEBUGF  1,"reset complete\n"
+        xor     eax, eax
-        xor     eax, eax
+  .fail:
         ret
         invoke  GetPhysAddr
         mov     [ebx + device.rx_ring_phys], eax
         mov     ecx, RX_RING_SIZE
   .rx_init:
         push    ecx
-        invoke  KernelAlloc, PKT_BUF_SZ
+        invoke  NetAlloc, PKT_BUF_SZ+NET_BUFF.data
         pop     ecx
+        test    eax, eax
+        jz      .out_of_mem
         mov     [edi + descriptor.virtual], eax
         invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     [edi + descriptor.base], eax
         mov     [edi + descriptor.length], - PKT_BUF_SZ
         mov     [edi + descriptor.status], RXSTAT_OWN
         mov     dword[edi + descriptor.msg_length], 0    ; also clears misc field
         add     edi, sizeof.descriptor
         mov     [ebx + device.cur_tx], 0
         mov     [ebx + device.last_tx], 0
+        mov     [ebx + device.cur_rx], 0
+        xor     eax, eax
+        ret
+  .out_of_mem:
+        DEBUGF  2,"Out of memory!\n"
         mov     [ebx + device.cur_rx], 0
 ;;                                         ;;
 ;; In: 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
+        cmp     [esi + NET_BUFF.length], 60
         jb      .fail
 ; check descriptor
         lea     edi, [ebx + device.tx_ring]
-        movzx   eax, [ebx + device.cur_tx]
+        movzx   ecx, [ebx + device.cur_tx]
+        shl     ecx, 4
-        shl     eax, 4
+        add     edi, ecx
-        add     edi, eax
         test    [edi + descriptor.status], TXCTL_OWN
-        test    [edi + descriptor.status], TXCTL_OWN
+        jnz     .fail
-        jnz     .fail
+; descriptor is free, use it
-; descriptor is free, use it
+        mov     [edi + descriptor.virtual], esi
-        mov     eax, [bufferptr]
+        mov     eax, esi
-        mov     [edi + descriptor.virtual], eax
+        add     eax, [eax + NET_BUFF.offset]
         invoke  GetPhysAddr
         mov     [edi + descriptor.base], eax
         inc     [ebx + device.cur_tx]
         and     [ebx + device.cur_tx], TX_RING_SIZE - 1
 ; Update stats
         inc     [ebx + device.packets_tx]
-        mov     eax, [buffersize]
+        mov     eax, [esi + NET_BUFF.length]
         add     dword[ebx + device.bytes_tx], eax
         adc     dword[ebx + device.bytes_tx + 4], 0
   .finish:
         popf
         xor     eax, eax
         ret
   .fail:
         DEBUGF  2, "Send failed\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         popf
 ; Set pointers for ETH_input
         push    ebx
+        push    .rx_loop                                ; return address
+        mov     eax, [edi + descriptor.virtual]
+        push    eax                                     ; packet address
-        push    .rx_loop                                ; return address
+        mov     [eax + NET_BUFF.length], ecx
-        push    ecx                                     ; packet size
+        mov     [eax + NET_BUFF.device], ebx
-        push    [edi + descriptor.virtual]              ; packet address
+        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]
-        inc     [ebx + device.packets_rx]
+; now allocate a new buffer
         invoke  NetAlloc, PKT_BUF_SZ+NET_BUFF.data      ; Allocate a buffer for the next packet
+        test    eax, eax
-; now allocate a new buffer
+        jz      .out_of_mem
-        invoke  KernelAlloc, PKT_BUF_SZ                 ; Allocate a buffer for the next packet
+        mov     [edi + descriptor.virtual], eax         ; set virtual address
-        mov     [edi + descriptor.virtual], eax         ; set virtual address
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     [edi + descriptor.base], eax            ; and physical address
+        mov     [edi + descriptor.status], RXSTAT_OWN   ; give it back to PCnet controller
+        inc     [ebx + device.cur_rx]                   ; set next receive descriptor
+        and     [ebx + device.cur_rx], RX_RING_SIZE - 1
+        jmp     [EthInput]
+  .out_of_mem:
-        mov     [edi + descriptor.status], RXSTAT_OWN   ; give it back to PCnet controller
+        DEBUGF  2,"Out of memory!\n"
         inc     [ebx + device.cur_rx]                   ; set next receive descriptor
         mov     [edi + descriptor.virtual], 0
         DEBUGF  1,"Removing packet %x from memory\n", eax
-        invoke  KernelFree, eax
+        invoke  NetFree, eax

Subversion Repositories Kolibri OS

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