From: kaisenl <kaisenl>
Date: Sat, 16 Feb 2008 19:20:12 +0000 (+0000)
Subject: Fixed Version/ID order injector
X-Git-Tag: release_tinyos_2_1_0_0~533
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=42e42a8296c9aa6cddb64f865dd48b7e07def5a9

Fixed Version/ID order injector
---

diff --git a/apps/tests/TestDIP/DipInject.java b/apps/tests/TestDIP/DipInject.java
index 1a4420dc..a7fffa5b 100644
--- a/apps/tests/TestDIP/DipInject.java
+++ b/apps/tests/TestDIP/DipInject.java
@@ -26,7 +26,7 @@ public class DipInject implements MessageListener
 
 	DipDataMsg ddm = new DipDataMsg(dm, DipMsg.DEFAULT_MESSAGE_SIZE);
 	ddm.set_key(key);
-        ddm.set_version(version);
+        ddm.set_version(version << 16);
         ddm.set_size((short)data.length);
 
         DipData dd = new DipData(ddm, DipDataMsg.DEFAULT_MESSAGE_SIZE); 
diff --git a/apps/tests/TestDIP/Makefile b/apps/tests/TestDIP/Makefile
index 5588040a..7d06b2e4 100644
--- a/apps/tests/TestDIP/Makefile
+++ b/apps/tests/TestDIP/Makefile
@@ -7,6 +7,8 @@ CFLAGS += -I$(TOSDIR)/lib/net/dip -I$(TOSDIR)/lib/net/dip/interfaces
 CONSTANTS += -DTOSH_DATA_LENGTH=32
 CFLAGS += $(CONSTANTS)
 
+CLEAN_EXTRA += DipMsg.py DipDataMsg.py DipData.py DipMsg.java DipDataMsg.java DipData.java DipMsg.class DipDataMsg.class DipData.class DipInject.class
+
 DipMsg.py:
 	mig python -target=$(PLATFORM) -python-classname=DipMsg $(CFLAGS) $(TOSDIR)/lib/net/dip/Dip.h dip_msg -o $@
 
@@ -38,10 +40,4 @@ DipData.java:
 DipInject.class:
 	javac -target 1.4 -source 1.4 DipInject.java
 
-#clean-inject:
-#	rm -f DipMsg.py DipDataMsg.py DipData.py
-#	rm -f DipMsg.java DipDataMsg.java DipData.java
-#	rm -f DipMsg.class DipDataMsg.class DipData.class
-#	rm -f DipInject.class
-
 include $(MAKERULES)