[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/055030542b84
changeset: 466:055030542b84
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Mon Apr 23 12:19:35 2012 +0300
description:
Use DELAY instead of pause, to not panicing on deadlocks

diffstat:

 head/sys/dev/switch/rt305x_switch.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 5442226d4a72 -r 055030542b84 head/sys/dev/switch/rt305x_switch.c
--- a/head/sys/dev/switch/rt305x_switch.c	Mon Apr 23 12:18:29 2012 +0300
+++ b/head/sys/dev/switch/rt305x_switch.c	Mon Apr 23 12:19:35 2012 +0300
@@ -660,7 +660,7 @@
 	    (reg << PCR0_REGADDR_SHIFT));
 
 	if (WAIT4(sc, RT_SW_PCR1, PCR1_PHY_WRITE_DONE, PCR1_PHY_WRITE_DONE,
-	    1000))
+	    2)) /* 2 ticks */
 		return (-1);
 
 	return (0);
@@ -678,7 +678,7 @@
 	    (reg << PCR0_REGADDR_SHIFT));
 
 	if (WAIT4(sc, RT_SW_PCR1, PCR1_PHY_READ_DONE, PCR1_PHY_READ_DONE,
-	    1000))
+	    2)) /* 2 ticks */
 		return (0xffff);
 
 	return ((READ4(sc, RT_SW_PCR1) >> PCR1_PHYDATA_SHIFT) & 0xffff);