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

Fix incorrect IEEE address byte re-ordering

Browse source
This commit is contained in:
LudovicW 2014-04-25 09:32:37 +02:00 committed by George Oikonomou
parent 2e166a83c7
commit 66edb5b263
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cpu/cc2538/ieee-addr.c
View file

@ -49,10 +49,22 @@ ieee_addr_cpy_to(uint8_t *dst, uint8_t len)
memcpy(dst, &ieee_addr_hc[8 - len], len); memcpy(dst, &ieee_addr_hc[8 - len], len);
} else { } else {
/* Reading from Info Page, we need to invert byte order */ /* Verify if we detect TI OUI in fourth position. TI store the MAC @ on
two parts (4 bytes LSB first and 4 bytes MSB) in this case, we need
to flip the 2 parts */
int i; int i;
for(i = 0; i < len; i++) { uint8_t oui_ti[3] = IEEE_ADDR_OUI_TI;
dst[i] = ((uint8_t *)IEEE_ADDR_LOCATION)[len - 1 - i]; if(((uint8_t *)IEEE_ADDR_LOCATION)[3] == oui_ti[0] && ((uint8_t *)IEEE_ADDR_LOCATION)[2] == oui_ti[1] && ((uint8_t *)IEEE_ADDR_LOCATION)[1] == oui_ti[2]) {
for(i = 0; i < len / 2; i++) {
dst[i] = ((uint8_t *)IEEE_ADDR_LOCATION)[len / 2 - 1 - i];
}
for(i = 0; i < len / 2; i++) {
dst[i + len / 2] = ((uint8_t *)IEEE_ADDR_LOCATION)[len - 1 - i];
}
} else {
for(i = 0; i < len; i++) {
dst[i] = ((uint8_t *)IEEE_ADDR_LOCATION)[len - 1 - i];
}
} }
} }

7
cpu/cc2538/ieee-addr.h
View file

@ -48,6 +48,13 @@
#include <stdint.h> #include <stdint.h>
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/**
* \name TI OUI
* @{
*/
#define IEEE_ADDR_OUI_TI { 0x00, 0x12, 0x4B } /**< TI OUI */
/** @} */
/*---------------------------------------------------------------------------*/
/** /**
* \name IEEE address locations * \name IEEE address locations
* @{ * @{