From: andreaskoepke Date: Tue, 10 Jul 2007 13:09:47 +0000 (+0000) Subject: remove group field, breaks MAC timings. X-Git-Tag: release_tools_1_2_4_1~59 X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=662d029ac5cc8bbaebe1fae47925f58a8896dc09;hp=2d422c11d7a829ca46b5440a7ba123ae2a5b94d9;p=tinyos-2.x.git remove group field, breaks MAC timings. --- diff --git a/tos/chips/tda5250/Tda5250ActiveMessageP.nc b/tos/chips/tda5250/Tda5250ActiveMessageP.nc index 05c8943f..f46eb588 100644 --- a/tos/chips/tda5250/Tda5250ActiveMessageP.nc +++ b/tos/chips/tda5250/Tda5250ActiveMessageP.nc @@ -154,13 +154,11 @@ implementation { } command void AMPacket.setGroup(message_t* msg, am_group_t group) { - tda5250_header_t* header = getHeader(msg); - header->group = group; + return; } command am_group_t AMPacket.group(message_t* msg) { - tda5250_header_t* header = getHeader(msg); - return header->group; + return TOS_AM_GROUP; } command am_group_t AMPacket.localGroup() { diff --git a/tos/chips/tda5250/tda5250_message.h b/tos/chips/tda5250/tda5250_message.h index 40a4b8ce..1f377841 100644 --- a/tos/chips/tda5250/tda5250_message.h +++ b/tos/chips/tda5250/tda5250_message.h @@ -9,7 +9,6 @@ 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; @@ -24,6 +23,9 @@ typedef nx_struct tda5250_metadata_t { nx_uint32_t time; nx_uint8_t sendSecurityMode; nx_uint8_t receiveSecurityMode; + /* some meta information that allows to compute a density */ + nx_uint8_t maxRepetitions; + nx_uint8_t repetitions; } tda5250_metadata_t; #endif