WebSVN – Kolibri OS – Diff – /kernel/trunk/network/eth_drv/drivers/pcnet32.inc

 ;;                                                                  ;;
 ;;  PCNET32.INC                                                     ;;
 ;;                                                                  ;;
 ;;  Ethernet driver for Menuet OS                                   ;;
 ;;                                                                  ;;
-;;  Version 1.0  31 July 2004                                       ;;
+;;  - Version 1.0  31 July 2004:                                    ;;
+;;      Initial release                                             ;;
+;;                                                                  ;;
+;;  - Version 1.01 29 March 2008:                                   ;;
+;;     Adapted to work with kolibrios flat kernel                   ;;
+;;     Debug info is updated, and now uses DEBUGF macro             ;;
+;;     by hidnplayr@kolibrios.org                                   ;;
 ;;                                                                  ;;
 ;;  This driver is based on the PCNet32 driver from                 ;;
 ;;  the etherboot 5.0.6 project. The copyright statement is         ;;
 ;;                                                                  ;;
 ;;          GNU GENERAL PUBLIC LICENSE                              ;;
 ;;                                                                  ;;
 ;;  See file COPYING for details                                    ;;
 ;;                                                                  ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 684 $
-;macro PutStr X
-;{
-; local .__xyz1
-; local .__xyz2
-; push esi
-; mov esi,.__xyz1
-; call sys_msg_board_str
-; push ebx
-; mov ebx,1
-; call delay_hs
-; pop ebx
-; jmp .__xyz2
-;.__xyz1:
-; db X
-; db 13,10,0
-;.__xyz2:
+$Revision: 781 $
 ; pop esi
 ;}
 PCNET32_PORT_AUI      equ 0x00
 PCNET32_PORT_10BT     equ 0x01
 PCNET32_PORT_GPSI     equ 0x02
 PCNET32_PORT_MII      equ 0x03
 PCNET32_PORT_PORTSEL  equ 0x03
 PCNET32_PORT_ASEL     equ 0x04
+PCNET32_PORT_100      equ 0x40
-PCNET32_PORT_100      equ 0x40
+PCNET32_PORT_FD       equ 0x80
-PCNET32_PORT_FD       equ 0x80
+PCNET32_DMA_MASK      equ 0xffffffff
-PCNET32_DMA_MASK      equ 0xffffffff
+PCNET32_LOG_TX_BUFFERS	equ 1
-PCNET32_LOG_TX_BUFFERS  equ 1
+PCNET32_LOG_RX_BUFFERS	equ 2
 PCNET32_LOG_RX_BUFFERS  equ 2
-PCNET32_TX_RING_SIZE            equ (1 shl PCNET32_LOG_TX_BUFFERS)
+PCNET32_TX_RING_SIZE		equ (1 shl PCNET32_LOG_TX_BUFFERS)
-PCNET32_TX_RING_MOD_MASK        equ (PCNET32_TX_RING_SIZE-1)
+PCNET32_TX_RING_MOD_MASK	equ (PCNET32_TX_RING_SIZE-1)
-PCNET32_TX_RING_LEN_BITS        equ 0
+PCNET32_TX_RING_LEN_BITS	equ 0
-PCNET32_RX_RING_SIZE            equ (1 shl PCNET32_LOG_RX_BUFFERS)
+PCNET32_RX_RING_SIZE		equ (1 shl PCNET32_LOG_RX_BUFFERS)
-PCNET32_RX_RING_MOD_MASK        equ (PCNET32_RX_RING_SIZE-1)
+PCNET32_RX_RING_MOD_MASK	equ (PCNET32_RX_RING_SIZE-1)
+PCNET32_RX_RING_LEN_BITS	equ (PCNET32_LOG_RX_BUFFERS shl 4)
-PCNET32_RX_RING_LEN_BITS        equ (PCNET32_LOG_RX_BUFFERS shl 4)
+PCNET32_PKT_BUF_SZ		equ 1544
-PCNET32_PKT_BUF_SZ              equ 1544
+PCNET32_PKT_BUF_SZ_NEG		equ 0xf9f8
 PCNET32_PKT_BUF_SZ_NEG          equ 0xf9f8
 pcnet32_txb equ (eth_data_start)
+pcnet32_rxb equ ((pcnet32_txb+(PCNET32_PKT_BUF_SZ*PCNET32_TX_RING_SIZE)+0xf) and 0xfffffff0)
-pcnet32_rxb equ ((pcnet32_txb+(PCNET32_PKT_BUF_SZ*PCNET32_TX_RING_SIZE)+0xf) and 0xfffffff0)
+pcnet32_tx_ring equ ((pcnet32_rxb+(PCNET32_PKT_BUF_SZ*PCNET32_RX_RING_SIZE)+0xf) and 0xfffffff0)
-pcnet32_tx_ring equ ((pcnet32_rxb+(PCNET32_PKT_BUF_SZ*PCNET32_RX_RING_SIZE)+0xf) and 0xfffffff0)
+pcnet32_rx_ring equ ((pcnet32_tx_ring+(16*PCNET32_TX_RING_SIZE)+0xf) and 0xfffffff0)
 pcnet32_rx_ring equ ((pcnet32_tx_ring+(16*PCNET32_TX_RING_SIZE)+0xf) and 0xfffffff0)
 virtual at ((pcnet32_rx_ring+(16*PCNET32_RX_RING_SIZE)+0xf) and 0xfffffff0)
 pcnet32_private:
-.ltint                  db ?
+.ltint			db ?
-.dxsuflo                db ?
+.dxsuflo		db ?
-.fset                   db ?
+.fset			db ?
-.fdx                    db ?
+.fdx			db ?
 end virtual
 virtual at 0
 pcnet32_rx_head:
-.base           dd ?
+.base		dd ?
-.buf_length     dw ?
+.buf_length	dw ?
-.status         dw ?
+.status 	dw ?
-.msg_length     dd ?
+.msg_length	dd ?
-.reserved       dd ?
+.reserved	dd ?
 end virtual
 virtual at 0
 pcnet32_tx_head:
-.base           dd ?
+.base		dd ?
-.length         dw ?
+.length 	dw ?
-.status         dw ?
+.status 	dw ?
     dd pcnet32_dwio_read_rap
     dd pcnet32_dwio_write_rap
     dd pcnet32_dwio_reset
 endg
 pcnet32_init_ring:
     mov [pcnet32_private.tx_full],0
     mov [pcnet32_private.cur_rx],0
     mov [pcnet32_private.cur_tx],0
     mov [pcnet32_private.dirty_rx],0
     mov [pcnet32_private.dirty_tx],0
     mov edi,pcnet32_rx_ring
     mov ecx,PCNET32_RX_RING_SIZE
+    mov ebx,pcnet32_rxb
-    mov ebx,pcnet32_rxb
+    sub ebx,OS_BASE
 .rx_init:
     mov [edi+pcnet32_rx_head.base],ebx
     mov [edi+pcnet32_rx_head.buf_length],word PCNET32_PKT_BUF_SZ_NEG
     mov [edi+pcnet32_rx_head.status],word 0x8000
     mov esi,node_addr
     mov edi,pcnet32_private.phys_addr
     cld
     movsd
     movsw
+    mov eax,pcnet32_rx_ring
+    sub eax,OS_BASE
-    mov dword [pcnet32_private.rx_ring],pcnet32_rx_ring
+    mov dword [pcnet32_private.rx_ring],eax
+    mov eax,pcnet32_tx_ring
+    sub eax,OS_BASE
-    mov dword [pcnet32_private.tx_ring],pcnet32_tx_ring
+    mov dword [pcnet32_private.tx_ring],eax
     ret
 pcnet32_reset:
     ; Reset PCNET32
     mov ebp,[io_addr]
     call dword [pcnet32_access.reset]
     ; set 32bit mode
     jmp .L9
 .L6:
     test [pcnet32_private.options],PCNET32_PORT_ASEL
     jz .L9
     mov ebx,32
-;    PutStr "ASEL, enable auto-negotiation"
+;    DEBUGF 1," K : ASEL, enable auto-negotiation\n"
     call dword [pcnet32_access.read_bcr]
     and eax,not 0x98
     or eax,0x20
     call dword [pcnet32_access.write_bcr]
 .L9:
     mov [pcnet32_private.filter],dword 0xffffffff
     mov [pcnet32_private.filter+4],dword 0xffffffff
     call pcnet32_init_ring
     mov ebx,1
     mov eax,pcnet32_private
+    sub eax,OS_BASE
     and eax,0xffff
     call dword [pcnet32_access.write_csr]
     mov eax,pcnet32_private
+    sub eax,OS_BASE
     mov ebx,2
     shr eax,16
     call dword [pcnet32_access.write_csr]
     mov ebx,4
     mov eax,0x0915
     call dword [pcnet32_access.read_csr]
     test ax,0x100
     jnz .L12
     loop .L11
 .L12:
-;    PutStr "hardware reset"
+;    DEBUGF 1," K : hardware reset\n"
     xor ebx,ebx
     mov eax,0x0002
     call dword [pcnet32_access.write_csr]
     xor ebx,ebx
     call dword [pcnet32_access.read_csr]
-;    PutStr "PCNET reset complete"
+;    DEBUGF 1," K : PCNET reset complete\n"
     ret
 pcnet32_adjust_pci_device:
    ;*******Get current setting************************
-   mov     al, 2                                        ;read a word
+   mov	   al, 2					;read a word
-   mov     bh, [pci_dev]
+   mov	   bh, [pci_dev]
-   mov     ah, [pci_bus]
+   mov	   ah, [pci_bus]
 ;   mov     bl, 0x0D                            ;to Lantency Timer Register
 ;   call    pci_write_reg
    ;******Check latency setting***********
 pcnet32_adjust_pci_device_Done:
    ret
 pcnet32_probe:
     mov ebp,[io_addr]
     call pcnet32_wio_reset
     xor ebx,ebx
     call pcnet32_wio_read_csr
     cmp eax,4
     jne .try_dwio
     call pcnet32_wio_check
     and al,al
     jz .try_dwio
-;    PutStr "Using WIO"
+;    DEBUGF 1," K : Using WIO\n"
     mov esi,pcnet32_wio
     jmp .L1
 .try_dwio:
     call pcnet32_dwio_reset
     xor ebx,ebx
     cmp eax,4
     jne .no_dev
     call pcnet32_dwio_check
     and al,al
     jz .no_dev
-;    PutStr "Using DWIO"
+;    DEBUGF 1," K : Using DWIO\n"
     mov esi,pcnet32_dwio
     jmp .L1
 .no_dev:
-;    PutStr "PCNET32 not found"
+    DEBUGF 1," K : PCNET32 not found\n"
     ret
 .L1:
     mov edi,pcnet32_access
     mov ecx,7
     cld
     cmp ecx,3
     jne .no_dev
     shr eax,12
     and eax,0xffff
     mov [pcnet32_private.chip_version],eax
-;    PutStr "PCNET32 chip version OK"
+;    DEBUGF 1," K : PCNET32 chip version OK\n"
     mov [pcnet32_private.fdx],0
     mov [pcnet32_private.mii],0
     mov [pcnet32_private.fset],0
     mov [pcnet32_private.dxsuflo],0
     mov [pcnet32_private.ltint],0
     je .L7
     cmp eax,0x2626
     je .L8
     cmp eax,0x2627
     je .L9
-;    PutStr "Invalid chip rev"
+    DEBUGF 1," K : Invalid chip rev\n"
     jmp .no_dev
 .L2:
-;    PutStr "PCnet/PCI 79C970"
+;    DEBUGF 1," K : PCnet/PCI 79C970\n"
     jmp .L10
 .L3:
-;    PutStr "PCnet/PCI 79C970"
+;    DEBUGF 1," K : PCnet/PCI 79C970\n"
     jmp .L10
 .L4:
-;    PutStr "PCnet/PCI II 79C970A"
+;    DEBUGF 1," K : PCnet/PCI II 79C970A\n"
     mov [pcnet32_private.fdx],1
     jmp .L10
 .L5:
-;    PutStr "PCnet/FAST 79C971"
+;    DEBUGF 1," K : PCnet/FAST 79C971\n"
     mov [pcnet32_private.fdx],1
     mov [pcnet32_private.mii],1
     mov [pcnet32_private.fset],1
     mov [pcnet32_private.ltint],1
     jmp .L10
 .L6:
-;    PutStr "PCnet/FAST+ 79C972"
+;    DEBUGF 1," K : PCnet/FAST+ 79C972\n"
     mov [pcnet32_private.fdx],1
     mov [pcnet32_private.mii],1
     mov [pcnet32_private.fset],1
     jmp .L10
 .L7:
-;    PutStr "PCnet/FAST III 79C973"
+;    DEBUGF 1," K : PCnet/FAST III 79C973\n"
     mov [pcnet32_private.fdx],1
     mov [pcnet32_private.mii],1
     jmp .L10
 .L8:
-;    PutStr "PCnet/Home 79C978"
+;    DEBUGF 1," K : PCnet/Home 79C978\n"
     mov [pcnet32_private.fdx],1
     mov ebx,49
     call dword [pcnet32_access.read_bcr]
     call dword [pcnet32_access.write_bcr]
     jmp .L10
 .L9:
-;    PutStr "PCnet/FAST III 79C975"
+;    DEBUGF 1," K : PCnet/FAST III 79C975\n"
     mov [pcnet32_private.fdx],1
     mov [pcnet32_private.mii],1
 .L10:
     cmp [pcnet32_private.fset],1
     jne .L11
 .Lmac:
     in al,dx
     stosb
     inc edx
     loop .Lmac
-;    PutStr "MAC read"
+;    DEBUGF 1," K : MAC read\n"
     call pcnet32_adjust_pci_device
-;    PutStr "PCI done"
+;    DEBUGF 1," K : PCI done\n"
     mov eax,PCNET32_PORT_ASEL
     mov [pcnet32_private.options],eax
     mov [pcnet32_private.mode],word 0x0003
     mov [pcnet32_private.tlen_rlen],word (PCNET32_TX_RING_LEN_BITS or PCNET32_RX_RING_LEN_BITS)
     mov esi,node_addr
     cld
     movsd
     movsw
     mov [pcnet32_private.filter],dword 0
     mov [pcnet32_private.filter+4],dword 0
+    mov eax,pcnet32_rx_ring
+    sub eax,OS_BASE
-    mov dword [pcnet32_private.rx_ring],pcnet32_rx_ring
+    mov dword [pcnet32_private.rx_ring],eax
+    mov eax,pcnet32_tx_ring
+    sub eax,OS_BASE
-    mov dword [pcnet32_private.tx_ring],pcnet32_tx_ring
+    mov dword [pcnet32_private.tx_ring],eax
-;    PutStr "Switching to 32"
+;    DEBUGF 1," K : Switching to 32\n"
     mov ebx,20
     mov eax,2
     call dword [pcnet32_access.write_bcr]
     mov ebx,1
     mov eax,(pcnet32_private and 0xffff)
     call delay_ms
     call pcnet32_reset
     mov eax, [pci_data]
     mov [eth_status], eax
     ret
 pcnet32_poll:
-    xor eax,eax
+    xor ax,ax
     mov [eth_rx_data_len],ax
     mov eax,[pcnet32_private.cur_rx]
     and eax,PCNET32_RX_RING_MOD_MASK
     mov ebx,eax
     imul esi,eax,PCNET32_PKT_BUF_SZ
     mov cx,[ebx+pcnet32_rx_head.status]
     test cx,0x8000
     jnz .L1
     cmp ch,3
     jne .L1
-;    PutStr "PCNETRX"
     mov ecx,[ebx+pcnet32_rx_head.msg_length]
     and ecx,0xfff
     sub ecx,4
     mov [eth_rx_data_len],cx
+;    DEBUGF 1," K : PCNETRX: %ub\n",cx
     push ecx
     shr ecx,2
     mov edi,Ether_buffer
     cld
     rep movsd
     mov [ebx+pcnet32_rx_head.buf_length],word PCNET32_PKT_BUF_SZ_NEG
     or [ebx+pcnet32_rx_head.status],word 0x8000
     inc [pcnet32_private.cur_rx]
 .L1:
     ret
 ;         Pointer to 48 bit destination address in edi
 ;         Type of packet in bx
 ;         size of packet in ecx
 ;         pointer to packet data in esi
 pcnet32_xmit:
     push edi
     push esi
     push ebx
     push ecx
-;    PutStr "PCNETTX"
+;    DEBUGF 1," K : PCNETTX\n"
     mov esi,edi
     mov edi,[pcnet32_private.cur_tx]
     imul edi,PCNET32_PKT_BUF_SZ
     add edi,pcnet32_txb ; edi=ptxb
     mov eax,edi
     mov cx,60
 .L1:
     neg cx
     mov [edi+pcnet32_tx_head.length],cx
     mov [edi+pcnet32_tx_head.misc],dword 0
+    sub eax,OS_BASE
     mov [edi+pcnet32_tx_head.base],eax
     mov [edi+pcnet32_tx_head.status],word 0x8300
     ; trigger an immediate send poll
     mov ebx,0
-    mov eax,0x0008      ; 0x0048
+    mov eax,0x0008	; 0x0048
     jb .L4
     mov esi,10
     call delay_ms
     jnz .L2
 .L4:
-;    PutStr "PCNET: Send timeout"
+    DEBUGF 1," K : PCNET: Send timeout\n"
 .L3:
     mov dword [edi+pcnet32_tx_head.base],0
     pop ecx
     pop ebx
     pop esi

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/eth_drv/drivers/pcnet32.inc – Rev 684 → 781