giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renaming FRAME802154_IEEE802154E_2012 to FRAME802154_IEEE802154_2015

Browse Source
This commit is contained in:
Simon Duquennoy 2017-07-05 17:43:00 +02:00
parent 0f5a87645d
commit 3f6cc0256f
13 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/net/mac/framer/frame802154.c
View File

@ -145,7 +145,7 @@ frame802154_has_panid(frame802154_fcf_t *fcf, int *has_src_pan_id, int *has_dest
return; return;
} }
if(fcf->frame_version == FRAME802154_IEEE802154E_2012) { if(fcf->frame_version == FRAME802154_IEEE802154_2015) {
/* /*
* IEEE 802.15.4-2015 * IEEE 802.15.4-2015
* Table 7-2, PAN ID Compression value for frame version 0b10 * Table 7-2, PAN ID Compression value for frame version 0b10
@ -302,7 +302,7 @@ field_len(frame802154_t *p, field_length_t *flen)
/* IEEE802.15.4e changes the meaning of PAN ID Compression (see Table 2a). /* IEEE802.15.4e changes the meaning of PAN ID Compression (see Table 2a).
* In this case, we leave the decision whether to compress PAN ID or not * In this case, we leave the decision whether to compress PAN ID or not
* up to the caller. */ * up to the caller. */
if(p->fcf.frame_version < FRAME802154_IEEE802154E_2012) { if(p->fcf.frame_version < FRAME802154_IEEE802154_2015) {
/* Set PAN ID compression bit if src pan id matches dest pan id. */ /* Set PAN ID compression bit if src pan id matches dest pan id. */
if((p->fcf.dest_addr_mode & 3) && (p->fcf.src_addr_mode & 3) && if((p->fcf.dest_addr_mode & 3) && (p->fcf.src_addr_mode & 3) &&
p->src_pid == p->dest_pid) { p->src_pid == p->dest_pid) {

2
core/net/mac/framer/frame802154.h
View File

@ -111,7 +111,7 @@
#define FRAME802154_IEEE802154_2003 (0x00) #define FRAME802154_IEEE802154_2003 (0x00)
#define FRAME802154_IEEE802154_2006 (0x01) #define FRAME802154_IEEE802154_2006 (0x01)
#define FRAME802154_IEEE802154E_2012 (0x02) #define FRAME802154_IEEE802154_2015 (0x02)
#define FRAME802154_SECURITY_LEVEL_NONE (0) #define FRAME802154_SECURITY_LEVEL_NONE (0)
#define FRAME802154_SECURITY_LEVEL_MIC_32 (1) #define FRAME802154_SECURITY_LEVEL_MIC_32 (1)

2
core/net/mac/framer/framer-802154.c
View File

@ -81,7 +81,7 @@ create_frame(int type, int do_create)
if(packetbuf_holds_broadcast()) { if(packetbuf_holds_broadcast()) {
params.fcf.ack_required = 0; params.fcf.ack_required = 0;
/* Suppress seqno on broadcast if supported (frame v2 or more) */ /* Suppress seqno on broadcast if supported (frame v2 or more) */
params.fcf.sequence_number_suppression = FRAME802154_VERSION >= FRAME802154_IEEE802154E_2012; params.fcf.sequence_number_suppression = FRAME802154_VERSION >= FRAME802154_IEEE802154_2015;
} else { } else {
params.fcf.ack_required = packetbuf_attr(PACKETBUF_ATTR_MAC_ACK); params.fcf.ack_required = packetbuf_attr(PACKETBUF_ATTR_MAC_ACK);
params.fcf.sequence_number_suppression = FRAME802154_SUPPR_SEQNO; params.fcf.sequence_number_suppression = FRAME802154_SUPPR_SEQNO;

6
core/net/mac/tsch/tsch-packet.c
View File

@ -69,7 +69,7 @@ tsch_packet_create_eack(uint8_t *buf, int buf_size,
memset(&p, 0, sizeof(p)); memset(&p, 0, sizeof(p));
p.fcf.frame_type = FRAME802154_ACKFRAME; p.fcf.frame_type = FRAME802154_ACKFRAME;
p.fcf.frame_version = FRAME802154_IEEE802154E_2012; p.fcf.frame_version = FRAME802154_IEEE802154_2015;
p.fcf.ie_list_present = 1; p.fcf.ie_list_present = 1;
/* Compression unset. According to IEEE802.15.4e-2012: /* Compression unset. According to IEEE802.15.4e-2012:
* - if no address is present: elide PAN ID * - if no address is present: elide PAN ID
@ -201,7 +201,7 @@ tsch_packet_create_eb(uint8_t *buf, int buf_size,
memset(&p, 0, sizeof(p)); memset(&p, 0, sizeof(p));
p.fcf.frame_type = FRAME802154_BEACONFRAME; p.fcf.frame_type = FRAME802154_BEACONFRAME;
p.fcf.ie_list_present = 1; p.fcf.ie_list_present = 1;
p.fcf.frame_version = FRAME802154_IEEE802154E_2012; p.fcf.frame_version = FRAME802154_IEEE802154_2015;
p.fcf.src_addr_mode = LINKADDR_SIZE > 2 ? FRAME802154_LONGADDRMODE : FRAME802154_SHORTADDRMODE; p.fcf.src_addr_mode = LINKADDR_SIZE > 2 ? FRAME802154_LONGADDRMODE : FRAME802154_SHORTADDRMODE;
p.fcf.dest_addr_mode = FRAME802154_SHORTADDRMODE; p.fcf.dest_addr_mode = FRAME802154_SHORTADDRMODE;
p.fcf.sequence_number_suppression = 1; p.fcf.sequence_number_suppression = 1;
@ -356,7 +356,7 @@ tsch_packet_parse_eb(const uint8_t *buf, int buf_size,
return 0; return 0;
} }
if(frame->fcf.frame_version < FRAME802154_IEEE802154E_2012 if(frame->fcf.frame_version < FRAME802154_IEEE802154_2015
|| frame->fcf.frame_type != FRAME802154_BEACONFRAME) { || frame->fcf.frame_type != FRAME802154_BEACONFRAME) {
LOG_INFO("! parse_eb: frame is not a valid TSCH beacon. Frame version %u, type %u, FCF %02x %02x\n", LOG_INFO("! parse_eb: frame is not a valid TSCH beacon. Frame version %u, type %u, FCF %02x %02x\n",
frame->fcf.frame_version, frame->fcf.frame_type, buf[0], buf[1]); frame->fcf.frame_version, frame->fcf.frame_type, buf[0], buf[1]);

6
core/net/mac/tsch/tsch.c
View File

@ -62,8 +62,8 @@
#include "net/mac/tsch/tsch-rpl.h" #include "net/mac/tsch/tsch-rpl.h"
#endif /* UIP_CONF_IPV6_RPL */ #endif /* UIP_CONF_IPV6_RPL */
#if FRAME802154_VERSION < FRAME802154_IEEE802154E_2012 #if FRAME802154_VERSION < FRAME802154_IEEE802154_2015
#error TSCH: FRAME802154_VERSION must be at least FRAME802154_IEEE802154E_2012 #error TSCH: FRAME802154_VERSION must be at least FRAME802154_IEEE802154_2015
#endif #endif
/* Log configuration */ /* Log configuration */
@ -421,7 +421,7 @@ tsch_rx_process_pending()
uint8_t ret = frame802154_parse(current_input->payload, current_input->len, &frame); uint8_t ret = frame802154_parse(current_input->payload, current_input->len, &frame);
int is_data = ret && frame.fcf.frame_type == FRAME802154_DATAFRAME; int is_data = ret && frame.fcf.frame_type == FRAME802154_DATAFRAME;
int is_eb = ret int is_eb = ret
&& frame.fcf.frame_version == FRAME802154_IEEE802154E_2012 && frame.fcf.frame_version == FRAME802154_IEEE802154_2015
&& frame.fcf.frame_type == FRAME802154_BEACONFRAME; && frame.fcf.frame_type == FRAME802154_BEACONFRAME;
if(is_data) { if(is_data) {

2
examples/ipv6/rpl-simple/project-conf.h
View File

@ -69,7 +69,7 @@
/* IEEE802.15.4 frame version */ /* IEEE802.15.4 frame version */
#undef FRAME802154_CONF_VERSION #undef FRAME802154_CONF_VERSION
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 #define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
/* TSCH and RPL callbacks */ /* TSCH and RPL callbacks */
#define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch

2
examples/ipv6/rpl-tsch/project-conf.h
View File

@ -64,7 +64,7 @@
/* IEEE802.15.4 frame version */ /* IEEE802.15.4 frame version */
#undef FRAME802154_CONF_VERSION #undef FRAME802154_CONF_VERSION
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 #define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
/* TSCH and RPL callbacks */ /* TSCH and RPL callbacks */
#define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch

2
examples/platform-specific/jn516x/rpl/common-conf.h
View File

@ -60,7 +60,7 @@
/* IEEE802.15.4 frame version */ /* IEEE802.15.4 frame version */
#undef FRAME802154_CONF_VERSION #undef FRAME802154_CONF_VERSION
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 #define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
/* TSCH and RPL callbacks */ /* TSCH and RPL callbacks */
#define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch

2
examples/platform-specific/jn516x/tsch/common-conf.h
View File

@ -140,7 +140,7 @@
#if WITH_TSCH #if WITH_TSCH
#undef FRAME802154_CONF_VERSION #undef FRAME802154_CONF_VERSION
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 #define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
/* Contiki netstack: MAC */ /* Contiki netstack: MAC */
#undef NETSTACK_CONF_MAC #undef NETSTACK_CONF_MAC

2
regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h
View File

@ -49,7 +49,7 @@
#define NETSTACK_CONF_MAC tschmac_driver #define NETSTACK_CONF_MAC tschmac_driver
#undef FRAME802154_CONF_VERSION #undef FRAME802154_CONF_VERSION
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 #define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
#if CONTIKI_TARGET_COOJA #if CONTIKI_TARGET_COOJA
#define COOJA_CONF_SIMULATE_TURNAROUND 0 #define COOJA_CONF_SIMULATE_TURNAROUND 0

2
regression-tests/13-ieee802154/code/project-tsch-conf.h
View File

@ -33,7 +33,7 @@
#define _PROJECT_TSCH_CONF_H #define _PROJECT_TSCH_CONF_H
#undef FRAME802154_CONF_VERSION #undef FRAME802154_CONF_VERSION
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 #define FRAME802154_CONF_VERSION FRAME802154_IEEE802154_2015
#undef NETSTACK_CONF_MAC #undef NETSTACK_CONF_MAC
#define NETSTACK_CONF_MAC tschmac_driver #define NETSTACK_CONF_MAC tschmac_driver

2
regression-tests/13-ieee802154/code/test-panid-handling.c
View File

@ -181,7 +181,7 @@ setup_frame802154_2006_fcf(const panid_test_def *t, frame802154_fcf_t *fcf)
static void static void
setup_frame802154_2015_fcf(const panid_test_def *t, frame802154_fcf_t *fcf) setup_frame802154_2015_fcf(const panid_test_def *t, frame802154_fcf_t *fcf)
{ {
fcf->frame_version = FRAME802154_IEEE802154E_2012; fcf->frame_version = FRAME802154_IEEE802154_2015;
setup_addr_mode(t->dest_addr_mode, &fcf->dest_addr_mode); setup_addr_mode(t->dest_addr_mode, &fcf->dest_addr_mode);
setup_addr_mode(t->src_addr_mode, &fcf->src_addr_mode); setup_addr_mode(t->src_addr_mode, &fcf->src_addr_mode);

4
regression-tests/13-ieee802154/code/test-tsch-packet.c
View File

@ -230,7 +230,7 @@ test_parse_eb(const eb_test_vector_t *v)
#endif #endif
if(frame.fcf.frame_type != FRAME802154_BEACONFRAME || if(frame.fcf.frame_type != FRAME802154_BEACONFRAME ||
frame.fcf.frame_version != FRAME802154_IEEE802154E_2012) { frame.fcf.frame_version != FRAME802154_IEEE802154_2015) {
return FAILURE; return FAILURE;
} }
@ -315,7 +315,7 @@ test_parse_eack(const eack_test_vector_t *v)
#endif #endif
if(frame.fcf.frame_type != FRAME802154_ACKFRAME || if(frame.fcf.frame_type != FRAME802154_ACKFRAME ||
frame.fcf.frame_version != FRAME802154_IEEE802154E_2012) { frame.fcf.frame_version != FRAME802154_IEEE802154_2015) {
return FAILURE; return FAILURE;
} }