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

 	API_VERSION		equ 0x01000100
 	DRIVER_VERSION		equ 5
+	MAX_DEVICES		equ 16
-	MAX_DEVICES		equ 16
+	RBLEN			equ 3 ; Receive buffer size: 0==8K 1==16k 2==32k 3==64k
 	DEBUG			equ 1
 	__DEBUG__		equ 1
 	BIT_SELECTOR		equ 0 ; binary encoded selector CSMA/CD=00001
 	BIT_IFG1		equ 25
-	BIT_IFG0		equ 24
 	BIT_IFG0		equ 24
 	RBLEN			equ 2 ; Receive buffer size: 0==8K 1==16k 2==32k 3==64k
 	TXRR			equ 8 ; total retries = 16+(TXRR*16)
 	TX_MXDMA		equ 6 ; 0=16 1=32 2=64 3=128 4=256 5=512 6=1024 7=2048
 	ERTXTH			equ 8 ; in unit of 32 bytes e.g:(8*32)=256
 				    (1 shl BIT_AR) or \ 		; Accept Runt packets (smaller then 64 bytes)
 				    (1 shl BIT_AM)			; Accept multicast packets
 	RX_BUFFER_SIZE		equ (8192 shl RBLEN);+16
-	MAX_ETH_FRAME_SIZE	equ 1516 ; exactly 1514 wthout CRC
 	MAX_ETH_FRAME_SIZE	equ 1516 ; exactly 1514 wthout CRC
 	NUM_TX_DESC		equ 4
 	EE_93C46_REG_ETH_ID	equ 7 ; MAC offset
 	ETH_DEVICE
+	.rx_buffer	dd ?
-	.rx_buffer	dd ?
+	.tx_buffer	dd ?
 	.tx_buffer	dd ?
+	.rx_data_offset dd ?
-	.rx_data_offset dd ?
+	.io_addr	dd ?
-	.io_addr	dd ?
 	.curr_tx_desc	db ?
-	.last_tx_desc	db ?
+	.curr_tx_desc	db ?
 	.pci_bus	db ?
 	.pci_dev	db ?
 	find_irq [device.pci_bus], [device.pci_dev], [device.irq_line]
 	DEBUGF	2,"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
-	[device.pci_dev]:1,[device.pci_bus]:1,[device.irq_line]:1,[device.io_addr]:4
+; Allocate the receive buffer
+	stdcall CreateRingBuffer, dword (RX_BUFFER_SIZE), dword PG_SW
 	test	eax, eax
-	allocate_and_clear [device.rx_buffer], (RX_BUFFER_SIZE+MAX_ETH_FRAME_SIZE), .err
+	jz	.err
-   ;;     allocate_and_clear [device.tx_buffer], (TX_BUF_SIZE*NUM_TX_DESC), .err
+	mov	[device.rx_buffer], eax
   .destroy:
 	; todo: reset device into virgin state
   .err:
-	stdcall KernelFree, dword [device.rx_buffer]
-     ;;   stdcall KernelFree, dword [device.tx_buffer]
+	stdcall KernelFree, dword [device.rx_buffer]
-	stdcall KernelFree, ebx
 	stdcall KernelFree, ebx
   .fail:
 	or	eax, -1
 	mov	al , (1 shl BIT_RE) or (1 shl BIT_TE)
 	set_io	REG_COMMAND
 	out	dx , al
-; 32k Rxbuffer, unlimited dma burst, no wrapping, no rx threshold
+; Rxbuffer size, unlimited dma burst, no wrapping, no rx threshold
 ; accept broadcast packets, accept physical match packets
 ; init RX/TX pointers
+	mov	[device.rx_data_offset], eax
+	mov	[device.curr_tx_desc], al
-	mov	[device.rx_data_offset], eax
-	mov	[device.curr_tx_desc], al
+;        set_io  REG_CAPR
-	mov	[device.last_tx_desc], al
+;        out     dx , ax
 	out	dx , eax
 ; set RxBuffer address, init RX buffer offset
+	mov	eax, [device.rx_buffer]
+	mov	dword[eax], 0
-	mov	eax, [device.rx_buffer]
+	DEBUGF	2,"RX buffer:%x\n", eax
-	call	GetPgAddr
+	GetRealAddr
-;        set_io  0
+	DEBUGF	2,"RX buffer:%X\n", eax
 	set_io	REG_RBSTART
 ;;     pointer to device structure in ebx  ;;
 ;;                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 align 4
 transmit:
-	DEBUGF	1,"Transmitting packet, buffer:%x, size:%u\n",[esp+4],[esp+8]
+	DEBUGF	1,"\nTransmitting packet, buffer:%x, size:%u\n",[esp+4],[esp+8]
 	mov	eax, [esp+4]
 	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	dword [esp+8], MAX_ETH_FRAME_SIZE
 	jg	.fail
 	cmp	dword [esp+8], 60
 	jl	.fail
-; check if we own the discriptor
+; check if we own the current discriptor
+	set_io	0
-	set_io	0
+	set_io	REG_TSD0
 	movzx	ecx, [device.curr_tx_desc]
 	shl	ecx, 2
-	lea	edx, [edx+ecx+REG_TSD0]
+	add	edx, ecx
-	in	ax, dx
+	in	eax, dx
-	test	ax, (1 shl BIT_OWN)
+	test	eax, (1 shl BIT_OWN)
 	jz	.wait_to_send
+  .send_packet:
+; get next descriptor
+	inc	[device.curr_tx_desc]
+	and	[device.curr_tx_desc], NUM_TX_DESC-1
+; Update stats
+	inc	[device.packets_tx]
+	mov	eax, [esp+8]
+	add	dword [device.bytes_tx], eax
 	adc	dword [device.bytes_tx + 4], 0
-  .send_packet:
-; Set the buffer address
-	set_io	0
+; Set the buffer address
-	lea	edx, [edx+ecx+REG_TSAD0]
+	set_io	REG_TSAD0
 	mov	eax, [esp+4]
 	mov	[device.TX_DESC+ecx], eax
 	GetRealAddr
 	out	dx, eax
 ; And the size of the buffer
-	set_io	0
+; And the size of the buffer
-	lea	edx, [edx+ecx+REG_TSD0]
+	set_io	REG_TSD0
-	mov	eax, [esp+8]
-;        or      eax, (ERTXTH shl BIT_ERTXTH)    ; Early threshold
-	out	dx , eax
-; Update stats
-	inc	[device.packets_tx]
-	add	dword [device.bytes_tx], eax
-	adc	dword [device.bytes_tx + 4], 0
-; get next descriptor
+	mov	eax, [esp+8]
-	inc	[device.curr_tx_desc]
+	or	eax, (ERTXTH shl BIT_ERTXTH)	; Early threshold
-	and	[device.curr_tx_desc], 3
+	out	dx, eax
-	DEBUGF	1,"Packet Sent! "
-	xor	eax, eax
+	DEBUGF	1,"Packet Sent!\n"
+	xor	eax, eax
 	ret	8
+  .wait_to_send:
-  .wait_to_send:
+	DEBUGF	1,"Waiting for timeout\n"
-	DEBUGF	1,"Waiting for timeout\n"
+	push	edx
 ;;                   ;;
 ;;;;;;;;;;;;;;;;;;;;;;;
 align 4
 int_handler:
-	DEBUGF	1,"IRQ %x\n", eax:2		      ; no, you cant replace 'eax:2' with 'al', this must be a bug in FDO
+	DEBUGF	1,"\nIRQ %x\n", 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
 	jz	.reset_rx
 ; packet is ok, copy it
+	movzx	ecx, word [eax+2]		    ; packet length
-	movzx	ecx, word [eax+2]		    ; packet length
+	sub	ecx, 4				    ; don't copy CRC
 ; Update stats
 	add	dword [device.bytes_rx], ecx
-	adc	dword [device.bytes_rx + 4], 0
-	inc	dword [device.packets_rx]
 	adc	dword [device.bytes_rx + 4], 0
-	sub	ecx, 4				    ; don't copy CRC
+	inc	dword [device.packets_rx]
 	DEBUGF	1,"Received %u bytes\n", ecx
 	rep	movsd
   .nd:
-	jmp	EthReceiver			    ; Send it to kernel
 	jmp	EthReceiver			    ; Send it to kernel
   .abort:
 	pop	eax ebx
 						    ; update eth_data_start_offset
 	jl	.no_wrap
 	DEBUGF	2,"Wrapping"
 	sub	eax, RX_BUFFER_SIZE
   .no_wrap:
 	mov	[device.rx_data_offset], eax
-	DEBUGF	1,"New RX ptr: %d ", eax
+	DEBUGF	1,"New RX ptr: %d\n", eax
 	set_io	0
 	set_io	REG_CAPR			    ; update 'Current Address of Packet Read register'
 	sub	eax, 0x10			    ; value 0x10 is a constant for CAPR
   .finish:
 	pop	ax
 ;----------------------------------------------------
-; Transmit error ?
+; Transmit ok / Transmit error
   @@:
+	test	ax, ISR_TOK + ISR_TER
+	jz	@f
+	push	ax
+	xor	ecx, ecx
+  .txdesloop:
+	set_io	0
+	set_io	REG_TSD0
+	add	edx, ecx
+	in	eax, dx
-	test	ax, ISR_TER
+	test	eax, TSR_OWN			; DMA operation completed
+	jz	.notthisone
-	jz	@f
-	DEBUGF	1,"Transmit error\n"
-;        push    ax
-;        cmp     [device.curr_tx_desc], 4
-;        jz      .notxd
-;
-;        set_io  0
 ;        movzx   ecx, [device.curr_tx_desc]
-;        lea     edx, [edx+ecx*4+REG_TSD0]
+	cmp	[device.TX_DESC+ecx], 0
-;        in      eax, dx
+	je	.notthisone
 ;  .notxd:
 ;        test    eax, TSR_CRS
 ;        jz      .nocsl
 ;        DEBUGF  2, "TX: Carrier Sense Lost!\n"
+;
 ;  .nocsl:
-;        pop     ax
-;----------------------------------------------------
-; Transmit ok ?
-  @@:
-	test	ax, ISR_TOK
-	jz	@f
-	push	ax
-	mov	si, 4
-  .txdesloop:
-	movzx	ecx, [device.last_tx_desc]
-	shl	ecx, 2
-	set_io	0
-	set_io	REG_TSD0
-	add	edx, ecx
-	in	eax, dx
-	test	eax, TSR_TOK
-	jz	.notthisone
-	mov	eax, TSR_OWN
 	out	dx , eax
+	DEBUGF	1,"TX OK: free buffer %x\n", [device.TX_DESC+ecx]:8
-	DEBUGF	1,"TX OK: free buffer %x\n", [device.TX_DESC+ecx]:8
+	push	ecx ebx
 	stdcall KernelFree, [device.TX_DESC+ecx]
-  .notthisone:
-	inc	[device.last_tx_desc]
+	pop	ebx ecx
+	mov	[device.TX_DESC+ecx], 0
-	and	[device.last_tx_desc], 3
+  .notthisone:
-	dec	si
-	jnz	.txdesloop
+	add	ecx, 4
 	cmp	ecx, 16
-  .done:
+	jl	.txdesloop
 	pop	ax

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/drivers/RTL8139.asm @ 1763 – Rev 1541 → 1556