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

 PHY_CC          = 0x88                  ; PHY status change configuration register
 PHY_ST          = 0x8A                  ; PHY status register
 MAC_SM          = 0xAC                  ; MAC status machine
 MAC_ID          = 0xBE                  ; Identifier register
-MAX_BUF_SIZE    = 0x600                 ; 1536
+MAX_BUF_SIZE    = 1514
 MBCR_DEFAULT    = 0x012A                ; MAC Bus Control Register
 unload:
         ; TODO: (in this particular order)
+        ;
         ; - Stop the device
         ; - Detach int handler
-        ; - Remove device from local list (RTL8139_LIST)
+        ; - 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
         ; Check the vendor ID on the PHY, if 0xFFFF assume none attached
         stdcall phy_read, [ebx + device.phy_addr], 2
         cmp     ax, 0xFFFF
         jne     @f
         DEBUGF  2, "Failed to detect an attached PHY!\n"
+  .err:
         mov     eax, -1
         ret
-     @@:
+  @@:
         ; Set MAC address
         call    init_mac_regs
         ; Initialize and alloc RX/TX buffers
+        call    init_txbufs
+        call    init_rxbufs
-        call    init_txbufs
+        test    eax, eax
-        call    init_rxbufs
+        jnz     .err
         ; Read the PHY ID
         mov     edx, eax
         mov     ecx, RX_RING_SIZE
-    .next_desc:
+  .next_desc:
-        mov     [esi + x_head.ndesc], edx
         mov     [esi + x_head.ndesc], edx
         push    esi ecx edx
-        invoke  KernelAlloc, MAX_BUF_SIZE
+        invoke  NetAlloc, MAX_BUF_SIZE+NET_BUFF.data
-        pop     edx ecx esi
+        pop     edx ecx esi
+        test    eax, eax
         jz      .out_of_mem
         mov     [esi + x_head.skb_ptr], eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     [esi + x_head.buf], eax
         mov     [esi + x_head.status], DSC_OWNER_MAC
-        add     edx, sizeof.x_head
-        add     esi, sizeof.x_head
+        add     edx, sizeof.x_head
         add     esi, sizeof.x_head
         dec     ecx
         jnz     .next_desc
 ; complete the ring by linking the last to the first
+        lea     eax, [ebx + device.rx_ring]
+        invoke  GetPhysAddr
+        mov     dword[ebx + device.rx_ring + sizeof.x_head*(RX_RING_SIZE-1) + x_head.ndesc], eax
+        xor     eax, eax
-        lea     eax, [ebx + device.rx_ring]
+        ret
         invoke  GetPhysAddr
 ;;                                         ;;
 ;; 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
         jnz     .wait_to_send
   .do_send:
+        DEBUGF  1,"Sending now\n"
-        DEBUGF  1,"Sending now\n"
+        mov     [edi + x_head.skb_ptr], esi
-        mov     eax, [bufferptr]
+        mov     eax, esi
-        mov     [edi + x_head.skb_ptr], eax
+        add     eax, [eax + NET_BUFF.offset]
         invoke  GetPhysAddr
         mov     [edi + x_head.buf], eax
-        mov     ecx, [buffersize]
+        mov     ecx, [esi + NET_BUFF.length]
         mov     [edi + x_head.len], cx
         mov     [edi + x_head.status], DSC_OWNER_MAC
         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
         popf
         xor     eax, eax
         ret
   .wait_to_send:
-        DEBUGF  1,"Waiting for TX buffer\n"
+  .wait_to_send:
         DEBUGF  1,"Waiting for TX buffer\n"
+        invoke  GetTimerTicks           ; returns in eax
-        invoke  GetTimerTicks           ; returns in eax
+        lea     edx, [eax + 100]
-        lea     edx, [eax + 100]
+  .l2:
+        mov     esi, [bufferptr]
-     .l2:
+        test    [edi + x_head.status], DSC_OWNER_MAC
-        test    [edi + x_head.status], DSC_OWNER_MAC
+        jz      .do_send
-        jz      .do_send
+        popf
+        mov     esi, 10
+        invoke  Sleep
-        mov     esi, 10
+        invoke  GetTimerTicks
-        invoke  Sleep
+        pushf
-        invoke  GetTimerTicks
+        cli
         cmp     edx, eax
         jb      .l2
         DEBUGF  2,"Send timeout\n"
   .fail:
         DEBUGF  2,"Send failed\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         ; Packet successfully received
         movzx   ecx, [edx + x_head.len]
         and     ecx, 0xFFF
         sub     ecx, 4                  ; Do not count the CRC
+        DEBUGF  1,"packet ptr=0x%x size=%u\n", [edx + x_head.skb_ptr], ecx
         ; Update stats
         add     dword[ebx + device.bytes_rx], ecx
         adc     dword[ebx + device.bytes_rx + 4], 0
-        inc     dword[ebx + device.packets_rx]
         inc     dword[ebx + device.packets_rx]
-        ; Push packet size and pointer, kernel will need it..
+        push    ebx
+        ; Push packet ptr and return addr for Eth_input
+        push    .more_RX
+        mov     eax, [edx + x_head.skb_ptr]
+        push    eax
+        mov     [eax + NET_BUFF.length], ecx
-        push    ebx
-        push    .more_RX
-        push    ecx
-        push    [edx + x_head.skb_ptr]
+        mov     [eax + NET_BUFF.device], ebx
-        DEBUGF  1,"packet ptr=0x%x\n", [edx + x_head.skb_ptr]
+        mov     [eax + NET_BUFF.offset], NET_BUFF.data
-        ; reset the RX descriptor
+        ; reset the RX descriptor (alloc new buffer)
         push    edx
-        invoke  KernelAlloc, MAX_BUF_SIZE
+        invoke  NetAlloc, MAX_BUF_SIZE+NET_BUFF.data
+        pop     edx
-        pop     edx
+        mov     [edx + x_head.skb_ptr], eax
-        mov     [edx + x_head.skb_ptr], eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         mov     [edx + x_head.buf], eax
         mov     [edx + x_head.status], DSC_OWNER_MAC
         ; Use next descriptor next time
         inc     [ebx + device.cur_rx]
-        and     [ebx + device.cur_rx], RX_RING_SIZE - 1
         and     [ebx + device.cur_rx], RX_RING_SIZE - 1
         ; At last, send packet to kernel
-        jmp     [Eth_input]
+        ; At last, send packet to kernel
         jmp     [EthInput]
         DEBUGF  1,"Freeing buffer 0x%x\n", [edi + x_head.skb_ptr]
         push    [edi + x_head.skb_ptr]
         mov     [edi + x_head.skb_ptr], 0
-        invoke  KernelFree
+        invoke  NetFree
         mov     cx, 3
         lea     edi, [ebx + device.mac]
         set_io  [ebx + device.io_addr], 0
         set_io  [ebx + device.io_addr], MID_0L
-     .mac:
+  .loop:
         in      ax, dx
         stosw
         inc     dx
         inc     dx
         dec     cx
-        jnz     .mac
+        jnz     .loop
         DEBUGF  1,"%x-%x-%x-%x-%x-%x\n",\

Subversion Repositories Kolibri OS

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