X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fcc2420%2FCC2420ActiveMessageP.nc;h=7a111f53603fe9e54d70a37c8750f82ad030d8db;hb=fdb0ac0c318844a25bb5c15ba5c20968dde24b03;hp=45a245f49288b17f35d0f4f3e10e007bf1fcd28e;hpb=121da1045cafe46d32ab8ecf87a98fe19430462c;p=tinyos-2.x.git

diff --git a/tos/chips/cc2420/CC2420ActiveMessageP.nc b/tos/chips/cc2420/CC2420ActiveMessageP.nc
index 45a245f4..7a111f53 100644
--- a/tos/chips/cc2420/CC2420ActiveMessageP.nc
+++ b/tos/chips/cc2420/CC2420ActiveMessageP.nc
@@ -41,12 +41,16 @@ module CC2420ActiveMessageP {
     interface Receive as Snoop[am_id_t id];
     interface AMPacket;
     interface Packet;
+    interface SendNotifier[am_id_t id];
   }
+  
   uses {
     interface Send as SubSend;
     interface Receive as SubReceive;
     interface CC2420Packet;
-    command am_addr_t amAddress();
+    interface CC2420PacketBody;
+    interface CC2420Config;
+    interface ActiveMessageAddress;
   }
 }
 implementation {
@@ -55,15 +59,17 @@ implementation {
     CC2420_SIZE = MAC_HEADER_SIZE + MAC_FOOTER_SIZE,
   };
   
-  
+  /***************** AMSend Commands ****************/
   command error_t AMSend.send[am_id_t id](am_addr_t addr,
 					  message_t* msg,
 					  uint8_t len) {
-    cc2420_header_t* header = call CC2420Packet.getHeader( msg );
+    cc2420_header_t* header = call CC2420PacketBody.getHeader( msg );
     header->type = id;
     header->dest = addr;
-    header->destpan = TOS_AM_GROUP;
-
+    header->destpan = call CC2420Config.getPanAddr();
+    
+    signal SendNotifier.aboutToSend[id](addr, msg);
+    
     return call SubSend.send( msg, len + CC2420_SIZE );
   }
 
@@ -75,62 +81,32 @@ implementation {
     return call Packet.maxPayloadLength();
   }
 
-  command void* AMSend.getPayload[am_id_t id](message_t* m) {
-    return call Packet.getPayload(m, NULL);
-  }
-
-  command void* Receive.getPayload[am_id_t id](message_t* m, uint8_t* len) {
-    return call Packet.getPayload(m, len);
-  }
-
-  command uint8_t Receive.payloadLength[am_id_t id](message_t* m) {
-    return call Packet.payloadLength(m);
-  }
-  
-  command void* Snoop.getPayload[am_id_t id](message_t* m, uint8_t* len) {
+  command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
     return call Packet.getPayload(m, len);
   }
 
-  command uint8_t Snoop.payloadLength[am_id_t id](message_t* m) {
-    return call Packet.payloadLength(m);
-  }
-  
-  event void SubSend.sendDone(message_t* msg, error_t result) {
-    signal AMSend.sendDone[call AMPacket.type(msg)](msg, result);
-  }
-
-  /* Receiving a packet */
-
-  event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len) {
-    if (call AMPacket.isForMe(msg)) {
-      return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len - CC2420_SIZE);
-    }
-    else {
-      return signal Snoop.receive[call AMPacket.type(msg)](msg, payload, len - CC2420_SIZE);
-    }
-  }
-  
+  /***************** AMPacket Commands ****************/
   command am_addr_t AMPacket.address() {
-    return call amAddress();
+    return call ActiveMessageAddress.amAddress();
   }
  
   command am_addr_t AMPacket.destination(message_t* amsg) {
-    cc2420_header_t* header = call CC2420Packet.getHeader(amsg);
+    cc2420_header_t* header = call CC2420PacketBody.getHeader(amsg);
     return header->dest;
   }
  
   command am_addr_t AMPacket.source(message_t* amsg) {
-    cc2420_header_t* header = call CC2420Packet.getHeader(amsg);
+    cc2420_header_t* header = call CC2420PacketBody.getHeader(amsg);
     return header->src;
   }
 
   command void AMPacket.setDestination(message_t* amsg, am_addr_t addr) {
-    cc2420_header_t* header = call CC2420Packet.getHeader(amsg);
+    cc2420_header_t* header = call CC2420PacketBody.getHeader(amsg);
     header->dest = addr;
   }
 
   command void AMPacket.setSource(message_t* amsg, am_addr_t addr) {
-    cc2420_header_t* header = call CC2420Packet.getHeader(amsg);
+    cc2420_header_t* header = call CC2420PacketBody.getHeader(amsg);
     header->src = addr;
   }
 
@@ -140,15 +116,83 @@ implementation {
   }
 
   command am_id_t AMPacket.type(message_t* amsg) {
-    cc2420_header_t* header = call CC2420Packet.getHeader(amsg);
+    cc2420_header_t* header = call CC2420PacketBody.getHeader(amsg);
     return header->type;
   }
 
   command void AMPacket.setType(message_t* amsg, am_id_t type) {
-    cc2420_header_t* header = call CC2420Packet.getHeader(amsg);
+    cc2420_header_t* header = call CC2420PacketBody.getHeader(amsg);
     header->type = type;
   }
+  
+  command am_group_t AMPacket.group(message_t* amsg) {
+    return (call CC2420PacketBody.getHeader(amsg))->destpan;
+  }
 
+  command void AMPacket.setGroup(message_t* amsg, am_group_t grp) {
+    // Overridden intentionally when we send()
+    (call CC2420PacketBody.getHeader(amsg))->destpan = grp;
+  }
+
+  command am_group_t AMPacket.localGroup() {
+    return call CC2420Config.getPanAddr();
+  }
+  
+
+  /***************** Packet Commands ****************/
+  command void Packet.clear(message_t* msg) {
+    memset(call CC2420PacketBody.getHeader(msg), sizeof(cc2420_header_t), 0);
+    memset(call CC2420PacketBody.getMetadata(msg), sizeof(cc2420_metadata_t), 0);
+  }
+  
+  command uint8_t Packet.payloadLength(message_t* msg) {
+    return (call CC2420PacketBody.getHeader(msg))->length - CC2420_SIZE;
+  }
+  
+  command void Packet.setPayloadLength(message_t* msg, uint8_t len) {
+    (call CC2420PacketBody.getHeader(msg))->length  = len + CC2420_SIZE;
+  }
+  
+  command uint8_t Packet.maxPayloadLength() {
+    return TOSH_DATA_LENGTH;
+  }
+  
+  command void* Packet.getPayload(message_t* msg, uint8_t len) {
+    return call SubSend.getPayload(msg, len);
+  }
+
+  
+  /***************** SubSend Events ****************/
+  event void SubSend.sendDone(message_t* msg, error_t result) {
+    signal AMSend.sendDone[call AMPacket.type(msg)](msg, result);
+  }
+
+  
+  /***************** SubReceive Events ****************/
+  event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len) {
+    
+    if(!(call CC2420PacketBody.getMetadata(msg))->crc) {
+      return msg;
+    }
+    
+    if (call AMPacket.isForMe(msg)) {
+      return signal Receive.receive[call AMPacket.type(msg)](msg, payload, len - CC2420_SIZE);
+    }
+    else {
+      return signal Snoop.receive[call AMPacket.type(msg)](msg, payload, len - CC2420_SIZE);
+    }
+  }
+  
+
+  /***************** ActiveMessageAddress Events ****************/
+  async event void ActiveMessageAddress.changed() {
+  }
+  
+  /***************** CC2420Config Events ****************/
+  event void CC2420Config.syncDone( error_t error ) {
+  }
+  
+  /***************** Defaults ****************/
   default event message_t* Receive.receive[am_id_t id](message_t* msg, void* payload, uint8_t len) {
     return msg;
   }
@@ -157,32 +201,10 @@ implementation {
     return msg;
   }
 
- default event void AMSend.sendDone[uint8_t id](message_t* msg, error_t err) {
-   return;
- }
-
- 
- command void Packet.clear(message_t* msg) {}
- 
- command uint8_t Packet.payloadLength(message_t* msg) {
-   return (call CC2420Packet.getHeader(msg))->length - CC2420_SIZE;
- }
-
-
- command void Packet.setPayloadLength(message_t* msg, uint8_t len) {
-   (call CC2420Packet.getHeader(msg))->length  = len + CC2420_SIZE;
- }
-
- command uint8_t Packet.maxPayloadLength() {
-   return TOSH_DATA_LENGTH;
- }
- 
- command void* Packet.getPayload(message_t* msg, uint8_t* len) {
-   if (len != NULL) {
-     *len = call Packet.payloadLength(msg);
-   }
-   return msg->data;
- }
-
+  default event void AMSend.sendDone[uint8_t id](message_t* msg, error_t err) {
+  }
 
+  default event void SendNotifier.aboutToSend[am_id_t amId](am_addr_t addr, message_t *msg) {
+  }
+  
 }