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

         ; - Remove device from local list (RTL8139_LIST)
         ; - call unregister function in kernel
         ; - Remove all allocated structures and buffers the card used
-        or      eax, -1
         or      eax, -1
-ret
+        ret
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                         ;;
 ;; Transmit                                ;;
-;;                                         ;;
-;; In: buffer pointer in [esp+4]           ;;
-;;     size of buffer in [esp+8]           ;;
+;;                                         ;;
-;;     pointer to device structure in ebx  ;;
+;; 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
         in      eax, dx
         test    eax, (1 shl BIT_OWN)
         jz      .wait_to_send
-  .send_packet:
-; get next descriptor
-        inc     [ebx + device.curr_tx_desc]
-        and     [ebx + device.curr_tx_desc], NUM_TX_DESC-1
-; Update stats
-        inc     [ebx + device.packets_tx]
-        mov     eax, [buffersize]
-        add     dword [ebx + device.bytes_tx], eax
-        adc     dword [ebx + device.bytes_tx+4], 0
   .send_packet:
 ; Set the buffer address
+        set_io  [ebx + device.io_addr], REG_TSAD0
-        set_io  [ebx + device.io_addr], REG_TSAD0
+        mov     [ebx + device.TX_DESC+ecx], esi
-        mov     eax, [bufferptr]
+        mov     eax, esi
-        mov     [ebx + device.TX_DESC+ecx], eax
+        add     eax, [eax + NET_BUFF.offset]
         invoke  GetPhysAddr
         out     dx, eax
 ; And the size of the buffer
         set_io  [ebx + device.io_addr], REG_TSD0
-        mov     eax, [buffersize]
+        mov     eax, [esi + NET_BUFF.length]
+        or      eax, (ERTXTH shl BIT_ERTXTH)    ; Early threshold
+        out     dx, eax
+; get next descriptor
+        inc     [ebx + device.curr_tx_desc]
+        and     [ebx + device.curr_tx_desc], NUM_TX_DESC-1
+; Update stats
+        inc     [ebx + device.packets_tx]
+        mov     ecx, [esi + NET_BUFF.length]
-        or      eax, (ERTXTH shl BIT_ERTXTH)    ; Early threshold
+        add     dword [ebx + device.bytes_tx], ecx
-        out     dx, eax
+        adc     dword [ebx + device.bytes_tx+4], 0
         DEBUGF  1, "Packet Sent!\n"
         jmp     .send_packet
   .fail:
         DEBUGF  2, "transmit failed!\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         popf
         or      eax, -1
         inc     [ebx + device.packets_rx]
         DEBUGF  1, "Received %u bytes\n", ecx
+        push    ebx eax ecx
-        push    ebx eax ecx
+        add     ecx, NET_BUFF.data
-        invoke  KernelAlloc, ecx                ; Allocate a buffer to put packet into
+        invoke  NetAlloc, ecx                   ; Allocate a buffer to put packet into
         pop     ecx
+        test    eax, eax                        ; Test if we allocated succesfully
+        jz      .abort
+        mov     [eax + NET_BUFF.length], ecx
-        test    eax, eax                        ; Test if we allocated succesfully
+        mov     [eax + NET_BUFF.device], ebx
-        jz      .abort
         mov     [eax + NET_BUFF.offset], NET_BUFF.data
         mov     edi, eax                        ; Where we will copy too
+        lea     edi, [eax + NET_BUFF.data]      ; Where we will copy too
         mov     esi, [esp]                      ; The buffer we will copy from
         add     esi, 4                          ; Dont copy CRC
-        push    dword .abort                    ; Kernel will return to this address after EthReceiver
+        push    .abort                          ; return addr for Eth_input
-        push    ecx edi                         ; Save buffer pointer and size, to pass to kernel
+        push    eax                             ; buffer ptr for Eth_input
   .nw:
         jz      .nd
         rep     movsd
   .nd:
-        jmp     [Eth_input]                     ; Send it to kernel
+        jmp     [EthInput]                      ; Send it to kernel
   .abort:
         pop     eax ebx
         DEBUGF  1, "TX: Transmit OK!\n"
   .no_tok:
         DEBUGF  1, "free transmit buffer 0x%x\n", [ebx + device.TX_DESC+ecx]:8
         push    ecx ebx
-        invoke  KernelFree, [ebx + device.TX_DESC+ecx]
+        invoke  NetFree, [ebx + device.TX_DESC+ecx]
         pop     ebx ecx
         mov     [ebx + device.TX_DESC+ecx], 0

Subversion Repositories Kolibri OS

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