WebSVN – Kolibri OS – Diff – /kernel/branches/net/drivers/pcnet32.asm

 	DEBUG			equ 1
 	__DEBUG__		equ 1
+	__DEBUG_LEVEL__ 	equ 1
+	TX_RING_SIZE		equ 4
+	RX_RING_SIZE		equ 4
-	__DEBUG_LEVEL__ 	equ 1
+	PKT_BUF_SZ		equ 1544
 include 'proc32.inc'
 include 'imports.inc'
 include 'fdo.inc'
 include 'netdrv.inc'
+public START
+public service_proc
+public version
+struc buf_head {
+	.base		dd ?
+	.length 	dw ?
+	.status 	dw ?
+	.msg_length	dw ?
+	.misc		dw ?
+	.reserved	dd ?
+	.size:
+}
 public START
 	.phys_addr	dp ?
 	.reserved	dw ?
 	.filter 	dq ?
 	.rx_ring_phys	dd ?
 	.tx_ring_phys	dd ?
-	.rx_ring	dd ?
+	.rx_ring	rb RX_RING_SIZE * buf_head.size
-	.tx_ring	dd ?
+	.tx_ring	rb TX_RING_SIZE * buf_head.size
 	.cur_rx 	db ?
 	.cur_tx 	db ?
 	.dirty_rx	dd ?
 	.dirty_tx	dd ?
 	.tx_full	db ?
 	.size = $ - device
-end virtual
-struc buf_head {
-	.base		dd ?
-	.length 	dw ?
-	.status 	dw ?
-	.msg_length	dw ?
-	.misc		dw ?
-	.reserved	dd ?
-	.size:
-}
 virtual at 0
- buf_head buf_head
+end virtual
 end virtual
 virtual at 0
  rx_desc rx_desc_2
-end virtual
-; PCI Bus defines
+end virtual
 	PORT_AUI		equ 0x00
 	PORT_10BT		equ 0x01
 	PORT_GPSI		equ 0x02
 	DMA_MASK		equ 0xffffffff
 	LOG_TX_BUFFERS		equ 2
-	LOG_RX_BUFFERS		equ 2
 	LOG_RX_BUFFERS		equ 2
 	TX_RING_SIZE		equ 4
-	TX_RING_MOD_MASK	equ (TX_RING_SIZE-1)
-	TX_RING_LEN_BITS	equ (LOG_TX_BUFFERS shl 12)
+	TX_RING_MOD_MASK	equ (TX_RING_SIZE-1)
 	TX_RING_LEN_BITS	equ (LOG_TX_BUFFERS shl 12)
-	RX_RING_SIZE		equ 4
-	RX_RING_MOD_MASK	equ (RX_RING_SIZE-1)
-	RX_RING_LEN_BITS	equ (LOG_RX_BUFFERS shl 4)
-	PKT_BUF_SZ		equ 1544
+	RX_RING_MOD_MASK	equ (RX_RING_SIZE-1)
-	PKT_BUF_SZ_NEG		equ 0xf9f8
+	RX_RING_LEN_BITS	equ (LOG_RX_BUFFERS shl 4)
 	WIO_RDP 		equ 0x10
 	find_irq [device.pci_bus], [device.pci_dev], [device.irq_line]
 	DEBUGF	1,"Hooking into device, dev:%x, bus:%x, irq:%x, addr:%x\n",\
 	[device.pci_dev]:1,[device.pci_bus]:1,[device.irq_line]:1,[device.io_addr]:4
-;;;        allocate_and_clear [device.tx_buffer], (RX_RING_SIZE * PKT_BUF_SZ), .err
-	allocate_and_clear [device.rx_buffer], (TX_RING_SIZE * PKT_BUF_SZ), .err
-	allocate_and_clear [device.rx_ring], (RX_RING_SIZE * buf_head.size), .err
-	mov	eax, [device.rx_ring]
-	call	GetPgAddr
-	mov	[device.rx_ring_phys], eax
-	allocate_and_clear [device.tx_ring], (TX_RING_SIZE * buf_head.size), .err
-	mov	eax, [device.tx_ring]
-	call	GetPgAddr
+	allocate_and_clear [device.tx_buffer], (RX_RING_SIZE * PKT_BUF_SZ), .err
-	mov	[device.tx_ring_phys], eax
+	allocate_and_clear [device.rx_buffer], (TX_RING_SIZE * PKT_BUF_SZ), .err
 ; Ok, the eth_device structure is ready, let's probe the device
 	; todo: reset device into virgin state
 	dec	[devices]
   .err:
 	DEBUGF	1,"Error, removing all data !\n"
 	stdcall KernelFree, [device.rx_buffer]
-;;;        stdcall KernelFree, [device.tx_buffer]
+	stdcall KernelFree, [device.tx_buffer]
 	stdcall KernelFree, ebx
   .fail:
 	or	eax, -1
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 align 4
+probe:
-probe:
+; make the device a bus master
 	make_bus_master [device.pci_bus], [device.pci_dev]
-; first, fill in some of the structure variables
+; create the RX-ring
-	mov	edi, [device.rx_ring]
+	lea	edi, [device.rx_ring]
 	mov	ecx, RX_RING_SIZE
 	mov	eax, [device.rx_buffer]
 	call	GetPgAddr
   .rx_init:
 	mov	[edi + buf_head.base], eax
-	mov	[edi + buf_head.length], PKT_BUF_SZ_NEG
+	mov	[edi + buf_head.length], - PKT_BUF_SZ
-	mov	[edi + buf_head.status], 0x8000
-	and	dword [edi + buf_head.msg_length], 0
+	mov	[edi + buf_head.status], 0x8000
-	and	dword [edi + buf_head.reserved], 0
+	and	dword [edi + buf_head.msg_length], 0
+	and	dword [edi + buf_head.reserved], 0
+	add	eax, PKT_BUF_SZ
+	add	edi, buf_head.size
+	loop	.rx_init
+	lea	eax, [device.rx_ring]
-	add	eax, PKT_BUF_SZ
+	GetRealAddr
-;        inc     eax
+	mov	[device.rx_ring_phys], eax
 	add	 edi, buf_head.size
-	loop	 .rx_init
+; create the Tx-ring
-	mov	edi, [device.tx_ring]
+	lea	edi, [device.tx_ring]
 	and	dword [edi + buf_head.reserved], 0
 	add	eax, PKT_BUF_SZ
 	add	edi, buf_head.size
 	loop	.tx_init
+	lea	eax, [device.tx_ring]
+	GetRealAddr
+	mov	[device.tx_ring_phys], eax
 	mov	[device.tlen_rlen], (TX_RING_LEN_BITS or RX_RING_LEN_BITS)
-	; First, we must try to use Word operations
+; First, we must try to use Word operations
 	cmp	eax, 4
 	jne	.try_dwio
 	; Try Word I/O
-	mov	ax , 88
+	mov	ax, 88
-	add	edx, WIO_RAP
+	set_io	WIO_RAP
-	out	dx , ax
+	out	dx, ax
 	nop
 	nop
-	in	ax , dx
+	in	ax, dx
-	sub	edx, WIO_RAP
+	set_io	0
-	cmp	ax , 88
+	cmp	ax, 88
 	jne	.try_dwio
-	DEBUGF 1,"Using WIO\n"
+	DEBUGF	1,"Using WIO\n"
 	call	switch_to_wio
 	call	switch_to_wio
 	jmp	.L1
 	jmp	.L1
-	out	dx , eax
+	out	dx, eax
 	nop
 	nop
 	in	eax, dx
 	set_io	0
-	and	eax, 0xffff
-	cmp	eax, 88
+	cmp	ax, 88
 	jne	.no_dev
-	DEBUGF 1,"Using DWIO\n"
+	DEBUGF	1,"Using DWIO\n"
+	call	switch_to_dwio
 	call	switch_to_dwio
 	jmp	.L1
-	jmp	.L1
 ; If both methods fail, something is wrong!
-  .no_dev:
+  .no_dev:
-	DEBUGF 1,"PCnet device not found!\n"
+	DEBUGF	1,"PCnet device not found!\n"
-	mov	eax, 1
+	mov	eax, -1
 	ret
   .L1:
 	shr	eax, 12
 	and	eax, 0xffff
 	mov	[device.chip_version], eax
 	DEBUGF	1,"chip version: %x\n", eax
 	DEBUGF 1,"chip version ok\n"
 	mov	[device.fdx], 0
 	mov	[device.mii], 0
 	mov	[device.fset], 0
 	cmp	[device.fset], 1
 	jne	.L11
 	mov	ecx, BCR_BUSCTL
 	call	[device.access_read_bcr]
-	or	eax, 0x800
+	or	ax, 0x800
 	call	[device.access_write_bcr]
-	mov	ecx, CSR_DMACTL
-	call	[device.access_read_csr]
-;        and     eax, 0xc00
+	mov	ecx, CSR_DMACTL
-;        or      eax, 0xc00
+	call	[device.access_read_csr]
 	mov	eax, 0xc00
 	call	[device.access_write_csr]
-	mov	[device.dxsuflo],1
-	mov	[device.ltint],1
+	mov	[device.dxsuflo],1
-  .L11:
+	mov	[device.ltint],1
   .L11:
 	DEBUGF 1,"PCI done\n"
-	mov	eax, PORT_ASEL
+	mov	eax, PORT_ASEL			; Auto-select
 	mov	eax, IMR
-	mov	ecx, CSR_IMR			  ; Write interrupt mask
+	mov	ecx, CSR_IMR			; Write interrupt mask
 	call	[device.access_write_csr]
+align 4
+reset:
 align 4
-reset:
+	DEBUGF	1,"Resetting PCnet device: %x\n", ebx
 ; attach int handler
 ; Switch to dword operations
-	DEBUGF 1,"Switching to 32-bit mode\n"
+	DEBUGF	1,"Switching to 32-bit mode\n"
 	mov	ecx, DWIO_RDP
-	mov	eax, 0
+	xor	eax, eax
 	call	wio_write_csr
-	out	dx , eax
+	out	dx, eax
 	nop
 	nop
 	in	eax, dx
 	set_io	0
-	and	eax, 0xffff
-	cmp	eax, 88
+	cmp	ax, 88
 	je	.yes_dwio
-	call	switch_to_wio			; it seem to have failed, reset device again and use wio
+	call	switch_to_wio			; it seems to have failed, reset device again and use wio
 	set_io	0
 	call	[device.access_reset]
+  .yes_dwio:
+	set_io	0
+	mov	ecx, BCR_SSTYLE 		; Select Software style 2      ;;;
 	mov	eax, 2
-  .yes_dwio:
+	call	[device.access_write_bcr]
 	; set/reset autoselect bit
 	mov	ecx, BCR_MISCCFG
 	call	[device.access_read_bcr]
-	and	eax,not 2
 	test	[device.options], PORT_ASEL
-	jz	.L1
+	jnz	 .L1
-	or	eax, 2
+	and	eax, not 2
 	lea	edi, [device.phys_addr]
 	movsd
 	movsw
-	lea	eax, [device.private]
-	mov	ecx, eax
-	and	ecx, 0xFFF ; KolibriOS PAGE SIZE
+	lea	eax, [device.private]
-	call	GetPgAddr
-	add	eax, ecx
 	GetRealAddr
 	push	eax
 	and	eax, 0xffff
 	mov	ecx, 1
 	call	[device.access_write_csr]
-	mov	ecx,4
+	mov	ecx, 4
-	mov	eax,0x0915
+	mov	eax, 0x0915
 	call	[device.access_write_csr]
-	mov	ecx,0
+	xor	ecx, ecx
-	mov	eax,1
+	mov	eax, 1
 	call	[device.access_write_csr]
 .L11:
 	push	ecx
 	xor	ecx, ecx
 	call	[device.access_read_csr]
 	pop	ecx
+	push	esi
+	mov	esi, 100
+	call	Sleep
+	pop	esi
-	test	ax,0x100
+	test	ax, 0x100
 	jnz	.L12
 	loop	.L11
 .L12:
 ; check descriptor
 	movzx	eax, [device.cur_tx]
 	imul	edi, eax, PKT_BUF_SZ
 	shl	eax, 4
 	add	edi, [device.tx_buffer]
-	add	eax, [device.tx_ring]
+	lea	eax, [eax + device.tx_ring]
 	test	byte [eax + buf_head.status + 1], 80h
 	jnz	.nospace
 ; descriptor is free, copy data
 	mov	ecx, [esp+8]
 	add	dword [device.bytes_tx], ecx
 	adc	dword [device.bytes_tx + 4], 0
 	DEBUGF	2," - Done!\n"
-	call	Kernelfree
-	add	esp, 4
+	stdcall KernelFree, [esp+4]
-	ret
+	ret	8
 .nospace:
 	DEBUGF	1, 'ERROR: no free transmit descriptors\n'
-; todo: maybe somehow notify the kernel about the error?
+; todo: maybe somehow notify the kernel about the error?
 	call	Kernelfree
-	add	esp, 4
+	stdcall KernelFree, [esp+4]
 ;;;;;;;;;;;;;;;;;;;;;;;
 align 4
 int_handler:
-	DEBUGF	1,"IRQ %x ", eax:2		; no, you cant replace 'eax:2' with 'al', this must be a bug in FDO
+	DEBUGF	1,"IRQ=%x ", eax:2		; no, you cant replace 'eax:2' with 'al', this must be a bug in FDO
 ; find pointer of device wich made IRQ occur
 	mov	esi, device_list
 	mov	ecx, [devices]
-	test	ecx, ecx
-	jz	.abort
+	test	ecx, ecx
-  .nextdevice:
+	jz	.abort
-	mov	ebx, [esi]
+  .nextdevice:
-	DEBUGF	1,"device=%x? ", ebx
+	mov	ebx, [esi]
 	loop	.nextdevice
 	ret					; If no device was found, abort (The irq was probably for a device, not registered to this driver
   .got_it:
-	DEBUGF	1,"yes, reason=%x ", ax
+	DEBUGF	1,"csr=%x\n", ax
 ;-------------------------------------------------------
 ; Possible reasons:
 ; initialization done - ignore
 ; Received packet ok?
 	test	ax, CSR_RINT
+	jz	@f
+	push	ax
-	jz	@f
+	DEBUGF	1,"packet received!\n"
-.receiver_test_loop:
+ .receiver_test_loop:
 	movzx	eax, [device.cur_rx]
 ;        and     eax, RX_RING_MOD_MASK
 	mov	edi, eax
 	imul	esi, eax, PKT_BUF_SZ	  ;
 	add	esi, [device.rx_buffer] 	; esi now points to rx buffer
 	shl	edi, 4				; desc * 16 (16 is size of one ring entry)
 	DEBUGF	1,"Inserting packet\n"
 	jmp	EthReceiver			; Send the copied packet to kernel
   .abort:
+	pop	ax
+  @@:
+	test	ax, IMR_TINT
+	jz	@f
+	DEBUGF	1,"Transmit OK!\n"
+  @@:
+	test	ax, IMR_MISS
+	jz	@f
+	DEBUGF	1,"We missed a frame! (RX ring full?)\n"
+  @@:
 	DEBUGF	1,"done \n"
 align 4
 write_mac:	; in: mac pushed onto stack (as 3 words)
 	DEBUGF	1,"Writing MAC: %x-%x-%x-%x-%x-%x",[esp+0]:2,[esp+1]:2,[esp+2]:2,[esp+3]:2,[esp+4]:2,[esp+5]:2
-	mov	edx, [device.io_addr]
+	set_io	0
-	add	edx, 2
-	xor	eax, eax
+;        set_io  2
 	xor	eax, eax
 	mov	ecx, CSR_PAR0
        @@:
 	pop	ax
 ;;;;;;;;;;;;;;;;;;;;;;
 read_mac:
 	DEBUGF	1,"Reading MAC"
-	mov	edx, [device.io_addr]
+	set_io	0
-	add	edx, 6
+	set_io	6
        @@:
 	dec	dx
 	dec	dx
 ; End of code
-align 4 					; Place all initialised data here
+align 4 					  ; Place all initialised data here
 devices       dd 0
 version       dd (DRIVER_VERSION shl 16) or (API_VERSION and 0xFFFF)
-my_service    db 'PCnet32',0			; max 16 chars include zero
+my_service    db 'PCnet',0			  ; max 16 chars include zero
 device_l2     db "PCnet/PCI 79C970",0
 device_l4     db "PCnet/PCI II 79C970A",0

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/drivers/pcnet32.asm – Rev 1519 → 1541