WebSVN – Kolibri OS – Diff – /drivers/ethernet/i8254x.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
 init_rx:
         lea     edi, [ebx + device.rx_desc]
         mov     ecx, RX_RING_SIZE
+  .loop:
-  .loop:
+        push    ecx
-        push    ecx edi
+        push    edi
-        invoke  KernelAlloc, MAX_PKT_SIZE
+        invoke  NetAlloc, MAX_PKT_SIZE+NET_BUFF.data
         test    eax, eax
         jz      .out_of_mem
         DEBUGF  1,"RX buffer: 0x%x\n", eax
         pop     edi
         mov     dword[edi + RX_RING_SIZE*sizeof.RDESC], eax
         push    edi
         invoke  GetPhysAddr
+        pop     edi
-        pop     edi
+        add     eax, NET_BUFF.data
         mov     [edi + RDESC.addr_l], eax
         mov     [edi + RDESC.addr_h], 0
         mov     [edi + RDESC.status_l], 0
         mov     [edi + RDESC.status_h], 0
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                         ;;
 ;; Transmit                                ;;
 ;;                                         ;;
+;; In:  ebx = pointer to device structure  ;;
-;; In: pointer to device structure in ebx  ;;
+;; Out: eax = 0 on success                 ;;
 ;;                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-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
 ; Program the descriptor (use legacy mode)
+        mov     edi, [ebx + device.cur_tx]
-; Program the descriptor (use legacy mode)
+        DEBUGF  1, "Using TX desc: %u\n", edi
-        mov     edi, [ebx + device.cur_tx]
+        shl     edi, 4                                          ; edi = edi * sizeof.TDESC
-        DEBUGF  1, "Using TX desc: %u\n", edi
+        lea     edi, [ebx + device.tx_desc + edi]
-        shl     edi, 4                                          ; edi = edi * sizeof.TDESC
+        mov     eax, esi
-        lea     edi, [ebx + device.tx_desc + edi]
+        mov     dword[edi + TX_RING_SIZE*sizeof.TDESC], eax     ; Store the data location (for driver)
-        mov     dword[edi + TX_RING_SIZE*sizeof.TDESC], eax     ; Store the data location (for driver)
+        add     eax, [eax + NET_BUFF.offset]
         invoke  GetPhysAddr
         mov     [edi + TDESC.addr_l], eax                       ; Data location (for hardware)
         mov     [ebx + device.cur_tx], eax
         mov     dword[edi + REG_TDT], eax                        ; TDT - Transmit Descriptor Tail
 ; 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
   .fail:
         call    clean_tx
         DEBUGF  2,"Send failed\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         popf
         or      eax, -1
         push    eax ebx
         push    .retaddr
         movzx   ecx, word[esi + 8]                      ; Get the packet length
+        DEBUGF  1,"got %u bytes\n", ecx
-        DEBUGF  1,"got %u bytes\n", ecx
+        mov     eax, [esi + RX_RING_SIZE*sizeof.RDESC]  ; Get packet pointer
+        push    eax
+        mov     [eax + NET_BUFF.length], ecx
-        push    ecx
+        mov     [eax + NET_BUFF.device], ebx
-        push    dword[esi + RX_RING_SIZE*sizeof.RDESC]  ; Get packet pointer
+        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]
 ; Allocate new descriptor
         push    esi
-        invoke  KernelAlloc, MAX_PKT_SIZE
+        invoke  NetAlloc, MAX_PKT_SIZE+NET_BUFF.data
         pop     esi
         test    eax, eax
+        jz      .out_of_mem
-        jz      .out_of_mem
+        mov     dword[esi + RX_RING_SIZE*sizeof.RDESC], eax
-        mov     dword[esi + RX_RING_SIZE*sizeof.RDESC], eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     [esi + RDESC.addr_l], eax
 ; Move to next rx desc
         inc     [ebx + device.cur_rx]
         and     [ebx + device.cur_rx], RX_RING_SIZE-1
-        jmp     [Eth_input]
+        jmp     [EthInput]
   .out_of_mem:
         DEBUGF  2,"Out of memory!\n"
 ; Move to next rx desc
         inc     [ebx + device.cur_rx]
         and     [ebx + device.cur_rx], RX_RING_SIZE-1
         DEBUGF  1,"Cleaning up TX desc: 0x%x\n", edi
         push    ebx
         push    dword[edi + TX_RING_SIZE*sizeof.TDESC]
         mov     dword[edi + TX_RING_SIZE*sizeof.TDESC], 0
-        invoke  KernelFree
+        invoke  NetFree
         pop     ebx
         inc     [ebx + device.last_tx]

Subversion Repositories Kolibri OS

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