From aae4b54c68cee6746d18a3f3040eca214fbb7a06 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Thu, 4 Dec 2008 13:14:34 +0000
Subject: [PATCH] bugfix: mspsim cycle counter was cast to int, limiting
 maximum simulation time

---
 .../apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
index 04d413d47..964c302ec 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspMote.java,v 1.16 2008/12/03 15:36:49 fros4943 Exp $
+ * $Id: MspMote.java,v 1.17 2008/12/04 13:14:34 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -65,11 +65,11 @@ public abstract class MspMote implements Mote {
   private static Logger logger = Logger.getLogger(MspMote.class);
 
   /* 2.4576 MHz according to Contiki's speed sync loop*/
-  public static int NR_CYCLES_PER_MSEC = 2458;
+  public static long NR_CYCLES_PER_MSEC = 2458;
 
   /* Cycle counter */
   public long cycleCounter = 0;
-  public int cycleDrift = 0;
+  public long cycleDrift = 0;
 
   private Simulation mySimulation = null;
   private CommandHandler commandHandler;
@@ -294,11 +294,12 @@ public abstract class MspMote implements Mote {
   protected abstract boolean initEmulator(File ELFFile);
 
   /* return false when done - e.g. true means more work to do before finished with this tick */
+
   private boolean firstTick = true;
   public boolean tick(int simTime) {
     if (stopNextInstruction) {
       stopNextInstruction = false;
-      throw new RuntimeException("Request simulation stop");
+      throw new RuntimeException("MSPSim requested simulation stop");
     }
 
     /* Nodes may be added in an ongoing simulation:
@@ -309,6 +310,7 @@ public abstract class MspMote implements Mote {
     }
 
     long maxSimTimeCycles = NR_CYCLES_PER_MSEC*(simTime+1) + cycleDrift;
+
     if (maxSimTimeCycles <= cycleCounter) {
       return false;
     }