X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Frf230%2FRF230PacketP.nc;h=09b4977742ddd71ab9ac07418c0113af2ae52ba6;hb=da585280348729a63976b7a2fb22b301158f9fc1;hp=646cf122c779dc6c293800d38dd62473a3319a8d;hpb=751d2351525fd3363f4c6993c0bf56eabe8f1ba4;p=tinyos-2.x.git diff --git a/tos/chips/rf230/RF230PacketP.nc b/tos/chips/rf230/RF230PacketP.nc index 646cf122..09b49777 100644 --- a/tos/chips/rf230/RF230PacketP.nc +++ b/tos/chips/rf230/RF230PacketP.nc @@ -55,7 +55,7 @@ implementation { PACKET_LENGTH_INCREASE = sizeof(rf230packet_header_t) - 1 // the 8-bit length field is not counted - + sizeof(ieee154_footer_t), // the CRC is not stored in memory + + sizeof(ieee154_footer_t), // the CRC is not stored in memory }; inline rf230packet_metadata_t* getMeta(message_t* msg) @@ -69,10 +69,6 @@ implementation { call IEEE154Packet.createDataFrame(msg); -#ifdef IEEE154_6LOWPAN - call IEEE154Packet.set6LowPan(msg, TINYOS_6LOWPAN_NETWORK_ID); -#endif - getMeta(msg)->flags = RF230PACKET_CLEAR_METADATA; } @@ -81,13 +77,11 @@ implementation call IEEE154Packet.setLength(msg, len + PACKET_LENGTH_INCREASE); } - // TODO: make Packet.payloadLength async inline command uint8_t Packet.payloadLength(message_t* msg) { return call IEEE154Packet.getLength(msg) - PACKET_LENGTH_INCREASE; } - // TODO: make Packet.maxPayloadLength async inline command uint8_t Packet.maxPayloadLength() { return TOSH_DATA_LENGTH;