From: mmaroti Date: Sat, 9 May 2009 18:07:07 +0000 (+0000) Subject: fix packet length calculation X-Git-Tag: rc_6_tinyos_2_1_1~390 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=def99df655317b53b7063f9a8fed333fe873b3fe fix packet length calculation --- diff --git a/tos/chips/rf2xx/layers/ActiveMessageLayerP.nc b/tos/chips/rf2xx/layers/ActiveMessageLayerP.nc index 1f9cb5ec..a652486e 100644 --- a/tos/chips/rf2xx/layers/ActiveMessageLayerP.nc +++ b/tos/chips/rf2xx/layers/ActiveMessageLayerP.nc @@ -227,29 +227,29 @@ implementation command void Packet.clear(message_t* msg) { - call SubPacket.clear(msg); + call RadioPacket.clear(msg); } command uint8_t Packet.payloadLength(message_t* msg) { - return call SubPacket.payloadLength(msg); + return call RadioPacket.payloadLength(msg); } command void Packet.setPayloadLength(message_t* msg, uint8_t len) { - call SubPacket.setPayloadLength(msg, len); + call RadioPacket.setPayloadLength(msg, len); } command uint8_t Packet.maxPayloadLength() { - return call SubPacket.maxPayloadLength(); + return call RadioPacket.maxPayloadLength(); } command void* Packet.getPayload(message_t* msg, uint8_t len) { - if( len > call SubPacket.maxPayloadLength() ) + if( len > call RadioPacket.maxPayloadLength() ) return NULL; - return ((void*)msg) + call SubPacket.headerLength(msg); + return ((void*)msg) + call RadioPacket.headerLength(msg); } }