Merge over into the trunk.

[tinyos-2.x.git] / tos / chips / cc2420 / CC2420ControlP.nc

diff --git a/tos/chips/cc2420/CC2420ControlP.nc b/tos/chips/cc2420/CC2420ControlP.nc
index bb0803f3ddaa2291bcbd92799cfe22736294992f..639fc9c1f7e61a4657e97329d5a56934604feacb 100644 (file)
--- a/tos/chips/cc2420/CC2420ControlP.nc
+++ b/tos/chips/cc2420/CC2420ControlP.nc
@@ -110,10 +110,10 @@ implementation {
     return call SpiResource.isOwner();
   }
 
-  async command void Resource.release() {
+  async command error_t Resource.release() {
     atomic {
       call CSN.set();
-      call SpiResource.release();
+      return call SpiResource.release();
     }
   }
 
@@ -270,6 +270,7 @@ implementation {
                       ( ( (channel - 11)*5+357 ) << CC2420_FSCTRL_FREQ ) );
     call PANID.write( 0, (uint8_t*)id, sizeof( id ) );
     call CSN.set();
+    call SyncResource.release();
     
     post syncDone_task();