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

 ;;                                                                  ;;
 ;; Status: under construction                                       ;;
 ;;                                                                  ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; $Revision: 1377 $
+; $Revision: 1492 $
 MAX_ETH_FRAME_SIZE equ 1514
 include 'proc32.inc'
 include 'imports.inc'
+include 'fdo.inc'
+include 'netdrv.inc'
-include 'fdo.inc'
-OS_BASE 	equ 0;
+OS_BASE 	equ 0
 new_app_base	equ 0x60400000
 PROC_BASE	equ OS_BASE+0x0080000
-public START
-public service_proc
-public version
-struc IOCTL {
-      .handle		dd ?
-      .io_code		dd ?
-      .input		dd ?
-      .inp_size 	dd ?
+public START
-      .output		dd ?
+public service_proc
-      .out_size 	dd ?
+public version
-}
-virtual at 0
-  IOCTL IOCTL
-end virtual
-struc ETH_DEVICE {
-; pointers to procedures
-      .unload		dd ?
-      .reset		dd ?
-      .transmit 	dd ?
-      .set_MAC		dd ?
-      .get_MAC		dd ?
-      .set_mode 	dd ?
-      .get_mode 	dd ?
-; status
-      .bytes_tx 	dq ?
-      .bytes_rx 	dq ?
       .packets_tx	dd ?
-      .packets_rx	dd ?
+virtual at ebx
       .mode		dd ?  ; This dword contains cable status (10mbit/100mbit, full/half duplex, auto negotiation or not,..)
-      .name		dd ?
+	device:
       .mac		dp ?
-; device specific
+	ETH_DEVICE
+      .rx_buffer	dd ?
+      .tx_buffer	dd ?
+      .io_addr		dd ?
+      .irq_line 	db ?
+      .pci_bus		db ?
+      .pci_dev		db ?
+			db ?	; align 4
-      .rx_buffer	dd ?
+      .access_read_csr		dd ?
-      .tx_buffer	dd ?
+      .access_write_csr 	dd ?
       .access_read_bcr		dd ?
-      .io_addr		dd ?
+      .access_write_bcr 	dd ?
-      .irq_line 	db ?
+      .access_read_rap		dd ?
-      .pci_bus		db ?
+      .access_write_rap 	dd ?
-      .pci_dev		db ?
+      .access_reset		dd ?
       .ltint		db ?
       .dxsuflo		db ?
       .fset		db ?
       .fdx		db ?
-      .access_read_csr		dd ?
-      .access_write_csr 	dd ?
-      .access_read_bcr		dd ?
-      .access_write_bcr 	dd ?
-      .access_read_rap		dd ?
-      .access_write_rap 	dd ?
-      .access_reset		dd ?
-      .size:
-}
-virtual at 0
+      .size = $ - device
  device ETH_DEVICE
 end virtual
 ;; proc START             ;;
 ;;                        ;;
 ;; (standard driver proc) ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 align 4
 proc START stdcall, state:dword
 align 4
 proc service_proc stdcall, ioctl:dword
 	mov	edx, [ioctl]
-	mov	eax, [edx+IOCTL.io_code]
+	mov	eax, [IOCTL.io_code]
 ;------------------------------------------------------
 	cmp	eax, 0 ;SRV_GETVERSION
 	jne	@F
-	cmp	[edx+IOCTL.out_size], 4
+	cmp	[IOCTL.out_size], 4
 	jl	.fail
-	mov	eax, [edx+IOCTL.output]
+	mov	eax, [IOCTL.output]
 	mov	[eax], dword API_VERSION
-	xor	eax, eax
-	ret
+	xor	eax, eax
-;------------------------------------------------------
+	ret
-  @@:
-	cmp	eax, 1 ;SRV_HOOK
+;------------------------------------------------------
-	jne	.fail
+  @@:
 	cmp	eax, 1 ;SRV_HOOK
-	mov	eax, [esp]
 	jne	.fail
 	cmp	[edx + IOCTL.inp_size], 3		; Data input must be at least 3 bytes
-	jl	.fail
+	cmp	[IOCTL.inp_size], 3			; Data input must be at least 3 bytes
+	jl	.fail
+	mov	eax, [IOCTL.input]
-	mov	eax, [edx + IOCTL.input]
+	cmp	byte [eax], 1				; 1 means device number and bus number (pci) are given
-	cmp	byte [eax], 1				; 1 means device number and bus number (pci) are given
+	jne	.fail					; other types arent supported for this card yet
-	jne	.fail					; other types arent supported for this card yet
+; check if the device is already listed
 ; check if the device is already listed
+	mov	ecx, [PCNET_DEV]
-	mov	esi, PCNET_LIST
+	test	ecx, ecx
-	mov	ecx, [PCNET_DEV]
+	jz	.firstdevice
 	test	ecx, ecx
 	jz	.fail
 	mov	ebx, eax				; ebx is always used as a pointer to the structure (in driver, but also in kernel code)
 ; Fill in the direct call addresses into the struct
-	mov	dword [ebx+device.reset], reset
+	mov	[device.reset], reset
-	mov	dword [ebx+device.transmit], transmit
+	mov	[device.transmit], transmit
-	mov	dword [ebx+device.get_MAC], read_mac
+	mov	[device.get_MAC], read_mac
-	mov	dword [ebx+device.set_MAC], write_mac
+	mov	[device.set_MAC], write_mac
-	mov	dword [ebx+device.unload], unload
+	mov	[device.unload], unload
-	mov	dword [ebx+device.name], my_service
+	mov	[device.name], my_service
 ; save the pci bus and device numbers
-	mov	eax, [edx+IOCTL.input]
+	mov	eax, [IOCTL.input]
 	mov	cl , [eax+1]
-	mov	[ebx+device.pci_bus], cl
-	mov	cl , [eax+2]
-	mov	[ebx+device.pci_dev], cl
-; Now, it's time to find the base io addres of the PCI device
-; TODO: implement check if bus and dev exist on this machine
-	mov	edx, PCI_BASE_ADDRESS_0
-  .reg_check:
-	movzx	eax, byte [ebx+device.pci_bus]
-	movzx	ecx, byte [ebx+device.pci_dev]
-	push	edx ecx
-	stdcall PciRead16, eax ,ecx ,edx
-	pop	ecx edx
-	mov	[ebx+device.io_addr], eax
-	and	eax, PCI_BASE_ADDRESS_IO_MASK
-	test	eax, eax
-	jz	.inc_reg
+	mov	[device.pci_bus], cl
-	mov	eax, [ebx+device.io_addr]
-	and	eax, PCI_BASE_ADDRESS_SPACE_IO
-	test	eax, eax
-	jz	.inc_reg
-	mov	eax, [ebx+device.io_addr]
-	and	eax, PCI_BASE_ADDRESS_IO_MASK
-	mov	[ebx+device.io_addr], eax
-	jmp	.got_io
-  .inc_reg:
+	mov	cl , [eax+2]
-	add	edx, 4
-	cmp	edx, PCI_BASE_ADDRESS_5
+	mov	[device.pci_dev], cl
-	jbe	.reg_check
-  .got_io:
 ; We've found the io address, find IRQ now
+; Now, it's time to find the base io addres of the PCI device
-	movzx	eax, byte [ebx+device.pci_bus]
-	movzx	ecx, byte [ebx+device.pci_dev]
-	push	ebx
-	stdcall PciRead8, eax ,ecx ,0x3c				; 0x3c is the offset where irq can be found
-	pop	ebx
-	mov	byte [ebx+device.irq_line], al
-	DEBUGF	1,"Hooking into device, dev:%x, bus:%x, irq:%x, addr:%x\n",\
+	find_io [device.pci_bus], [device.pci_dev], [device.io_addr]
-	[ebx+device.pci_dev]:1,[ebx+device.pci_bus]:1,[ebx+device.irq_line]:1,[ebx+device.io_addr]:4
-; Allocate the Receive buffer
-	stdcall KernelAlloc, PCNET_RX_RING_SIZE * PCNET_PKT_BUF_SZ
-	test	eax, eax
-	jz	.err
-	mov	[ebx+device.rx_buffer], eax				; Save the address to it into the device struct
-; Allocate the Transmit Buffer
+; We've found the io address, find IRQ now
 	stdcall KernelAlloc, PCNET_TX_RING_SIZE * PCNET_PKT_BUF_SZ
-	test	eax, eax
+	find_irq [device.pci_bus], [device.pci_dev], [device.irq_line]
-	jz	.err
-	mov	[ebx+device.tx_buffer], eax
-; Allocate the RX Ring
-	stdcall KernelAlloc, PCNET_RX_RING_SIZE * buf_head.size
-	test	eax, eax
-	jz	.err
-	mov	dword [ebx + device.rx_ring], eax
-	call	GetPgAddr
-	mov	dword [ebx + device.rx_ring_phys], eax
-; Allocate the TX ring
-	stdcall KernelAlloc, PCNET_TX_RING_SIZE * buf_head.size
-	test	eax, eax
-	jz	.err
-	mov	dword [ebx + device.tx_ring], eax
-	call	GetPgAddr
-	mov	dword [ebx + device.tx_ring_phys], eax
-; fill in some of the structure variables
-	call	switch_to_wio
-	mov	edi, [ebx + device.rx_ring]
-	mov	ecx, PCNET_RX_RING_SIZE
-	mov	eax, [ebx + device.rx_buffer]
+	DEBUGF	1,"Hooking into device, dev:%x, bus:%x, irq:%x, addr:%x\n",\
-	call	GetPgAddr
-  .rx_init:
-	mov	[edi + buf_head.base], eax
+	[device.pci_dev]:1,[device.pci_bus]:1,[device.irq_line]:1,[device.io_addr]:4
-	mov	[edi + buf_head.length], PCNET_PKT_BUF_SZ_NEG
-	mov	[edi + buf_head.status], 0x8000
-	and	dword [edi + buf_head.msg_length], 0
-	and	dword [edi + buf_head.reserved], 0
-	add	eax, PCNET_PKT_BUF_SZ
-;        inc     eax
-	add	 edi, buf_head.size
-	loop	 .rx_init
-	mov	edi, [ebx + device.tx_ring]
-	mov	ecx, PCNET_TX_RING_SIZE
+	allocate_and_clear [device.tx_buffer], (PCNET_RX_RING_SIZE * PCNET_PKT_BUF_SZ), .err
-	mov	eax, [ebx + device.tx_buffer]
+	allocate_and_clear [device.rx_buffer], (PCNET_TX_RING_SIZE * PCNET_PKT_BUF_SZ), .err
-	call	GetPgAddr
+	allocate_and_clear [device.rx_ring], (PCNET_RX_RING_SIZE * buf_head.size), .err
   .tx_init:
 ; If an error occured, remove all allocated data and exit (returning -1 in eax)
-  .destroy:
-	; todo: reset device into virgin state
+  .destroy:
 	; todo: reset device into virgin state
 	dec	[PCNET_DEV]
   .err:
 	DEBUGF	1,"Error, removing all data !\n"
-	stdcall KernelFree, dword [ebx+device.rx_buffer]
+	stdcall KernelFree, [device.rx_buffer]
-	stdcall KernelFree, dword [ebx+device.tx_buffer]
+	stdcall KernelFree, [device.tx_buffer]
 	stdcall KernelFree, ebx
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 align 4
-probe:
+probe:
+	make_bus_master [device.pci_bus], [device.pci_dev]
+; first, fill in some of the structure variables
+	mov	edi, [device.rx_ring]
+	mov	ecx, PCNET_RX_RING_SIZE
+	mov	eax, [device.rx_buffer]
+	call	GetPgAddr
+  .rx_init:
+	mov	[edi + buf_head.base], eax
+	mov	[edi + buf_head.length], PCNET_PKT_BUF_SZ_NEG
+	mov	[edi + buf_head.status], 0x8000
+	and	dword [edi + buf_head.msg_length], 0
+	and	dword [edi + buf_head.reserved], 0
+	add	eax, PCNET_PKT_BUF_SZ
+;        inc     eax
+	add	 edi, buf_head.size
+	loop	 .rx_init
+	mov	edi, [device.tx_ring]
+	mov	ecx, PCNET_TX_RING_SIZE
+	mov	eax, [device.tx_buffer]
+	call	GetPgAddr
+  .tx_init:
+	mov	[edi + buf_head.base], eax
+	and	dword [edi + buf_head.length], 0
+	and	dword [edi + buf_head.msg_length], 0
+	and	dword [edi + buf_head.reserved], 0
+	add	eax, PCNET_PKT_BUF_SZ
+	add	edi, buf_head.size
+	loop	.tx_init
+	mov	[device.tlen_rlen], (PCNET_TX_RING_LEN_BITS or PCNET_RX_RING_LEN_BITS)
+	; First, we must try to use Word operations
-	mov	edx, [ebx + device.io_addr]
+	call	switch_to_wio
 	set_io	0
 	call	wio_reset
 	jmp	.L1
   .try_dwio:
+	call	dwio_reset
 	call	dwio_reset
 	set_io	0
 	xor	ecx, ecx
 	call	dwio_read_csr
 	cmp	eax, 4
 	jne	.no_dev
 	; Try Dword I/O
-	add	edx, PCNET_DWIO_RAP
+	set_io	PCNET_DWIO_RAP
 	mov	eax, 88
 	out	dx , eax
 	nop
 	nop
 	in	eax, dx
-	sub	edx, PCNET_DWIO_RAP
+	set_io	0
 	and	eax, 0xffff
   .no_dev:
 	DEBUGF 1,"PCnet device not found!\n"
 	mov	eax, 1
 	ret
   .L1:
-	; TODO: remember to use WORD or DWORD operations
-;;;        stdcall Sleep, 10
-;---------------------------------------------
-; Switch to dword operations
- ;       DEBUGF 1,"Switching to 32\n"
- ;
- ;       mov     ecx, PCNET_DWIO_RDP
- ;       mov     eax, 0
- ;       call    wio_write_csr
-;---------------------------------------------
 	mov	ecx, PCNET_CSR_CHIPID0
-	call	[ebx + device.access_read_csr]
+	call	[device.access_read_csr]
 	mov	esi, eax
 	mov	ecx, PCNET_CSR_CHIPID1
-	call	[ebx + device.access_read_csr]
+	call	[device.access_read_csr]
 	shl	eax, 16
 	or	eax, esi
 	mov	ecx, eax
 	and	ecx, 0xfff
 	cmp	ecx, 3
 	jne	.no_dev
 	shr	eax, 12
 	and	eax, 0xffff
-	mov	[ebx + device.chip_version], eax
+	mov	[device.chip_version], eax
 	DEBUGF 1,"chip version ok\n"
-	mov	[ebx + device.fdx], 0
+	mov	[device.fdx], 0
-	mov	[ebx + device.mii], 0
+	mov	[device.mii], 0
-	mov	[ebx + device.fset], 0
+	mov	[device.fset], 0
-	mov	[ebx + device.dxsuflo], 0
+	mov	[device.dxsuflo], 0
-	mov	[ebx + device.ltint], 0
+	mov	[device.ltint], 0
 	cmp	eax, 0x2420
 	je	.L2
 	cmp	eax, 0x2430
 	je	.L9
 	DEBUGF 1,"Invalid chip rev\n"
 	jmp	.no_dev
   .L2:
-	mov	[ebx + device.name], device_l2
+	mov	[device.name], device_l2
 	jmp	.L10
   .L4:
-	mov	[ebx + device.name], device_l4
+	mov	[device.name], device_l4
-;        mov     [ebx + device.fdx], 1
+;        mov     [device.fdx], 1
 	jmp	.L10
   .L5:
-	mov	[ebx + device.name], device_l5
+	mov	[device.name], device_l5
-;        mov     [ebx + device.fdx], 1
+;        mov     [device.fdx], 1
-	mov	[ebx + device.mii], 1
+	mov	[device.mii], 1
-	mov	[ebx + device.fset], 1
+	mov	[device.fset], 1
-	mov	[ebx + device.ltint], 1
+	mov	[device.ltint], 1
 	jmp	.L10
   .L6:
-	mov	[ebx + device.name], device_l6
+	mov	[device.name], device_l6
-;        mov     [ebx + device.fdx], 1
+;        mov     [device.fdx], 1
-	mov	[ebx + device.mii], 1
+	mov	[device.mii], 1
-	mov	[ebx + device.fset], 1
+	mov	[device.fset], 1
 	jmp	.L10
   .L7:
-	mov	[ebx + device.name], device_l7
+	mov	[device.name], device_l7
-;        mov     [ebx + device.fdx], 1
+;        mov     [device.fdx], 1
-	mov	[ebx + device.mii], 1
+	mov	[device.mii], 1
 	jmp	.L10
   .L8:
-	mov	[ebx + device.name], device_l8
+	mov	[device.name], device_l8
-;        mov     [ebx + device.fdx], 1
+;        mov     [device.fdx], 1
 	mov	ecx, PCNET_CSR_RXPOLL
-	call	dword [ebx + device.access_read_bcr]
+	call	[device.access_read_bcr]
-	call	dword [ebx + device.access_write_bcr]
+	call	[device.access_write_bcr]
 	jmp	.L10
   .L9:
-	mov	[ebx + device.name], device_l9
+	mov	[device.name], device_l9
-;        mov     [ebx + device.fdx], 1
+;        mov     [device.fdx], 1
-	mov	[ebx + device.mii], 1
+	mov	[device.mii], 1
   .L10:
-	DEBUGF 1,"device name: %s\n",[ebx + device.name]
+	DEBUGF 1,"device name: %s\n",[device.name]
-	cmp	[ebx + device.fset], 1
+	cmp	[device.fset], 1
 	jne	.L11
 	mov	ecx, PCNET_BCR_BUSCTL
-	call	[ebx + device.access_read_bcr]
+	call	[device.access_read_bcr]
 	or	eax, 0x800
-	call	[ebx + device.access_write_bcr]
+	call	[device.access_write_bcr]
 	mov	ecx, PCNET_CSR_DMACTL
-	call	[ebx + device.access_read_csr]
+	call	[device.access_read_csr]
 ;        and     eax, 0xc00
 ;        or      eax, 0xc00
 	mov	eax, 0xc00
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
-	mov	[ebx + device.dxsuflo],1
-	mov	[ebx + device.ltint],1
-  .L11:
-	push	ebx
+	mov	[device.dxsuflo],1
-	call	adjust_pci_device
+	mov	[device.ltint],1
-	pop	ebx
+  .L11:
 	DEBUGF 1,"PCI done\n"
 	mov	eax, PCNET_PORT_ASEL
-	mov	[ebx + device.options], eax
+	mov	[device.options], eax
-	mov	[ebx + device.mode_], word 0x0003
+	mov	[device.mode_], word 0x0003
-	mov	[ebx + device.tlen_rlen], word (PCNET_TX_RING_LEN_BITS or PCNET_RX_RING_LEN_BITS)
+	mov	[device.tlen_rlen], word (PCNET_TX_RING_LEN_BITS or PCNET_RX_RING_LEN_BITS)
-	mov	dword [ebx + device.filter], 0
-	mov	dword [ebx + device.filter+4], 0
-	mov	eax, PCNET_IMR
-	mov	ecx, PCNET_CSR_IMR			; Write interrupt mask
-	call	[ebx + device.access_write_csr]
-if 0
-	mov	ecx, PCNET_BCR_SSTYLE		; Select Software style 2       TODO: freebsd driver uses style 3, why?
-	mov	eax, 2
-	call	[ebx + device.access_write_bcr]
-; ------------ really nescessary??? ----------------
-	lea	eax, [ebx + device.private]
-	mov	ecx, eax
-	and	ecx, 0xFFF ; KolibriOS PAGE SIZE
-	call	GetPgAddr
-	add	eax, ecx
-	and	eax, 0xffff
-	mov	ecx, PCNET_CSR_IAB0
-	call	[ebx + device.access_write_csr]
-	lea	eax, [ebx + device.private]
-	mov	ecx, eax
-	and	ecx, 0xFFF ; KolibriOS PAGE SIZE
-	call	GetPgAddr
-	add	eax, ecx
-	shr	eax,16
-	mov	ecx, PCNET_CSR_IAB1
-	call	[ebx + device.access_write_csr]
+	mov	dword [device.filter], 0
 	mov	dword [device.filter+4], 0
-	mov	ecx, PCNET_CSR_CSR
-	mov	eax, 1
+	mov	eax, PCNET_IMR
-	call	[ebx + device.access_write_csr]
+	mov	ecx, PCNET_CSR_IMR			; Write interrupt mask
-; ------------------------------------------------
+	call	[device.access_write_csr]
 end if
 ;       mov     esi, 1
 ;       call    Sleep
+align 4
+reset:
+; attach int handler
+	movzx	eax, [device.irq_line]
+	DEBUGF	1,"Attaching int handler to irq %x\n",eax:1
+	stdcall AttachIntHandler, eax, int_handler, dword 0
+	test	eax, eax
-reset:
+	jnz	@f
+	DEBUGF	1,"\nCould not attach int handler!\n"
+;        or      eax, -1
+;        ret
+  @@:
+	set_io	0
+	call	[device.access_reset]		; after a reset, device will be in WIO mode!
+; Switch to dword operations
+	DEBUGF 1,"Switching to 32-bit mode\n"
+	mov	ecx, PCNET_DWIO_RDP
+	mov	eax, 0
+	call	wio_write_csr
+	call	switch_to_dwio
-; attach int handler
-	movzx	eax, [ebx+device.irq_line]
+; Lets find out if we are really in 32-bit mode now..
+	set_io	0
-	DEBUGF	1,"Attaching int handler to irq %x\n",eax:1
+	set_io	PCNET_DWIO_RAP
-	stdcall AttachIntHandler, eax, int_handler, dword 0
+	mov	eax, 88
-	test	eax, eax
+	out	dx , eax
-	jnz	@f
+	nop
-	DEBUGF	1,"\nCould not attach int handler!\n"
+	nop
-;        or      eax, -1
+	in	eax, dx
-;        ret
+	set_io	0
-  @@:
+	and	eax, 0xffff
+	cmp	eax, 88
-	mov	edx, [ebx + device.io_addr]
+	je	.yes_dwio
-	call	[ebx + device.access_reset]
 	call	switch_to_wio			; it seem to have failed, reset device again and use wio
-	; Switch pcnet32 to 32bit mode
+	set_io	0
-	mov	ecx, PCNET_BCR_SSTYLE
+	call	[device.access_reset]
 	mov	eax, 2
-	call	[ebx + device.access_write_bcr]
+  .yes_dwio:
 	; set/reset autoselect bit
 	mov	ecx, PCNET_BCR_MISCCFG
-	call	[ebx + device.access_read_bcr]
+	call	[device.access_read_bcr]
 	and	eax,not 2
-	test	[ebx + device.options], PCNET_PORT_ASEL
+	test	[device.options], PCNET_PORT_ASEL
 	jz	.L1
 	or	eax, 2
   .L1:
-	call	[ebx + device.access_write_bcr]
+	call	[device.access_write_bcr]
 	; Handle full duplex setting
-	cmp	byte [ebx + device.full_duplex], 0
+	cmp	byte [device.full_duplex], 0
 	je	.L2
 	mov	ecx, PCNET_BCR_DUPLEX
-	call	[ebx + device.access_read_bcr]
+	call	[device.access_read_bcr]
 	and	eax, not 3
-	test	[ebx + device.options], PCNET_PORT_FD
+	test	[device.options], PCNET_PORT_FD
 	jz	.L3
 	or	eax, 1
-	cmp	[ebx + device.options], PCNET_PORT_FD or PCNET_PORT_AUI
+	cmp	[device.options], PCNET_PORT_FD or PCNET_PORT_AUI
 	jne	.L4
 	or	eax, 2
 	jmp	.L4
   .L3:
-	test	[ebx + device.options], PCNET_PORT_ASEL
+	test	[device.options], PCNET_PORT_ASEL
 	jz	.L4
-	cmp	[ebx + device.chip_version], 0x2627
+	cmp	[device.chip_version], 0x2627
 	jne	.L4
 	or	eax, 3
   .L4:
 	mov	ecx, PCNET_BCR_DUPLEX
-	call	[ebx + device.access_write_bcr]
+	call	[device.access_write_bcr]
   .L2:
 	; set/reset GPSI bit in test register
 	mov	ecx, 124
-	call	[ebx + device.access_read_csr]
+	call	[device.access_read_csr]
-	mov	ecx, [ebx + device.options]
+	mov	ecx, [device.options]
 	and	ecx, PCNET_PORT_PORTSEL
 	cmp	ecx, PCNET_PORT_GPSI
 	jne	.L5
 	or	eax, 0x10
   .L5:
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
-	cmp	[ebx + device.mii], 0
+	cmp	[device.mii], 0
 	je	.L6
-	test	[ebx + device.options], PCNET_PORT_ASEL
+	test	[device.options], PCNET_PORT_ASEL
 	jnz	.L6
 	mov	ecx, PCNET_BCR_MIICTL
-	call	[ebx + device.access_read_bcr]
+	call	[device.access_read_bcr]
 	and	eax,not 0x38
-	test	[ebx + device.options], PCNET_PORT_FD
+	test	[device.options], PCNET_PORT_FD
 	jz	.L7
 	or	eax, 0x10
   .L7:
-	test	[ebx + device.options], PCNET_PORT_100
+	test	[device.options], PCNET_PORT_100
 	jz	.L8
 	or	eax, 0x08
   .L8:
-	call	[ebx + device.access_write_bcr]
+	call	[device.access_write_bcr]
 	jmp	.L9
 .L6:
-	test	[ebx + device.options], PCNET_PORT_ASEL
+	test	[device.options], PCNET_PORT_ASEL
 	jz	.L9
 	mov	ecx, PCNET_BCR_MIICTL
 	DEBUGF 1,"ASEL, enable auto-negotiation\n"
-	call	[ebx + device.access_read_bcr]
+	call	[device.access_read_bcr]
 	and	eax, not 0x98
 	or	eax, 0x20
-	call	[ebx + device.access_write_bcr]
+	call	[device.access_write_bcr]
 .L9:
-	cmp	[ebx + device.ltint],0
+	cmp	[device.ltint],0
 	je	.L10
 	mov	ecx,5
-	call	[ebx + device.access_read_csr]
+	call	[device.access_read_csr]
 	or	eax,(1 shl 14)
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
 .L10:
-	mov	eax,[ebx  + device.options]
+	mov	eax, [device.options]
-	and	eax,PCNET_PORT_PORTSEL
+	and	eax, PCNET_PORT_PORTSEL
-	shl	eax,7
+	shl	eax, 7
-	mov	[ebx + device.mode_],ax
+	mov	[device.mode_], ax
-	mov	dword [ebx + device.filter], -1
+	mov	dword [device.filter], -1
-	mov	dword [ebx + device.filter+4], -1
+	mov	dword [device.filter+4], -1
 	call	read_mac
-	lea	esi, [ebx + device.mac]
+	lea	esi, [device.mac]
-	lea	edi, [ebx + device.phys_addr]
+	lea	edi, [device.phys_addr]
 	movsd
 	movsw
-	lea	eax, [ebx + device.private]
+	lea	eax, [device.private]
 	mov	ecx, eax
 	and	ecx, 0xFFF ; KolibriOS PAGE SIZE
 	call	GetPgAddr
 	add	eax, ecx
 	push	eax
 	and	eax, 0xffff
 	mov	ecx, 1
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
 	pop	eax
 	shr	eax,16
 	mov	ecx,2
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
 	mov	ecx,4
 	mov	eax,0x0915
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
 	mov	ecx,0
 	mov	eax,1
+	call	[device.access_write_csr]
+	mov	[device.tx_full],0
+	mov	[device.cur_rx],0
+	mov	[device.cur_tx],0
-	call	[ebx + device.access_write_csr]
+	mov	[device.dirty_rx],0
 	jg	.finish 			; packet is too long
 	cmp	dword [esp+8], 60
 	jl	.finish 			; packet is too short
 ; check descriptor
-	movzx	eax, [ebx + device.cur_tx]
+	movzx	eax, [device.cur_tx]
 	imul	edi, eax, PCNET_PKT_BUF_SZ
 	shl	eax, 4
-	add	edi, [ebx + device.tx_buffer]
+	add	edi, [device.tx_buffer]
-	add	eax, [ebx + device.tx_ring]
+	add	eax, [device.tx_ring]
 	test	byte [eax + buf_head.status + 1], 80h
 	jnz	.nospace
 ; descriptor is free, copy data
 	mov	esi, [esp+4]
 ; put to transfer queue
 	mov	[eax + buf_head.status], 0x8300
 ; trigger an immediate send
 	xor	ecx, ecx	 ; CSR0
-	call	[ebx + device.access_read_csr]
+	call	[device.access_read_csr]
 	or	eax, PCNET_CSR_TX
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
 ; get next descriptor 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, ...
-	inc	[ebx + device.cur_tx]
+	inc	[device.cur_tx]
-	and	[ebx + device.cur_tx], 3
+	and	[device.cur_tx], 3
+	DEBUGF	2," - Packet Sent! "
+.finish:
+; update statistics
+	inc	[device.packets_tx]
-	DEBUGF	2," - Packet Sent! "
+	mov	ecx, [esp+8]
 	add	dword [device.bytes_tx], ecx
-.finish:
+	adc	dword [device.bytes_tx + 4], 0
 	DEBUGF	2," - Done!\n"
 ;;;;;;;;;;;;;;;;;;;;;;;
 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, PCNET_LIST
 	mov	ecx, [PCNET_DEV]
 	test	ecx, ecx
+	jz	.abort
-	jz	.abort
+  .nextdevice:
-  .nextdevice:
+	mov	ebx, [esi]
-	mov	ebx, dword [esi]
+	DEBUGF	1,"device=%x? ", ebx
-	mov	edx, [ebx + device.io_addr]	; get IRQ reason
+	set_io	0
 	push	ecx
 	xor	ecx, ecx ; CSR0
-	call	[ebx + device.access_read_csr]
+	call	[device.access_read_csr]       ; get IRQ reason
 	pop	ecx
+	test	ax , ax
-	test	al , al
+	jnz	.got_it
 	js	.got_it
 	add	esi, 4
-	add	esi, 4
+	loop	.nextdevice
 	loop	.nextdevice
 	ret					; If no device was found, abort (The irq was probably for a device, not registered to this driver
 	ret					    ; If no device was found, abort (The irq was probably for a device, not registered to this driver
   .got_it:
-  .got_it:
+	DEBUGF	1,"yes, reason=%x ", ax
 ;-------------------------------------------------------
 ; Possible reasons:
 ; initialization done - ignore
 ; transmit done - ignore
 ; packet received - handle
 ; Clear ALL IRQ reasons.
 ; N.B. One who wants to handle more than one reason must be ready
 ; to two or more reasons in one IRQ.
 	xor	ecx, ecx
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
 ; Received packet ok?
 	test	ax, PCNET_CSR_RINT
 	jz	@f
 	push	.receiver_test_loop		;
 	push	ecx				; for eth_receiver
+	push	eax				;
+; update statistics
+	inc	[device.packets_rx]
+	add	dword [device.bytes_rx], ecx
-	push	eax				;
+	adc	dword [device.bytes_rx + 4], 0
+	xchg	edi, eax
+; copy packet data
+	shr	cx , 1
+	jnc	.nb
-	xchg	edi, eax
+	movsb
+  .nb:
-	push	ecx
+	shr	cx , 1
+	jnc	.nw
-	shr	ecx, 2
+	movsw
-	cld
-	rep	movsd
-	pop	ecx
-	and	ecx, 3
+  .nw:
-	rep	movsb
+	rep	movsd
 ;       mov     word [eax + buf_head.length], PCNET_PKT_BUF_SZ_NEG
+	mov	word [eax + buf_head.status], PCNET_RXSTAT_OWN	    ; Set OWN bit back to 1 (controller may write to tx-buffer again now)
 	mov	word [eax + buf_head.status], PCNET_RXSTAT_OWN	    ; Set OWN bit back to 1 (controller may write to tx-buffer again now)
 	inc	[device.cur_rx] 	  ; update descriptor
-	inc	[ebx + device.cur_rx]		; update descriptor
+	and	[device.cur_rx], 3	  ;
 	and	[ebx + device.cur_rx], 3	;
 	DEBUGF	1,"Inserting packet\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, [ebx + device.io_addr]
+	mov	edx, [device.io_addr]
-	add	dx, 2
+	add	edx, 2
 	xor	eax, eax
 	mov	ecx, PCNET_CSR_PAR0
        @@:
 	pop	ax
-	call	[ebx + device.access_write_csr]
+	call	[device.access_write_csr]
 	DEBUGF	1,"."
 ;;                  ;;
 ;; Read MAC address ;;
 ;;                  ;;
 ;;;;;;;;;;;;;;;;;;;;;;
-read_mac:				; T- OK
+read_mac:
 	DEBUGF	1,"Reading MAC"
-	mov	edx, [ebx + device.io_addr]
+	mov	edx, [device.io_addr]
-	add	dx, 6
+	add	edx, 6
        @@:
 	dec	dx
 	dec	dx
 	in	ax, dx
 	push	ax
 	DEBUGF	1,"."
-	cmp	edx, [ebx + device.io_addr]
+	cmp	edx, [device.io_addr]
 	jg	@r
 	DEBUGF	1," %x-%x-%x-%x-%x-%x\n",[esp+0]:2,[esp+1]:2,[esp+2]:2,[esp+3]:2,[esp+4]:2,[esp+5]:2
-	lea	edi, [ebx + device.mac]
+	lea	edi, [device.mac]
 	pop	ax
 	ret
+switch_to_wio:
-switch_to_wio:
+	DEBUGF	1,"Switch to WIO\n"
-	mov	[ebx + device.access_read_csr], wio_read_csr
+	mov	[device.access_read_csr], wio_read_csr
-	mov	[ebx + device.access_write_csr], wio_write_csr
+	mov	[device.access_write_csr], wio_write_csr
-	mov	[ebx + device.access_read_bcr], wio_read_bcr
+	mov	[device.access_read_bcr], wio_read_bcr
-	mov	[ebx + device.access_write_bcr], wio_write_bcr
+	mov	[device.access_write_bcr], wio_write_bcr
-	mov	[ebx + device.access_read_rap], wio_read_rap
+	mov	[device.access_read_rap], wio_read_rap
+	mov	[device.access_write_rap], wio_write_rap
-	mov	[ebx + device.access_write_rap], wio_write_rap
+	mov	[device.access_reset], wio_reset
-	mov	[ebx + device.access_reset], wio_reset
+	ret
-	ret
+switch_to_dwio:
-switch_to_dwio:
+	DEBUGF	1,"Switch to DWIO\n"
-	mov	[ebx + device.access_read_csr], dwio_read_csr
+	mov	[device.access_read_csr], dwio_read_csr
 	out	dx , ax
 	sub	edx, PCNET_WIO_RAP
-	ret
 	ret
 wio_reset:
 	sub	edx, PCNET_WIO_RESET
-	ret
 	ret
 ; ecx - index
-	ret
-adjust_pci_device:
-	;*******Get current setting************************
-	movzx	 edx, byte [ebx + device.pci_dev]
-	movzx	 ecx, byte [ebx + device.pci_bus]
-	push	ecx edx
-	stdcall  PciRead16, ecx ,edx ,0x04
-	pop	edx ecx
-;        ;******see if its already set as bus master********
-;        and      ax,5
-;        cmp      ax,5
-;        je       .Latency
-	;******Make card a bus master*******
-	or	 al, 5
-	stdcall  PciWrite16, ecx ,edx ,0x04, eax
-	;******Check latency setting***********
-  .Latency:
-   ;*******Get current latency setting************************
-;   mov     al, 1                                       ;read a byte
-;   mov     bh, [pci_dev]
-;   mov     ah, [pci_bus]
-;   mov     bl, 0x0D                                ;from Lantency Timer Register
-;   call    pci_read_reg
-   ;******see if its aat least 64 clocks********
-;   cmp      ax,64
-;   jge      PCNET_adjust_pci_device_Done
-   ;******Set latency to 32 clocks*******
-;   mov     cx, 64                              ;value to write
-;   mov     bh, [pci_dev]
-;   mov     al, 1                               ;write a byte
-;   mov     ah, [pci_bus]
-;   mov     bl, 0x0D                            ;to Lantency Timer Register
-;   call    pci_write_reg
-   ;******Check latency setting***********
-  .Done:
-	ret
 	ret

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/drivers/pcnet32.asm – Rev 1377 → 1492