deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
c_oflynn 2008-11-08 03:29:15 +00:00
parent e1463c25a0
commit f13ec95efa
3 changed files with 104 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

89
cpu/avr/radio/rf230/frame.c
View file

@ -39,7 +39,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* $Id: frame.c,v 1.2 2008/10/14 18:37:28 c_oflynn Exp $
* $Id: frame.c,v 1.3 2008/11/08 03:29:15 c_oflynn Exp $
*/
/*
* \brief This file is where the main functions that relate to frame
@ -276,50 +276,55 @@ void rx_frame_parse(hal_rx_frame_t *rx_frame, parsed_frame_t *pf)
}
if (fcf->frameType == ACKFRAME)
return; /* Don't bother with ACK frames */
pf->fcf = (fcf_t *)p;
pf->seqNum = p+2;
p += 3; /* Skip first three bytes */
/* Destination PID, if any */
if (fcf->frameType != BEACONFRAME){ /* No destination addresses in Beacon frame */
pf->dest_pid = (uint16_t *)p;
p += 2;
/* Destination address */
pf->dest_addr = 0;
if (fcf->destAddrMode == SHORTADDRMODE ||
fcf->destAddrMode == LONGADDRMODE){
pf->dest_addr = (addr_t *)p;
/* Update pointer to account for possible missing addr field */
if (fcf->destAddrMode == SHORTADDRMODE){
p += 2;
}
if (fcf->destAddrMode == LONGADDRMODE){
p += 8;
}
}
}
/* Source PANID */
pf->src_pid = 0;
if (!fcf->panIdCompression){
pf->src_pid = (uint16_t *)p;
p += 2;
}
/* Source address */
pf->src_addr = (addr_t *)p;
if (fcf->srcAddrMode == SHORTADDRMODE){
p += 2;
}
if (fcf->srcAddrMode == LONGADDRMODE){
p += 8;
}
/* aux security header, not yet implemented */
pf->aux_sec_hdr = 0;
/* payload length */
pf->payload_length = rx_frame->length - (p - (uint8_t*)&rx_frame->data) - 2;
/* payload */
pf->payload = p;
if (fcf->frameType == ACKFRAME) {
//ACK frames have no addresses and no payload!
pf->payload_length = 0;
} else {
/* Destination PID, if any */
if (fcf->frameType != BEACONFRAME){ /* No destination addresses in Beacon frame */
pf->dest_pid = (uint16_t *)p;
p += 2;
/* Destination address */
pf->dest_addr = 0;
if (fcf->destAddrMode == SHORTADDRMODE ||
fcf->destAddrMode == LONGADDRMODE){
pf->dest_addr = (addr_t *)p;
/* Update pointer to account for possible missing addr field */
if (fcf->destAddrMode == SHORTADDRMODE){
p += 2;
}
if (fcf->destAddrMode == LONGADDRMODE){
p += 8;
}
}
}
/* Source PANID */
pf->src_pid = 0;
if (!fcf->panIdCompression){
pf->src_pid = (uint16_t *)p;
p += 2;
}
/* Source address */
pf->src_addr = (addr_t *)p;
if (fcf->srcAddrMode == SHORTADDRMODE){
p += 2;
}
if (fcf->srcAddrMode == LONGADDRMODE){
p += 8;
}
/* aux security header, not yet implemented */
pf->aux_sec_hdr = 0;
/* payload length */
pf->payload_length = rx_frame->length - (p - (uint8_t*)&rx_frame->data) - 2;
/* payload */
pf->payload = p;
}
pf->lqi = rx_frame->lqi;
pf->fcs = rx_frame->crc;