diff --git a/core/net/mac/framer/frame802154.c b/core/net/mac/framer/frame802154.c index 5a92a3e94..90a4ae9a1 100644 --- a/core/net/mac/framer/frame802154.c +++ b/core/net/mac/framer/frame802154.c @@ -145,7 +145,7 @@ frame802154_has_panid(frame802154_fcf_t *fcf, int *has_src_pan_id, int *has_dest return; } - if(fcf->frame_version == FRAME802154_IEEE802154E_2012) { + if(fcf->frame_version == FRAME802154_IEEE802154_2015) { /* * IEEE 802.15.4-2015 * 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). * In this case, we leave the decision whether to compress PAN ID or not * 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. */ if((p->fcf.dest_addr_mode & 3) && (p->fcf.src_addr_mode & 3) && p->src_pid == p->dest_pid) { diff --git a/core/net/mac/framer/frame802154.h b/core/net/mac/framer/frame802154.h index 2ff067a26..50deca0ae 100644 --- a/core/net/mac/framer/frame802154.h +++ b/core/net/mac/framer/frame802154.h @@ -77,7 +77,7 @@ #ifdef FRAME802154_CONF_VERSION #define FRAME802154_VERSION FRAME802154_CONF_VERSION #else /* FRAME802154_CONF_VERSION */ -#define FRAME802154_VERSION FRAME802154_IEEE802154_2006 +#define FRAME802154_VERSION FRAME802154_IEEE802154_2015 #endif /* FRAME802154_CONF_VERSION */ #ifdef FRAME802154_CONF_SUPPR_SEQNO @@ -111,7 +111,7 @@ #define FRAME802154_IEEE802154_2003 (0x00) #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_MIC_32 (1) diff --git a/core/net/mac/framer/framer-802154.c b/core/net/mac/framer/framer-802154.c index e674a71ef..dab21bda8 100644 --- a/core/net/mac/framer/framer-802154.c +++ b/core/net/mac/framer/framer-802154.c @@ -81,7 +81,7 @@ create_frame(int type, int do_create) if(packetbuf_holds_broadcast()) { params.fcf.ack_required = 0; /* 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 { params.fcf.ack_required = packetbuf_attr(PACKETBUF_ATTR_MAC_ACK); params.fcf.sequence_number_suppression = FRAME802154_SUPPR_SEQNO; diff --git a/core/net/mac/tsch/tsch-packet.c b/core/net/mac/tsch/tsch-packet.c index eb4f897a8..b1fbd23cc 100644 --- a/core/net/mac/tsch/tsch-packet.c +++ b/core/net/mac/tsch/tsch-packet.c @@ -69,7 +69,7 @@ tsch_packet_create_eack(uint8_t *buf, int buf_size, memset(&p, 0, sizeof(p)); 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; /* Compression unset. According to IEEE802.15.4e-2012: * - 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)); p.fcf.frame_type = FRAME802154_BEACONFRAME; 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.dest_addr_mode = FRAME802154_SHORTADDRMODE; p.fcf.sequence_number_suppression = 1; @@ -356,7 +356,7 @@ tsch_packet_parse_eb(const uint8_t *buf, int buf_size, return 0; } - if(frame->fcf.frame_version < FRAME802154_IEEE802154E_2012 + if(frame->fcf.frame_version < FRAME802154_IEEE802154_2015 || 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", frame->fcf.frame_version, frame->fcf.frame_type, buf[0], buf[1]); diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c index 97a7bad38..567c88af4 100644 --- a/core/net/mac/tsch/tsch.c +++ b/core/net/mac/tsch/tsch.c @@ -62,8 +62,8 @@ #include "net/mac/tsch/tsch-rpl.h" #endif /* UIP_CONF_IPV6_RPL */ -#if FRAME802154_VERSION < FRAME802154_IEEE802154E_2012 -#error TSCH: FRAME802154_VERSION must be at least FRAME802154_IEEE802154E_2012 +#if FRAME802154_VERSION < FRAME802154_IEEE802154_2015 +#error TSCH: FRAME802154_VERSION must be at least FRAME802154_IEEE802154_2015 #endif /* Log configuration */ @@ -421,7 +421,7 @@ tsch_rx_process_pending() uint8_t ret = frame802154_parse(current_input->payload, current_input->len, &frame); int is_data = ret && frame.fcf.frame_type == FRAME802154_DATAFRAME; int is_eb = ret - && frame.fcf.frame_version == FRAME802154_IEEE802154E_2012 + && frame.fcf.frame_version == FRAME802154_IEEE802154_2015 && frame.fcf.frame_type == FRAME802154_BEACONFRAME; if(is_data) { diff --git a/examples/ipv6/rpl-simple/project-conf.h b/examples/ipv6/rpl-simple/project-conf.h index 0f2550579..539172451 100644 --- a/examples/ipv6/rpl-simple/project-conf.h +++ b/examples/ipv6/rpl-simple/project-conf.h @@ -67,10 +67,6 @@ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver -/* IEEE802.15.4 frame version */ -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 - /* TSCH and RPL callbacks */ #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/ipv6/rpl-tsch/project-conf.h index acff65be5..16b05fffa 100644 --- a/examples/ipv6/rpl-tsch/project-conf.h +++ b/examples/ipv6/rpl-tsch/project-conf.h @@ -62,10 +62,6 @@ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver -/* IEEE802.15.4 frame version */ -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 - /* TSCH and RPL callbacks */ #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval diff --git a/examples/platform-specific/jn516x/rpl/common-conf.h b/examples/platform-specific/jn516x/rpl/common-conf.h index d79345eb9..a759dcab0 100644 --- a/examples/platform-specific/jn516x/rpl/common-conf.h +++ b/examples/platform-specific/jn516x/rpl/common-conf.h @@ -58,10 +58,6 @@ #define NETSTACK_CONF_MAC tschmac_driver -/* IEEE802.15.4 frame version */ -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 - /* TSCH and RPL callbacks */ #define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch #define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval diff --git a/examples/platform-specific/jn516x/tsch/common-conf.h b/examples/platform-specific/jn516x/tsch/common-conf.h index 385fa1d03..bc248a0cd 100644 --- a/examples/platform-specific/jn516x/tsch/common-conf.h +++ b/examples/platform-specific/jn516x/tsch/common-conf.h @@ -139,9 +139,6 @@ #if WITH_TSCH -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 - /* Contiki netstack: MAC */ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h b/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h index 851f93f3b..2b720ae70 100644 --- a/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h +++ b/regression-tests/13-ieee802154/code-flush-nbr-queue/project-conf.h @@ -48,9 +48,6 @@ #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 - #if CONTIKI_TARGET_COOJA #define COOJA_CONF_SIMULATE_TURNAROUND 0 #endif /* CONTIKI_TARGET_COOJA */ diff --git a/regression-tests/13-ieee802154/code/project-tsch-conf.h b/regression-tests/13-ieee802154/code/project-tsch-conf.h index ae994d6ca..d76d1c548 100644 --- a/regression-tests/13-ieee802154/code/project-tsch-conf.h +++ b/regression-tests/13-ieee802154/code/project-tsch-conf.h @@ -32,9 +32,6 @@ #ifndef _PROJECT_TSCH_CONF_H #define _PROJECT_TSCH_CONF_H -#undef FRAME802154_CONF_VERSION -#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012 - #undef NETSTACK_CONF_MAC #define NETSTACK_CONF_MAC tschmac_driver diff --git a/regression-tests/13-ieee802154/code/test-panid-handling.c b/regression-tests/13-ieee802154/code/test-panid-handling.c index 9c938fe7a..dd9b73304 100644 --- a/regression-tests/13-ieee802154/code/test-panid-handling.c +++ b/regression-tests/13-ieee802154/code/test-panid-handling.c @@ -181,7 +181,7 @@ setup_frame802154_2006_fcf(const panid_test_def *t, frame802154_fcf_t *fcf) static void 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->src_addr_mode, &fcf->src_addr_mode); diff --git a/regression-tests/13-ieee802154/code/test-tsch-packet.c b/regression-tests/13-ieee802154/code/test-tsch-packet.c index b50a617eb..136405315 100644 --- a/regression-tests/13-ieee802154/code/test-tsch-packet.c +++ b/regression-tests/13-ieee802154/code/test-tsch-packet.c @@ -230,7 +230,7 @@ test_parse_eb(const eb_test_vector_t *v) #endif if(frame.fcf.frame_type != FRAME802154_BEACONFRAME || - frame.fcf.frame_version != FRAME802154_IEEE802154E_2012) { + frame.fcf.frame_version != FRAME802154_IEEE802154_2015) { return FAILURE; } @@ -315,7 +315,7 @@ test_parse_eack(const eack_test_vector_t *v) #endif if(frame.fcf.frame_type != FRAME802154_ACKFRAME || - frame.fcf.frame_version != FRAME802154_IEEE802154E_2012) { + frame.fcf.frame_version != FRAME802154_IEEE802154_2015) { return FAILURE; } diff --git a/regression-tests/14-rpl-lite/04-rpl-28-hours-no-dao-ack.csc b/regression-tests/14-rpl-lite/04-rpl-28-hours-no-dao-ack.csc deleted file mode 100644 index ba628ae81..000000000 --- a/regression-tests/14-rpl-lite/04-rpl-28-hours-no-dao-ack.csc +++ /dev/null @@ -1,292 +0,0 @@ - - - [APPS_DIR]/mrm - [APPS_DIR]/mspsim - [APPS_DIR]/avrora - [APPS_DIR]/serial_socket - [APPS_DIR]/collect-view - [APPS_DIR]/powertracker - - My simulation - 123456 - 1000000 - - org.contikios.cooja.radiomediums.UDGM - 50.0 - 50.0 - 1.0 - 1.0 - - - 40000 - - - org.contikios.cooja.contikimote.ContikiMoteType - mtype110 - Sender - [CONFIG_DIR]/code/sender-node.c - make TARGET=cooja clean -make sender-node.cooja DEFINES=RPL_CONF_WITH_DAO_ACK=0 TARGET=cooja - org.contikios.cooja.interfaces.Position - org.contikios.cooja.interfaces.Battery - org.contikios.cooja.contikimote.interfaces.ContikiVib - org.contikios.cooja.contikimote.interfaces.ContikiMoteID - org.contikios.cooja.contikimote.interfaces.ContikiRS232 - org.contikios.cooja.contikimote.interfaces.ContikiBeeper - org.contikios.cooja.interfaces.RimeAddress - org.contikios.cooja.contikimote.interfaces.ContikiIPAddress - org.contikios.cooja.contikimote.interfaces.ContikiRadio - org.contikios.cooja.contikimote.interfaces.ContikiButton - org.contikios.cooja.contikimote.interfaces.ContikiPIR - org.contikios.cooja.contikimote.interfaces.ContikiClock - org.contikios.cooja.contikimote.interfaces.ContikiLED - org.contikios.cooja.contikimote.interfaces.ContikiCFS - org.contikios.cooja.interfaces.Mote2MoteRelations - org.contikios.cooja.interfaces.MoteAttributes - false - - - org.contikios.cooja.contikimote.ContikiMoteType - mtype792 - RPL root - [CONFIG_DIR]/code/root-node.c - make TARGET=cooja clean -make root-node.cooja DEFINES=RPL_CONF_WITH_DAO_ACK=0 TARGET=cooja - org.contikios.cooja.interfaces.Position - org.contikios.cooja.interfaces.Battery - org.contikios.cooja.contikimote.interfaces.ContikiVib - org.contikios.cooja.contikimote.interfaces.ContikiMoteID - org.contikios.cooja.contikimote.interfaces.ContikiRS232 - org.contikios.cooja.contikimote.interfaces.ContikiBeeper - org.contikios.cooja.interfaces.RimeAddress - org.contikios.cooja.contikimote.interfaces.ContikiIPAddress - org.contikios.cooja.contikimote.interfaces.ContikiRadio - org.contikios.cooja.contikimote.interfaces.ContikiButton - org.contikios.cooja.contikimote.interfaces.ContikiPIR - org.contikios.cooja.contikimote.interfaces.ContikiClock - org.contikios.cooja.contikimote.interfaces.ContikiLED - org.contikios.cooja.contikimote.interfaces.ContikiCFS - org.contikios.cooja.interfaces.Mote2MoteRelations - org.contikios.cooja.interfaces.MoteAttributes - false - - - org.contikios.cooja.contikimote.ContikiMoteType - mtype964 - Receiver - [CONFIG_DIR]/code/receiver-node.c - make TARGET=cooja clean -make receiver-node.cooja DEFINES=RPL_CONF_WITH_DAO_ACK=0 TARGET=cooja - org.contikios.cooja.interfaces.Position - org.contikios.cooja.interfaces.Battery - org.contikios.cooja.contikimote.interfaces.ContikiVib - org.contikios.cooja.contikimote.interfaces.ContikiMoteID - org.contikios.cooja.contikimote.interfaces.ContikiRS232 - org.contikios.cooja.contikimote.interfaces.ContikiBeeper - org.contikios.cooja.interfaces.RimeAddress - org.contikios.cooja.contikimote.interfaces.ContikiIPAddress - org.contikios.cooja.contikimote.interfaces.ContikiRadio - org.contikios.cooja.contikimote.interfaces.ContikiButton - org.contikios.cooja.contikimote.interfaces.ContikiPIR - org.contikios.cooja.contikimote.interfaces.ContikiClock - org.contikios.cooja.contikimote.interfaces.ContikiLED - org.contikios.cooja.contikimote.interfaces.ContikiCFS - org.contikios.cooja.interfaces.Mote2MoteRelations - org.contikios.cooja.interfaces.MoteAttributes - false - - - - org.contikios.cooja.interfaces.Position - 7.772906112657773 - 86.396910401861 - 0.0 - - - org.contikios.cooja.contikimote.interfaces.ContikiMoteID - 1 - - - org.contikios.cooja.contikimote.interfaces.ContikiRadio - 250.0 - - mtype964 - - - - org.contikios.cooja.interfaces.Position - 75.54361692539452 - 14.292026223193414 - 0.0 - - - org.contikios.cooja.contikimote.interfaces.ContikiMoteID - 2 - - - org.contikios.cooja.contikimote.interfaces.ContikiRadio - 250.0 - - mtype110 - - - - org.contikios.cooja.interfaces.Position - 47.962513687652844 - 7.199742533488408 - 0.0 - - - org.contikios.cooja.contikimote.interfaces.ContikiMoteID - 6 - - - org.contikios.cooja.contikimote.interfaces.ContikiRadio - 250.0 - - mtype964 - - - - org.contikios.cooja.interfaces.Position - 1.8626697045702818 - 47.783365869022624 - 0.0 - - - org.contikios.cooja.contikimote.interfaces.ContikiMoteID - 8 - - - org.contikios.cooja.contikimote.interfaces.ContikiRadio - 250.0 - - mtype964 - - - - org.contikios.cooja.interfaces.Position - 0.0 - 0.0 - 0.0 - - - org.contikios.cooja.contikimote.interfaces.ContikiMoteID - 3 - - - org.contikios.cooja.contikimote.interfaces.ContikiRadio - 250.0 - - mtype792 - - - - org.contikios.cooja.plugins.SimControl - 280 - 0 - 160 - 400 - 0 - - - org.contikios.cooja.plugins.Visualizer - - org.contikios.cooja.plugins.skins.IDVisualizerSkin - org.contikios.cooja.plugins.skins.UDGMVisualizerSkin - org.contikios.cooja.plugins.skins.GridVisualizerSkin - org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin - 2.5379695437350276 0.0 0.0 2.5379695437350276 78.27260101976275 40.72727272727276 - - 400 - 2 - 400 - 1 - 1 - - - org.contikios.cooja.plugins.LogListener - - - - - - 1184 - 3 - 240 - 402 - 162 - - - org.contikios.cooja.plugins.Notes - - Enter notes here - true - - 904 - 4 - 160 - 680 - 0 - - - org.contikios.cooja.plugins.ScriptRunner - - - true - - 962 - 1 - 596 - 603 - 43 - -