From: phihup <phihup>
Date: Thu, 21 Jun 2007 11:44:14 +0000 (+0000)
Subject: - re-introduced, accidentally removed, AM group field
X-Git-Tag: release_tools_1_2_4_1~109
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=cd8c7bfaadc38a2d7ebe076f7cab22d96b0021a7;p=tinyos-2.x.git

- re-introduced, accidentally removed, AM group field
---

diff --git a/tos/chips/tda5250/Tda5250ActiveMessageP.nc b/tos/chips/tda5250/Tda5250ActiveMessageP.nc
index 149bc080..05c8943f 100644
--- a/tos/chips/tda5250/Tda5250ActiveMessageP.nc
+++ b/tos/chips/tda5250/Tda5250ActiveMessageP.nc
@@ -154,14 +154,13 @@ implementation {
   }
 
   command void AMPacket.setGroup(message_t* msg, am_group_t group) {
-    //tda5250_header_t* header = getHeader(msg);
-    //header->group = group;
+    tda5250_header_t* header = getHeader(msg);
+    header->group = group;
   }
 
   command am_group_t AMPacket.group(message_t* msg) {
-    //tda5250_header_t* header = getHeader(msg);
-    //return header->group;
-    return TOS_AM_GROUP;
+    tda5250_header_t* header = getHeader(msg);
+    return header->group;
   }
 
   command am_group_t AMPacket.localGroup() {
diff --git a/tos/chips/tda5250/tda5250_message.h b/tos/chips/tda5250/tda5250_message.h
index 4d8b563b..40a4b8ce 100644
--- a/tos/chips/tda5250/tda5250_message.h
+++ b/tos/chips/tda5250/tda5250_message.h
@@ -9,6 +9,7 @@ typedef nx_struct tda5250_header_t {
   nx_am_addr_t src;
   nx_am_addr_t dest;
   nx_am_id_t   type;
+  nx_am_group_t group;
   nx_uint8_t   token;
 } tda5250_header_t;