[openfirmware] [commit] r1782 - ofw/core

[repository service]

Author: wmb
Date: Wed Apr  7 10:05:31 2010
New Revision: 1782
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1782

Log:
OLPC trac 10056 - OFW test-all and laptop self test no longer tests WLAN or internal SD.  test-all wasn't testing *anything* after doing the suspend/resume test, due to a reentrancy problem in scan-subtree.  The resume code was using scan-subtree to fixup some USB state, and that was clobbering a variable used by the higher-level call to scan-subtree in test-all.

Modified:
   ofw/core/ofwcore.fth

Modified: ofw/core/ofwcore.fth
==============================================================================
--- ofw/core/ofwcore.fth	Tue Apr  6 21:52:23 2010	(r1781)
+++ ofw/core/ofwcore.fth	Wed Apr  7 10:05:31 2010	(r1782)
@@ -3197,7 +3197,11 @@
    r> push-device
 ;
 
-: scan-level  ( action-acf -- )  is the-action (scan-level)  ;
+: scan-level  ( action-xt -- )
+   ['] the-action behavior >r       ( action-xt r: old-xt )   
+   is the-action (scan-level)       ( r: old-xt )
+   r> is the-action                 ( )
+;
 
 headers
 
@@ -3208,11 +3212,12 @@
 \ the action that it wished to undertake.
 
 : scan-subtree  ( dev-addr,len action-acf -- )
-   current-device >r  ( dev-addr,len action-acf )
-   is the-action      ( dev-addr,len )
-   find-device        (  )
-   ['] execute-action  ['] (search-preorder)  catch  2drop
-   r> push-device     (  )
+   current-device >r                ( dev-addr,len action-acf r: phandle )
+   ['] the-action behavior >r       ( dev-addr,len action-acf r: phandle xt )
+   is the-action                    ( dev-addr,len r: phandle xt )
+   find-device                      ( r: phandle xt )
+   ['] execute-action  ['] (search-preorder)  catch  2drop  ( r: phandle xt )
+   r> is the-action r> push-device  ( )
 ;
 
 headerless