keep sfd time

[tinyos-2.x.git] / tos / chips / tda5250 / Tda5250ActiveMessageP.nc

diff --git a/tos/chips/tda5250/Tda5250ActiveMessageP.nc b/tos/chips/tda5250/Tda5250ActiveMessageP.nc
index f46eb5887264dbb292a1b2d146e01f2151ebaf21..30a251928330ac8f558111906c5293a66f82c405 100644 (file)
--- a/tos/chips/tda5250/Tda5250ActiveMessageP.nc
+++ b/tos/chips/tda5250/Tda5250ActiveMessageP.nc
@@ -1,6 +1,5 @@
-// $Id$
-
-/*                                                                      tab:4
+// -*- mode:c++; indent-tabs-mode: nil -*- $Id$
+/* 
  * "Copyright (c) 2004-2005 The Regents of the University  of California.
  * All rights reserved.
  *
@@ -47,6 +46,7 @@ module Tda5250ActiveMessageP {
     interface Receive[am_id_t id];
     interface Receive as Snoop[am_id_t id];
     interface AMPacket;
+    interface Tda5250Packet;
   }
   uses {
     interface Send as SubSend;
@@ -57,10 +57,14 @@ module Tda5250ActiveMessageP {
 }
 implementation {
 
-  tda5250_header_t* getHeader( message_t* msg ) {
-                return (tda5250_header_t*)( msg->data - sizeof(tda5250_header_t) );
-  }
+    tda5250_header_t* getHeader( message_t* msg ) {
+        return (tda5250_header_t*)( msg->data - sizeof(tda5250_header_t) );
+    }
 
+    tda5250_metadata_t* getMetadata(message_t* amsg) {
+        return (tda5250_metadata_t*)((uint8_t*)amsg->footer + sizeof(message_radio_footer_t));
+    }
+    
   command error_t AMSend.send[am_id_t id](am_addr_t addr,
                                           message_t* msg,
                                           uint8_t len) {
@@ -83,8 +87,8 @@ implementation {
     return call SubPacket.maxPayloadLength();
   }
 
-  command void* AMSend.getPayload[am_id_t id](message_t* m) {
-    return call SubPacket.getPayload(m, NULL);
+  command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
+    return call SubPacket.getPayload(m, len);
   }
 
   /* Receiving a packet */
@@ -98,22 +102,6 @@ implementation {
     }
   }
 
-  command void* Receive.getPayload[am_id_t id](message_t* m, uint8_t* len) {
-    return call SubPacket.getPayload(m, len);
-  }
-
-  command uint8_t Receive.payloadLength[am_id_t id](message_t* m) {
-    return call SubPacket.payloadLength(m);
-  }
-
-  command void* Snoop.getPayload[am_id_t id](message_t* m, uint8_t* len) {
-    return call SubPacket.getPayload(m, len);
-  }
-
-  command uint8_t Snoop.payloadLength[am_id_t id](message_t* m) {
-    return call SubPacket.payloadLength(m);
-  }
-
   command am_addr_t AMPacket.address() {
     return call amAddress();
   }
@@ -164,8 +152,12 @@ implementation {
   command am_group_t AMPacket.localGroup() {
     return TOS_AM_GROUP;
   }
+
+  async command uint8_t Tda5250Packet.getSnr(message_t* msg) {
+      return getMetadata(msg)->strength;
+  }
   
- default event message_t* Receive.receive[am_id_t id](message_t* msg, void* payload, uint8_t len) {
+  default event message_t* Receive.receive[am_id_t id](message_t* msg, void* payload, uint8_t len) {
     return msg;
   }