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

jn516x: remove temporary adjustements for compilation in a 802.15.4e-free Contiki

Browse source
This commit is contained in:
Simon Duquennoy 2015-12-04 10:15:22 +01:00
parent d79ce957a1
commit cc58384b40
8 changed files with 14 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/net/mac/tsch/tsch-slot-operation.c
View file

@ -808,9 +808,8 @@ PT_THREAD(tsch_rx_slot(struct pt *pt, struct rtimer *t))
} else {
TSCH_LOG_ADD(tsch_log_message,
snprintf(log->message, sizeof(log->message),
"!not for us %x:%x:%x:%x",
destination_address.u8[4], destination_address.u8[5],
destination_address.u8[6], destination_address.u8[7]);
"!not for us %x:%x",
destination_address.u8[LINKADDR_SIZE - 2], destination_address.u8[LINKADDR_SIZE - 1]);
);
}

5
core/net/mac/tsch/tsch.c
View file

@ -122,10 +122,15 @@ static const uint16_t tsch_default_timing_us[tsch_ts_elements_count] = {
/* TSCH timeslot timing (in rtimer ticks) */
rtimer_clock_t tsch_timing[tsch_ts_elements_count];
#if LINKADDR_SIZE == 8
/* 802.15.4 broadcast MAC address */
const linkaddr_t tsch_broadcast_address = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
/* Address used for the EB virtual neighbor queue */
const linkaddr_t tsch_eb_address = { { 0, 0, 0, 0, 0, 0, 0, 0 } };
#else /* LINKADDR_SIZE == 8 */
const linkaddr_t tsch_broadcast_address = { { 0xff, 0xff } };
const linkaddr_t tsch_eb_address = { { 0, 0 } };
#endif /* LINKADDR_SIZE == 8 */
/* Is TSCH started? */
int tsch_is_started = 0;