WebSVN – Kolibri OS – Diff – /drivers/ethernet/3c59x.asm

         RxStation               = 1
         RxMulticast             = 2
         RxBroadcast             = 4
         RxProm                  = 8
-; RX/TX buffers sizes
-        MAX_ETH_PKT_SIZE        = 1536          ; max packet size
-        MAX_ETH_FRAME_SIZE      = 1520          ; size of ethernet frame + bytes alignment
+        MAX_ETH_FRAME_SIZE      = 1514
         out     dx, ax
         call    set_active_port
+        call    create_rx_ring
+        test    eax, eax
         jnz     .err
         call    create_rx_ring
         call    rx_reset
         call    tx_reset
         xor     eax, eax
 ; clear packet/byte counters
         lea     edi, [ebx + device.bytes_tx]
         mov     ecx, 6
+        rep     stosd
-        rep     stosd
+        xor     eax, eax
         ret
-        ret
+  .err:
 ; Set the mtu, kernel will be able to send now
         mov     [ebx + device.mtu], 1514
 ; Set link state to unknown
+        mov     [ebx + device.state], ETH_LINK_UNKNOWN
-        mov     [ebx + device.state], ETH_LINK_UNKNOWN
+        xor     eax, eax
         mov     ecx, NUM_RX_DESC
   .loop:
         mov     [edx + rx_desc.next_ptr], edi
         push    ecx edx
-        invoke  KernelAlloc, MAX_ETH_FRAME_SIZE
+        invoke  NetAlloc, MAX_ETH_FRAME_SIZE+NET_BUFF.data
+        pop     edx ecx
+        test    eax, eax
-        pop     edx ecx
+        jz      .out_of_mem
         mov     [esi + rx_desc.realaddr], eax
+        invoke  GetPhysAddr
-        invoke  GetPgAddr
+        add     eax, NET_BUFF.data
         mov     [esi + rx_desc.frag_addr], eax
         and     [esi + rx_desc.pkt_status], 0
         mov     [esi + rx_desc.frag_len], MAX_ETH_FRAME_SIZE or (1 shl 31)
         add     esi, sizeof.rx_desc
         add     edi, sizeof.rx_desc
         dec     ecx
         jnz     .loop
+        xor     eax, eax
+        ret
+  .out_of_mem:
         or      eax, -1
         ret
 try_link_detect:
         DEBUGF  1,"Trying to detect link\n"
 ; create self-directed packet
-        invoke  KernelAlloc, 20 ; create a buffer for the self-directed packet
+        invoke  NetAlloc, 20+NET_BUFF.data     ; create a buffer for the self-directed packet
-        test    eax, eax
-        jz      .fail
+        test    eax, eax
-        pushd   20              ; Packet parameters for device.transmit
+        jz      .fail
-        push    eax             ;
+        push    eax
         mov     [eax + NET_BUFF.length], 20
         mov     edi, eax
         lea     edi, [eax + NET_BUFF.data]
         lea     esi, [ebx + device.mac]
   .finish:
         test    al, al
         jz      @f
         or      byte [ebx + device.internal_link+1], 100b
        @@:
+        xor     eax, eax
         ret
   .fail:
+        DEBUGF  1,"No link detected!\n"
-        DEBUGF  1,"No link detected!\n"
+        or      eax, -1
         ret
         mov     eax, [esp]
         call    mdio_write      ; returns with window #4
 ; wait for reset to complete
         mov     esi, 2000
-        invoke  Sleep      ; 2s
+        invoke  Sleep           ; 2s FIXME
         mov     eax, [esp]
         call    mdio_read       ; returns with window #4
         test    ah, 0x80
         jnz     .fail1
 ; issue RxEnable and TxEnable
         call    rx_reset
         call    tx_reset
 ; create self-directed packet
-        invoke  KernelAlloc, 20 ; create a buffer for the self-directed packet
+        invoke  NetAlloc, 20 + NET_BUFF.data   ; create a buffer for the self-directed packet
         test    eax, eax
+        jz      .fail
-        jz      .fail
+        push    eax
-        pushd   20              ; Packet parameters for device.transmit
+        mov     [eax + NET_BUFF.length], 20
-        push    eax             ;
+;        mov     [eax + NET_BUFF.device], ebx
-        mov     edi, eax
+        lea     edi, [eax + NET_BUFF.data]
         lea     esi, [ebx + device.mac]
         movsw
 ; download self-directed packet
         call    [ebx + device.transmit]
 ; wait for 2s
-        mov     esi, 2000
+        mov     esi, 2000       ; FIXME
         invoke  Sleep
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                         ;;
 ;; Transmit (vortex)                       ;;
 ;;                                         ;;
 ;; In: buffer pointer in [esp+4]           ;;
-;;     size of buffer in [esp+8]           ;;
 ;;     pointer to device structure in ebx  ;;
 ;;                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-proc vortex_transmit stdcall bufferptr, buffersize
+proc vortex_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
         call    check_tx_status
 ; switch to register window 7
-; switch to register window 7
+        set_io  [ebx + device.io_addr], 0
-        set_io  [ebx + device.io_addr], 0
+        set_io  [ebx + device.io_addr], REG_COMMAND
-        set_io  [ebx + device.io_addr], REG_COMMAND
+        mov     ax, SELECT_REGISTER_WINDOW+7
-        mov     ax, SELECT_REGISTER_WINDOW+7
+        out     dx, ax
-        out     dx, ax
+; check for master operation in progress
-; check for master operation in progress
+        set_io  [ebx + device.io_addr], REG_MASTER_STATUS
-        set_io  [ebx + device.io_addr], REG_MASTER_STATUS
+        in      ax, dx
+        test    ah, 0x80
-        in      ax, dx
+        jnz     .fail ; no DMA for sending
         test    ah, 0x80
+; program frame address to be sent
-        jnz     .fail ; no DMA for sending
+        set_io  [ebx + device.io_addr], REG_MASTER_ADDRESS
-; program frame address to be sent
+        mov     eax, esi
-        set_io  [ebx + device.io_addr], REG_MASTER_ADDRESS
+        add     eax, [eax + NET_BUFF.offset]
-        mov     eax, [bufferptr]
+        invoke  GetPhysAddr
+        out     dx, eax
         invoke  GetPhysAddr
-        out     dx, eax
+; program frame length
-; program frame length
+        set_io  [ebx + device.io_addr], REG_MASTER_LEN
-        set_io  [ebx + device.io_addr], REG_MASTER_LEN
+        mov     eax, [esi + NET_BUFF.length]
-        mov     eax, [buffersize]
+        out     dx, ax
         xor     eax, eax
         ret
   .fail:
         DEBUGF  2,"Send failed\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         popf
         or      eax, -1
         ret
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                         ;;
 ;; Transmit (boomerang)                    ;;
 ;;                                         ;;
 ;; In: buffer pointer in [esp+4]           ;;
-;;     size of buffer in [esp+8]           ;;
 ;;     pointer to device structure in ebx  ;;
 ;;                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-proc boomerang_transmit stdcall bufferptr, buffersize
+proc boomerang_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
         call    check_tx_status                         ; Reset TX engine if needed
 ; calculate descriptor address
-        mov     esi, [ebx + device.curr_tx]
+        mov     edi, [ebx + device.curr_tx]
-        DEBUGF  1,"Previous TX desc: %x\n", esi
+        DEBUGF  1,"Previous TX desc: %x\n", edi
-        add     esi, sizeof.tx_desc
+        add     edi, sizeof.tx_desc
         lea     ecx, [ebx + device.tx_desc_buffer + (NUM_TX_DESC)*sizeof.tx_desc]
-        cmp     esi, ecx
+        cmp     edi, ecx
 ;        cmp     eax, esi
 ;        jz      .finish
 ; update statistics
         inc     [ebx + device.packets_tx]
-        mov     ecx, [buffersize]
+        mov     ecx, [esi + NET_BUFF.length]
         add     dword [ebx + device.bytes_tx], ecx
         adc     dword [ebx + device.bytes_tx + 4], 0
 ; program DPD
-        and     [esi + tx_desc.next_ptr], 0
+        and     [edi + tx_desc.next_ptr], 0
+        mov     eax, [bufferptr]
-        mov     eax, [bufferptr]
+        mov     [edi + tx_desc.realaddr], eax
-        mov     [esi + tx_desc.realaddr], eax
+        add     eax, [eax + NET_BUFF.offset]
         invoke  GetPhysAddr
-        mov     [esi + tx_desc.frag_addr], eax
+        mov     [edi + tx_desc.frag_addr], eax
-        mov     ecx, [buffersize]
+;;;        mov     ecx, [buffersize]
         or      ecx, 0x80000000         ; last fragment flag
-        mov     [esi + tx_desc.frag_len], ecx
+        mov     [edi + tx_desc.frag_len], ecx
-        mov     ecx, [buffersize]       ; packet size
+;;;        mov     ecx, [buffersize]       ; packet size
         or      ecx, 0x80008000         ; set OWN bit + transmission complete notification flag
 ;        test    byte [ebx + device.has_hwcksm], 0xff
 ;        jz      @f
 ;        or      ecx, (1 shl 26)         ; set AddTcpChecksum
 ;@@:
-        mov     [esi + tx_desc.frame_start_hdr], ecx
+        mov     [edi + tx_desc.frame_start_hdr], ecx
-        DEBUGF  1,"TX desc: lin=%x phys=%x len=%x start hdr=%x\n", [esi+tx_desc.realaddr]:8, [esi+tx_desc.frag_addr]:8, [esi+tx_desc.frag_len]:8, [esi+tx_desc.frame_start_hdr]:8
+        DEBUGF  1,"TX desc: lin=%x phys=%x len=%x start hdr=%x\n", [edi+tx_desc.realaddr]:8, [edi+tx_desc.frag_addr]:8, [edi+tx_desc.frag_len]:8, [edi+tx_desc.frame_start_hdr]:8
 ; calculate physical address of tx descriptor
-        mov     eax, esi
+        mov     eax, edi
         set_io  [ebx + device.io_addr], REG_COMMAND
         mov     ax, ((110b shl 11)+3)
         out     dx, ax
   .finish:
-        mov     [ebx + device.curr_tx], esi
+        mov     [ebx + device.curr_tx], edi
         popf
         xor     eax, eax
         ret
   .fail:
         DEBUGF  2,"Send failed\n"
-        invoke  KernelFree, [bufferptr]
+        invoke  NetFree, [bufferptr]
         popf
         or      eax, -1
         out     dx, ax
         jmp     .rx_status_loop
   .check_length:
         and     eax, 0x1fff
-        cmp     eax, MAX_ETH_PKT_SIZE
+        cmp     eax, MAX_ETH_FRAME_SIZE
         ja      .discard_frame ; frame is too long discard it
   .check_dma:
         jnz     .finish
   .read_frame:
 ; program buffer address to read in
         push    ecx
-        invoke  KernelAlloc, MAX_ETH_FRAME_SIZE
+        invoke  NetAlloc, MAX_ETH_FRAME_SIZE + NET_BUFF.data
         pop     ecx
         test    eax, eax
         jz      .finish
         push    .discard_frame
+        push    .discard_frame
+        push    eax
+        mov     [eax + NET_BUFF.length], ecx
-        push    ecx
+        mov     [eax + NET_BUFF.device], ebx
+        mov     [eax + NET_BUFF.offset], NET_BUFF.data
-        push    eax
+        invoke  GetPhysAddr
-;        zero_to_dma eax
+        add     eax, NET_BUFF.data
         set_io  [ebx + device.io_addr], REG_MASTER_ADDRESS
         out     dx, eax
         in      ax, dx
         test    ah, 0x80
         jnz     .dma_loop
 ; registrate the received packet to kernel
-        jmp     Eth_input
+        jmp     [EthInput]
 ; discard the top frame received
   .discard_frame:
 ;  .copy_packet:
         DEBUGF  1, "Received %u bytes in buffer %x\n", ecx, [esi + rx_desc.realaddr]:8
+        push    dword .loop ;.finish
+        mov     eax, [esi + rx_desc.realaddr]
-        push    dword .loop ;.finish
+        push    eax
+        mov     [eax + NET_BUFF.length], ecx
-        push    ecx
+        mov     [eax + NET_BUFF.device], ebx
-        push    [esi + rx_desc.realaddr]
+        mov     [eax + NET_BUFF.offset], NET_BUFF.data
 ; update statistics
         inc     [ebx + device.packets_rx]
         add     dword [ebx + device.bytes_rx], ecx
         adc     dword [ebx + device.bytes_rx + 4], 0
+; update rx descriptor (Alloc new buffer for next packet)
-; update rx descriptor (Alloc new buffer for next packet)
+        invoke  NetAlloc, MAX_ETH_FRAME_SIZE + NET_BUFF.data
-        invoke  KernelAlloc, MAX_ETH_FRAME_SIZE
+        mov     [esi + rx_desc.realaddr], eax
-        mov     [esi + rx_desc.realaddr], eax
+        invoke  GetPhysAddr
-        invoke  GetPhysAddr
+        add     eax, NET_BUFF.data
         lea     esi, [ebx + device.rx_desc_buffer]
        @@:
         mov     [ebx + device.curr_rx], esi
         DEBUGF  1, "Next RX desc: %x\n", esi
-        jmp     [Eth_input]
+        jmp     [EthInput]
   .loop:
         test    [esi+tx_desc.frame_start_hdr], 1 shl 31
         jz      .maybenext
         and     [esi+tx_desc.frame_start_hdr], 0
         push    ecx
-        invoke  KernelFree, [esi+tx_desc.realaddr]
+        invoke  NetFree, [esi+tx_desc.realaddr]
         pop     ecx
   .maybenext:

Subversion Repositories Kolibri OS

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