From: mmaroti <mmaroti>
Date: Mon, 3 May 2010 15:31:25 +0000 (+0000)
Subject: fix compile time warning
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=d1f4514cc3f1cd2664feb1f4fd07f33b0c672a6c

fix compile time warning
---

diff --git a/tos/sensorboards/mts300/Mag.nc b/tos/sensorboards/mts300/Mag.nc
index 08ac3afe..db3b0c20 100644
--- a/tos/sensorboards/mts300/Mag.nc
+++ b/tos/sensorboards/mts300/Mag.nc
@@ -60,12 +60,10 @@ interface Mag {
   command error_t gainAdjustY(uint8_t val);
 
   /* Pot adjustment on the X axis of the magnetometer is finished.
-   * Returns:  return SUCCESS.
    */
-  event error_t gainAdjustXDone(bool result);
+  event void gainAdjustXDone(error_t result);
 
   /* Pot adjustment on the Y axis of the magnetometer is finished.
-   * Returns:  return SUCCESS.
    */
-  event error_t gainAdjustYDone(bool result);
+  event void gainAdjustYDone(error_t result);
 }
diff --git a/tos/sensorboards/mts300/MagP.nc b/tos/sensorboards/mts300/MagP.nc
index 79de78f6..a3879d2d 100644
--- a/tos/sensorboards/mts300/MagP.nc
+++ b/tos/sensorboards/mts300/MagP.nc
@@ -19,7 +19,7 @@ module MagP
 
 implementation
 {
-  uint8_t gainData[2];
+  norace uint8_t gainData[2];
 
   command error_t SplitControl.start()
   {
@@ -75,18 +75,22 @@ implementation
     return ;
   }
 
+  task void signalAdjustDone()
+  {
+    if (gainData[0] == 1)
+      signal Mag.gainAdjustXDone(gainData[1]);
+    else
+      signal Mag.gainAdjustYDone(gainData[1]);
+  }
+
   async event void I2CPacket.writeDone(error_t error, uint16_t addr, uint8_t length, uint8_t* data)
   {
     call I2CResource.release();
-    if (gainData[0] ==1)
-    {
-      signal Mag.gainAdjustXDone(error);
-    }
-    if (gainData[0] ==0)
-    {
-      signal Mag.gainAdjustYDone(error);
-    }
-    return ;
+
+    gainData[1] = error;
+    post signalAdjustDone();
+
+    return;
   }
 
   async command uint8_t ConfigX.getChannel() {
@@ -113,12 +117,6 @@ implementation
     return ATM128_ADC_PRESCALE;
   }
 
-   default event error_t Mag.gainAdjustXDone(bool result)
-   {
-     return result;
-   }
-   default event error_t Mag.gainAdjustYDone(bool result)
-   {
-     return result;
-   }
+   default event void Mag.gainAdjustXDone(error_t result) { }
+   default event void Mag.gainAdjustYDone(error_t result) { }
 }
\ No newline at end of file