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

 	.ver_id 		  db ?
 	.full_bus_master	  db ?
 	.has_hwcksm		  db ?
 	.preamble		  db ?
 	.dn_list_ptr_cleared	  db ?
-	.self_directed_packet	  rb 20
 	.size = $ - device
 	mov	ecx, [BOOMERANG_DEVICES]
 	add	ecx, [VORTEX_DEVICES]
 	cmp	ecx, MAX_DEVICES			; First check if the driver can handle one more card
 	jge	.fail
-	push	edx
-	stdcall KernelAlloc, dword device.size		; Allocate the buffer for eth_device structure
-	pop	edx
-	test	eax, eax
-	jz	.fail
-	mov	ebx, eax				; ebx is always used as a pointer to the structure (in driver, but also in kernel code)
+	allocate_and_clear ebx, device.size, .fail	; Allocate the buffer for device structure
 ; Fill in the direct call addresses into the struct
 	movzx	ecx, [device.ver_id]
 	test	word [hw_versions+2+ecx*4], IS_VORTEX
-	jz	.not_vortex
 	jz	.not_vortex
-	mov	eax, [VORTEX_DEVICES]					       ; Add the device structure to our device list
+	mov	eax, [VORTEX_DEVICES]					; Add the device structure to our device list
 	mov	[VORTEX_LIST+4*eax], ebx				; (IRQ handler uses this list to find device)
-	inc	[VORTEX_DEVICES]					       ;
 	inc	[VORTEX_DEVICES]					;
   .register:
   .register:
 	mov	[device.type], NET_TYPE_ETH
 	call	NetRegDev
 	cmp	eax, -1
-	je	.destroy
+	cmp	eax, -1
-	call	start
+	je	.destroy
-	ret
+	call	start_device
+	ret
   .not_vortex:
   .not_vortex:
 	mov	eax, [BOOMERANG_DEVICES]					  ; Add the device structure to our device list
 	mov	ax, 1
 	out	dx, ax			      ; enable card
 	call	write_mac
 	call	rx_reset
-	call	tx_reset
+;<<<<<<<<<<<<<<
 	out	dx, ax
 	call	set_rx_mode
+	call	set_active_port
+;>>>>>>>>>>
+	call	create_rx_ring
+	call	rx_reset
+	call	tx_reset
-	call	set_active_port
+;>>>>>>>>>>>>>>>>>>
 	set_io	0
 	set_io	REG_COMMAND
 align 4
-align 4
+start_device:
-start:
+	DEBUGF	1,"Starting the device\n"
 ; wait for linkDetect
 	set_io	REG_MEDIA_STATUS
 	mov	ecx, 20 ; wait for max 2s
-.link_detect_loop:
+  .link_detect_loop:
-	mov	esi, 10
+	mov	esi, 100
-	stdcall Sleep ; 100 ms
+	call	Sleep ; 100 ms
 	in	ax, dx
 	test	ah, 1000b ; linkDetect
 	jnz	@f
+	loop	.link_detect_loop
-	loop	.link_detect_loop
+	DEBUGF	1,"Link detect timed-out!\n"
-@@:
+       @@:
 ; print link type
 	xor	eax, eax
 	bsr	ax, word [device.mode]
 	jz	@f
+	sub	ax, 4
-	sub	ax, 4
+       @@:
 @@:
+	mov	esi, [link_str+eax*4]
-	mov	esi, [link_str+eax*4]
-	DEBUGF 1,"Established Link type: %s\n", esi
+	DEBUGF	1,"Established Link type: %s\n", esi
 ; enable interrupts
 	set_io	0
 	out	dx, ax
 	mov	ax, SetIntrEnb + S_5_INTS
-	out	dx, ax
-	set_io	0
-	set_io	REG_COMMAND
-	mov	ax, SELECT_REGISTER_WINDOW + 1
 	out	dx, ax
+align 4
+set_rx_mode:
 align 4
-set_rx_mode:
+	DEBUGF	1,"Setting RX mode\n"
 	set_io	0
 	set_io	REG_COMMAND
-	if	defined PROMISCIOUS
+if	defined PROMISCIOUS
 	mov	ax, SetRxFilter + RxStation + RxMulticast + RxBroadcast + RxProm
-	else if  defined ALLMULTI
+else if  defined ALLMULTI
-	mov	ax, SetRxFilter + RxStation + RxMulticast + RxBroadcast
-	else
+	mov	ax, SetRxFilter + RxStation + RxMulticast + RxBroadcast
-	mov	ax, SetRxFilter + RxStation + RxBroadcast
+else
 ;***************************************************************************1
 align 4
 global_reset:
-	DEBUGF 1,"Global reset: "
+	DEBUGF 1,"Global reset..\n"
 ; GlobalReset
 ; wait for GlobalReset to complete
 	mov	ecx, 64000
-.loop:
+  .loop:
 	in	ax , dx
 	test	ah , 10000b ; check CmdInProgress
-;        jz      .finish
 	loopz	.loop
-;.finish:
-;        DEBUGF 1,"Waiting for nic to boot..\n"
+	DEBUGF 1,"Waiting for nic to boot..\n"
 ; wait for 2 seconds for NIC to boot
-	mov	esi, 200
+	mov	esi, 2000
-	stdcall Sleep ; 2 seconds
+	call	Sleep ; 2 seconds
 	DEBUGF 1,"Ok!\n"
 ; wait for RxReset to complete
 	mov	ecx, 200000
   .loop:
 	in	ax, dx
 	test	ah, 10000b ; check CmdInProgress
+	jz	.done
 	dec	ecx
 	jnz	.loop
+  .done:
+	lea	eax, [device.upd_buffer]
+	mov	[device.curr_upd], eax
+	GetRealAddr
+	set_io	0
+	set_io	REG_UP_LIST_PTR
+	out	dx, eax
+  .rx_enable:
+	ret
+align 4
 create_rx_ring:
 ; create upd ring
 	lea	eax, [device.upd_buffer]
 	GetRealAddr
 	add	esi, upd.size
 	add	edi, upd.size
 	dec	ecx
 	jnz	.upd_loop
-	lea	eax, [device.upd_buffer]
-	mov	[device.curr_upd], eax
-	GetRealAddr
-	set_io	0
-	set_io	REG_UP_LIST_PTR
-	out	dx, eax
   .rx_enable:
-	ret
 	ret
 ;---------------------------------------------------------------------------
 try_link_detect:
-	DEBUGF 1,"trying to detect link\n"
+	DEBUGF	1,"trying to detect link\n"
+; create self-directed packet
+	stdcall KernelAlloc, 20 ; create a buffer for the self-directed packet
+	test	eax, eax
+	jz	.fail
+	pushd	20		; Packet parameters for device.transmit
+	push	eax		;
 	mov	edi, eax
-; create self-directed packet
 	lea	esi, [device.mac]
-	lea	edi, [device.self_directed_packet]
+	lea	esi, [device.mac]
 	movsw
 	movsd
 	sub	esi, 6
 	movsw
 	movsd
 	mov	ax , 0x0608
-	stosw
-; download self-directed packet
-	push	20
+	stosw
 	lea	eax, [device.self_directed_packet]
-	push	eax
+; download self-directed packet
 	call	[device.transmit]
 	jnz	.link_detected
 	xor	al, al
 	jmp	.finish
+  .link_detected:
-.link_detected:
+	DEBUGF	1,"link detected!\n"
 	setb	al
-.finish:
+  .finish:
 	test	al, al
 	jz	@f
 	or	byte [device.mode+1], 100b
+       @@:
+	ret
-@@:
+  .fail:
 	ret
 ;***************************************************************************
 ;   Function
 ;      try_phy
 ;   Description
 ;      try_phy checks the auto-negotiation function
 ;      in the PHY at PHY index. It can also be extended to
 ;      include link detection for non-IEEE 802.3u
-;      auto-negotiation devices, for instance the BCM5000.
+;      auto-negotiation devices, for instance the BCM5000.              ; TODO: BCM5000
 ;***************************************************************************
 align 4
 try_phy:
 	DEBUGF 1,"PHY=%u\n", ah
-	DEBUGF 1,"trying phy\n"
+	DEBUGF 1,"Detecting if device is auto-negotiation capable\n"
 	mov	al, REG_MII_BMCR
 	push	eax
 	call	mdio_read	; returns with window #4
 	or	ah , 0x80	; software reset
 	mov	esi, eax
 	mov	eax, dword [esp]
 	call	mdio_write	; returns with window #4
 ; wait for reset to complete
-	mov	esi, 200
+	mov	esi, 2000
 	stdcall Sleep	   ; 2s
 	mov	eax, [esp]
 	call	mdio_read	; returns with window #4
 	test	ah , 0x80
-	jnz	.fail_finish
+	jnz	.fail1
 	mov	eax, [esp]
 ; wait for a while after reset
-	mov	esi, 2
+	mov	esi, 20
 	stdcall Sleep	   ; 20ms
 	mov	eax, [esp]
 	mov	al , REG_MII_BMSR
-	call	mdio_read	; returns with window #4
+	call	mdio_read	 ; returns with window #4
+	test	al , 1		 ; extended capability supported?
+	jz	.fail2
 	test	al , 1		 ; extended capability supported?
-	jz	.no_ext_cap
+; auto-neg capable?
 	test	al , 1000b
+	jz	.fail2		 ; not auto-negotiation capable
-; auto-neg capable?
+	DEBUGF	1,"Device is auto-negotiation capable\n"
 	test	al , 1000b
-	jz	.fail_finish	; not auto-negotiation capable
+; auto-neg complete?
 	test	al , 100000b
-; auto-neg complete?
+	jnz	.auto_neg_ok
 	call	mdio_read	; returns with window #4
 	mov	esi, eax
 	or	bh , 10010b	; restart auto-negotiation
 	mov	eax, [esp]
 	call	mdio_write	; returns with window #4
-	mov	esi, 400
+	mov	esi, 4000
 	stdcall Sleep  ; 4 seconds
 	mov	eax, [esp]
 	mov	al , REG_MII_BMSR
 	call	mdio_read ; returns with window #4
 	test	al , 100000b ; auto-neg complete?
 	jnz	.auto_neg_ok
-	jmp	.fail_finish
+	jmp	.fail3
-.auto_neg_ok:
+  .auto_neg_ok:
+	DEBUGF	1,"Auto-negotiation complete\n"
 ; compare advertisement and link partner ability registers
 	mov	eax, [esp]
 	mov	al , REG_MII_ANAR
 	call	mdio_read	; returns with window #4
 	pop	esi
 	test	esi, 1010b shl 5; check for full-duplex
 	jz	.half_duplex
 	or	ax , 0x120	; set full duplex and flow control
-.half_duplex:
+  .half_duplex:
+	DEBUGF 1,"Using half-duplex\n"
 	out	dx , ax
 	mov	al , 1
 	ret
-.no_ext_cap:
+  .fail1:
+	DEBUGF	1,"reset failed!\n"
+	pop	eax
+	xor	al, al
+	ret
+  .fail2:
+	DEBUGF	1,"This device is not auto-negotiation capable!\n"
+	pop	eax
+	xor	al, al
+	ret
-; not yet implemented BCM5000
+  .fail3:
-.fail_finish:
+	DEBUGF	1,"auto-negotiation reset failed!\n"
 	pop	eax
 	xor	al, al
 ;***************************************************************************
 align 4
 try_mii:
-	DEBUGF 1,"trying mii\n"
+	DEBUGF	1,"trying to find MII PHY\n"
 ; switch to register window 3
 	set_io	REG_INTERNAL_CONFIG
 	in	eax, dx
 	and	eax, (1111b shl 20)
 	cmp	eax, (1000b shl 20) ; is auto-negotiation set?
 	jne	.mii_device
-; auto-negotiation is set
+	DEBUGF	1,"auto-negotiation is set\n"
 ; switch to register window 4
 	set_io	REG_COMMAND
 	mov	ax , SELECT_REGISTER_WINDOW+4
 	out	dx , ax
 ; PHY==24 is the on-chip auto-negotiation logic
 ; it supports only 10base-T and 100base-TX
 	mov	ah , 24
 	call	try_phy
 	test	al , al
 	jz	.fail_finish
 	mov	cl , 24
 	jmp	.check_preamble
-.mii_device:
+  .mii_device:
 	cmp	eax, (0110b shl 20)
 	jne	.fail_finish
 	set_io	0
 	set_io	REG_COMMAND
 	mov	ax , SELECT_REGISTER_WINDOW+4
 	out	dx , ax
 	set_io	REG_PHYSICAL_MGMT
 	in	ax , dx
 	and	al , (1 shl BIT_MGMT_DIR) or (1 shl BIT_MGMT_DATA)
 	cmp	al , (1 shl BIT_MGMT_DATA)
 	je	.search_for_phy
 	xor	al , al
 	ret
-.search_for_phy:
+  .search_for_phy:
 ; search for PHY
 	mov	cx , 31
-.search_phy_loop:
+  .search_phy_loop:
+	DEBUGF	1,"Searching the PHY\n"
 	cmp	cx , 24
 	je	.next_phy
 	mov	ah , cl ; ah = phy
 	mov	al , REG_MII_BMCR ; al = Basic Mode Status Register
 	push	cx
 	pop	cx
 	test	al , al
 	jnz	.check_preamble
-.next_phy:
+  .next_phy:
 	loopw	.search_phy_loop
-.fail_finish:
+  .fail_finish:
 	xor	al, al
 	ret
 ; epilog
-.check_preamble:
+  .check_preamble:
+	DEBUGF	1,"Using PHY: %u\nChecking PreAmble\n", cl
 	push	eax ; eax contains the return value of try_phy
 ; check hard coded preamble forcing
 	movzx	eax, [device.ver_id]
 	test	word [eax*4+hw_versions+2], EXTRA_PREAMBLE
 	setnz	[device.preamble] ; force preamble
 	jnz	.finish
 ; check mii for preamble suppression
 	mov	ah, cl
 	mov	al, REG_MII_BMSR
 	call	mdio_read
 	test	al, 1000000b ; preamble suppression?
 	setz	[device.preamble] ; no
-.finish:
+  .finish:
 	pop	eax
 	ret
 ; issue RxEnable and TxEnable
 	call	rx_reset
 	call	tx_reset
+; create self-directed packet
+	stdcall KernelAlloc, 20 ; create a buffer for the self-directed packet
+	test	eax, eax
+	jz	.fail
+	pushd	20		; Packet parameters for device.transmit
+	push	eax		;
-; download a self-directed test packet
-	lea	esi, [device.mac]
+	mov	edi, eax
-	lea	edi, [device.self_directed_packet]
+	lea	esi, [device.mac]
 	movsw
 	movsd
 	sub	esi, 6
 	movsw
 	movsd
-	mov	ax , 0x0608
-	stosw
+	mov	ax , 0x0608
-	push	20
+	stosw
 	lea	eax, [device.self_directed_packet]
-	push	eax
+; download self-directed packet
 	call	[device.transmit]
 ; wait for 2s
-	mov	esi, 200
+	mov	esi, 2000
-	stdcall Sleep	 ; 2s
+	call	Sleep
 ; clear fullDuplexEnable in MacControl register
 	set_io	REG_MAC_CONTROL
 	in	ax , dx
 	and	ax , not 0x120
 	out	dx , ax
+  .fail:
 	xor	eax, eax
-.finish:
+  .finish:
 	jz	.complete_loopback
 ; enable 100BASE-2 DC-DC converter
 	mov	ax, (10b shl 11) ; EnableDcConverter
 	out	dx, ax
-.complete_loopback:
+  .complete_loopback:
 	mov	cx, 2 ; give a port 3 chances to complete a loopback
-.next_try:
+  .next_try:
 	push	ecx
 	call	test_packet
 	pop	ecx
 	test	eax, eax
 	loopzw	.next_try
-.finish:
+  .finish:
 	xchg	eax, [esp]
 	test	al, al
 	jz	.aui_finish
 ; issue DisableDcConverter command
 	set_io	0
 	set_io	REG_COMMAND
 	mov	ax, (10111b shl 11)
 	out	dx, ax
 ;***************************************************************************
 align 4
 set_active_port:
-	DEBUGF 1,"Setting active port: "
+	DEBUGF 1,"Trying to find the active port\n"
 ; switch to register window 3
 	set_io	0
+	set_io	REG_COMMAND
-	set_io	REG_COMMAND
+	mov	ax, SELECT_REGISTER_WINDOW + 3
-	mov	ax, SELECT_REGISTER_WINDOW+3
+	out	dx, ax
 	out	dx, ax
 	set_io	REG_INTERNAL_CONFIG
 	call	try_mii
 	test	al, al
 	jz	.mii_device
 	DEBUGF 1,"Using auto negotiation\n"
 	ret
-.mii_device:
   .mii_device:
 ; switch to register window 3
-	set_io	0
-	set_io	REG_COMMAND
-	mov	ax, SELECT_REGISTER_WINDOW+3
-	out	dx, ax
 	set_io	0
 ; check for off-chip mii device
 	set_io	REG_MEDIA_OPTIONS
 	in	ax, dx
 	test	al, 1000000b ; check miiDevice
 	call	try_mii
 	test	al, al
 	jz	.base_fx
 	DEBUGF 1,"Using off-chip mii device\n"
 	ret
-.base_fx:
   .base_fx:
 ; switch to register window 3
-	set_io	0
-	set_io	REG_COMMAND
-	mov	ax, SELECT_REGISTER_WINDOW+3
-	out	dx, ax
+	set_io	0
 ; check for 100BASE-FX
 	set_io	REG_MEDIA_OPTIONS
 	in	ax, dx ; read media option register
 	test	al, 100b ; check 100BASE-FX
 	call	try_link_detect
 	test	al, al
 	jz	.aui_enable
 	DEBUGF 1,"Using 100Base-FX\n"
 	ret
-.aui_enable:
   .aui_enable:
 ; switch to register window 3
-	set_io	0
-	set_io	REG_COMMAND
-	mov	ax, SELECT_REGISTER_WINDOW+3
-	out	dx, ax
+	set_io	0
 ; check for 10Mbps AUI connector
 	set_io	REG_MEDIA_OPTIONS
 	in	ax, dx ; read media option register
 	test	al, 100000b ; check 10Mbps AUI connector
 	call	try_loopback
 	test	al, al
 	jz	.coax_available
 	DEBUGF 1,"Using 10Mbps aui\n"
 	ret
-.coax_available:
   .coax_available:
 ; switch to register window 3
-	set_io	0
-	set_io	REG_COMMAND
-	mov	ax, SELECT_REGISTER_WINDOW+3
-	out	dx, ax
+	set_io	0
 ; check for coaxial 10BASE-2 port
 	set_io	REG_MEDIA_OPTIONS
 	in	ax, dx ; read media option register
 	test	al, 10000b ; check 10BASE-2
+	jz	.set_first_available_media
 	jz	.set_first_available_media
 	set_io	REG_INTERNAL_CONFIG
 	in	eax, dx
 	and	eax, not (1111b shl 20)
 	or	eax, (0011b shl 20) ; set 10BASE-2
 	call	try_loopback
 	test	al, al
 	jz	.set_first_available_media
 	DEBUGF 1,"Using 10BASE-2 port\n"
 	ret
-.set_first_available_media:
+  .set_first_available_media:
 	DEBUGF	1,"Using the first available media\n"
 ;***************************************************************************
 ;   Function
 ;      set_available_media
 ;   Description
 ;      sets the first available media
 ;   Parameters
-;      ebp - io_addr
+;      ebx - ptr to device struct
 ;   Return value
 ;      al - 0
 ;      al - 1
 ;***************************************************************************
 align 4
 set_available_media:
 	DEBUGF 1,"Using the first available media\n"
 	DEBUGF	1,"Setting the available media\n"
 ; switch to register window 3
 	set_io	0
 	set_io	REG_COMMAND
-	mov	ax, SELECT_REGISTER_WINDOW+3
-	out	dx, ax
-	set_io	REG_INTERNAL_CONFIG
+	mov	ax, SELECT_REGISTER_WINDOW+3
-	in	eax, dx
+	out	dx, ax
 	push	eax
+	set_io	REG_MEDIA_OPTIONS
-	set_io	REG_MEDIA_OPTIONS
+	in	ax, dx
+	DEBUGF	1,"available media:%x\n", al
+	mov	cl, al
+	set_io	REG_INTERNAL_CONFIG
+	in	eax, dx
+	and	eax, not (1111b shl 20) ; these bits hold the 'transceiver select' value
 	in	ax, dx
-	test	al, 10b
-	jz	@f
+	test	cl, 10b 	; baseTXAvailable
-; baseTXAvailable
+	jz	@f
 	pop	eax
-	and	eax, not (1111b shl 20)
+	DEBUGF	1,"base TX is available\n"
 	or	eax, (100b shl 20)
 if defined FORCE_FD
 	mov	word [device.mode], (1 shl 8)
 else
 	mov	word [device.mode], (1 shl 7)
 end if
+	jmp	.set_media
-	jmp	.set_media
+       @@:
 @@:
-	test	al, 100b
-	jz	@f
-; baseFXAvailable
-	pop	eax
+	test	cl, 100b	; baseFXAvailable
+	jz	@f
 	and	eax, not (1111b shl 20)
-	or	eax, (101b shl 20)
 	DEBUGF	1,"base FX is available\n"
-	mov	word [device.mode], (1 shl 10)
+	or	eax, (101b shl 20)
+	mov	word [device.mode], (1 shl 10)
+	jmp	.set_media
-	jmp	.set_media
+       @@:
-@@:
-	test	al, 1000000b
-	jz	@f
-; miiDevice
+	test	cl, 1000000b	; miiDevice
-	pop	eax
+	jz	@f
-	and	eax, not (1111b shl 20)
 	or	eax, (0110b shl 20)
 	DEBUGF	1,"mii-device is available\n"
+	or	eax, (0110b shl 20)
 	mov	word [device.mode], (1 shl 13)
 	jmp	.set_media
+       @@:
-	jmp	.set_media
+	test	cl, 1000b	; 10bTAvailable
-@@:
-	test	al, 1000b
-	jz	@f
-.set_default:
+	jz	@f
 ; 10bTAvailable
-	pop	eax
+	DEBUGF	1,"10base-T is available\n"
-	and	eax, not (1111b shl 20)
+  .set_default:
 if FORCE_FD
 	mov	word [device.mode], (1 shl 6)
 else
+	mov	word [device.mode], (1 shl 5)
-	mov	word [device.mode], (1 shl 5)
+end if
-end if ; FORCE_FD
+	jmp	.set_media
+       @@:
-	jmp	.set_media
+	test	cl, 10000b	; coaxAvailable
-@@:
+	jz	@f
 	test	al, 10000b
-	jz	@f
+	DEBUGF	1,"coax is available\n"
-; coaxAvailable
+	push	eax
-	set_io	REG_COMMAND
-	mov	ax, (10b shl 11) ; EnableDcConverter
+	set_io	REG_COMMAND
-	out	dx, ax
+	mov	ax, (10b shl 11) ; EnableDcConverter
-	pop	eax
-	and	eax, not (1111b shl 20)
+	out	dx, ax
-	or	eax, (11b shl 20)
+	pop	eax
+	or	eax, (11b shl 20)
 	mov	word [device.mode], (1 shl 12)
-	jmp	.set_media
-@@:
-	test	al, 10000b
+	jmp	.set_media
+       @@:
 	jz	.set_default
-; auiAvailable
+	test	cl, 10000b	; auiAvailable
+	jz	.set_default
 	pop	eax
-	and	eax, not (1111b shl 20)
+	DEBUGF	1,"AUI is available\n"
+	or	eax, (1 shl 20)
-	or	eax, (1 shl 20)
+	mov	word [device.mode], (1 shl 11)
-	mov	word [device.mode], (1 shl 11)
+  .set_media:
 	set_io	0
-.set_media:
+	set_io	REG_INTERNAL_CONFIG
-	set_io	REG_INTERNAL_CONFIG
+	out	dx, eax
-	out	dx, eax
-if FORCE_FD
+if FORCE_FD
-; set fullDuplexEnable in MacControl register
+	DEBUGF	1,"Forcing full duplex\n"
 	set_io	REG_MAC_CONTROL
 	stdcall PciRead32, ecx, edx, PCI_REG_STATUS
 	test	al, 10000b	; is there "new capabilities" linked list?
-	jz	.device_awake
-	DEBUGF 1,"1 "
+	jz	.device_awake
 ; search for power management register
 	stdcall PciRead16, ecx, edx, PCI_REG_CAP_PTR
-	cmp	al, 0x3f
-	jbe	.device_awake
 	cmp	al, 0x3f
-	DEBUGF 1,"2 "
+	jbe	.device_awake
 ; traverse the list
 	jmp	.device_awake
 ; waku up the device if necessary
-.set_pm_state:
-	DEBUGF 1,"3 "
+  .set_pm_state:
 	add	esi, PCI_REG_PM_CTRL
 	stdcall PciRead32, ecx, edx, esi
 	test	al, 3
 	jz	.device_awake
-	and	al, not 11b ; set state to D0
+	and	al, not 11b ; set state to D0
 	stdcall PciWrite32, ecx, edx, esi, eax
 .device_awake:
 ;       pop     eax
 ;       or      ax, 01b shl 6
 ;       out     dx, ax
 ;.finish:
 ;       ret
 ;***************************************************************************
 ;   Function
 ;      read_eeprom
 ;   Description
 ;      reads eeprom
 ;       ax - register to be read (only the first 63 words can be read)
 ;      ebx = driver structure
 ;   Return value:
 ;      ax - word read
 ;   Destroyed registers
-;      ax, ebx, edx, ebp
+;      ax, ebx, edx
+;
 ;***************************************************************************
 align 4
 read_eeprom:
-	DEBUGF 1,"Reading from eeprom:\n"
+	DEBUGF 1,"Reading from eeprom.. "
 	push	eax
 ;***************************************************************************
 align 4
 mdio_read:
-	DEBUGF 1,"reading MII registers\n"
+	DEBUGF 1,"Reading MII registers\n"
 	push	eax
 	or	eax, 10b ; transition bits
 	shl	eax, 16
 	mov	ax, si
 	mov	esi, eax
 	mov	ecx, 31
-.cmd_loop:
+  .cmd_loop:
 	mov	ax, (1 shl BIT_MGMT_DIR) ; write mii
 	bt	esi, ecx
-	jnc	.zero_bit
+	jnc	@f
 	or	al, (1 shl BIT_MGMT_DATA)
-.zero_bit:
+       @@:
 	out	dx, ax
 	push	eax
 	in	ax, dx ; delay
 	pop	eax
 	or	al, (1 shl BIT_MGMT_CLK) ; write
 ; clear TxStatus queue
 	set_io	0
 	set_io	REG_TX_STATUS
+	mov	ecx, 31 ; max number of queue entries
 	mov	ecx, 31 ; max number of queue entries
-.tx_status_loop:
+  .tx_status_loop:
 	in	al, dx
 	test	al, al
 	jz	.finish ; no error
-.no_error_found:
+  .no_error_found:
 ; clear current TxStatus entry which advances the next one
 	xor	al, al
 	out	dx, al
 	loop	.tx_status_loop
-.finish:
+  .finish:
-;---------------------------------
-; Write MAC
+;---------------------------------
+; Write MAC
 align 4
-write_mac:   ; Tested - ok
+write_mac:
 	outsw
 	inc	dx
 	inc	dx
 	outsw
 ;----------------------------
-; Read MAC
 ; Read MAC
-align 4
-read_mac:    ; Tested - ok
 align 4
 read_mac:
-;------------------------------------
-; Read MAC from eeprom
+;------------------------------------
 ; Read MAC from eeprom
 	push	ecx
 	call	read_eeprom
 	pop	ecx
 	xchg	ah, al ; htons
 	mov	word [device.mac+ecx*2-2], ax
 	loop	.mac_loop
 	DEBUGF 1,"%x-%x-%x-%x-%x-%x\n",[device.mac]:2,[device.mac+1]:2,[device.mac+2]:2,[device.mac+3]:2,[device.mac+4]:2,[device.mac+5]:2
 	out	dx, ax
 ; check for master operation in progress
 	set_io	REG_MASTER_STATUS   ; TODO: use timeout and reset after timeout expired
-  .dma_loop:
-	xor	esi, esi
-	stdcall Sleep
+  .dma_loop:
 	in	ax, dx
 	test	ah, 0x80
 	jnz	.dma_loop

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/drivers/3c59x.asm – Rev 1519 → 1521