r1413 - in dev: . usb2/device/net

Author: wmb
Date: 2009-10-10 03:03:22 +0200 (Sat, 10 Oct 2009)
New Revision: 1413

Modified:
   dev/libertas.fth
   dev/usb2/device/net/ethernet.fth
Log:
OLPC trac 9473 - make sure obp-tftp package gets closed if the load method aborts.



Modified: dev/libertas.fth
===================================================================
--- dev/libertas.fth	2009-10-10 00:15:58 UTC (rev 1412)
+++ dev/libertas.fth	2009-10-10 01:03:22 UTC (rev 1413)
@@ -1680,8 +1680,9 @@
 					( adr ihandle )
 
    >r
-   " load" r@ $call-method		( len )
+   " load" r@ ['] $call-method	catch   ( len false | x x x true )
    r> close-package
+   throw
 ;
 
 : reset  ( -- flag )  reset-nic  ;

Modified: dev/usb2/device/net/ethernet.fth
===================================================================
--- dev/usb2/device/net/ethernet.fth	2009-10-10 00:15:58 UTC (rev 1412)
+++ dev/usb2/device/net/ethernet.fth	2009-10-10 01:03:22 UTC (rev 1413)
@@ -141,8 +141,9 @@
 					( adr ihandle )
 
    >r
-   " load" r@ $call-method		( len )
+   " load" r@ ['] $call-method	catch   ( len false | x x x true )
    r> close-package
+   throw
 ;
 
 : selftest  ( -- flag )