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

added possibility to hard-code 7 bytes of the MAC address - last byte picked from nodeid

Browse source
This commit is contained in:
joxe 2010-03-19 14:08:15 +00:00
parent fc61ee5dbb
commit 29335f2f7d
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
platform/sky/contiki-sky-main.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: contiki-sky-main.c,v 1.77 2010/03/19 13:28:27 adamdunkels Exp $ * @(#)$Id: contiki-sky-main.c,v 1.78 2010/03/19 14:08:15 joxe Exp $
*/ */
#include <signal.h> #include <signal.h>
@ -222,7 +222,7 @@ main(int argc, char **argv)
with an Ethernet MAC address - byte 0 (byte 2 in the DS ID) with an Ethernet MAC address - byte 0 (byte 2 in the DS ID)
cannot be odd. */ cannot be odd. */
ds2411_id[2] &= 0xfe; ds2411_id[2] &= 0xfe;
leds_on(LEDS_BLUE); leds_on(LEDS_BLUE);
xmem_init(); xmem_init();
@ -236,6 +236,15 @@ main(int argc, char **argv)
/* Restore node id if such has been stored in external mem */ /* Restore node id if such has been stored in external mem */
node_id_restore(); node_id_restore();
/* for setting "hardcoded" IEEE 802.15.4 MAC addresses */
#ifdef IEEE_802154_MAC_ADDRESS
{
uint8_t ieee[] = IEEE_802154_MAC_ADDRESS;
memcpy(ds2411_id, ieee, sizeof(uip_lladdr.addr));
ds2411_id[7] = node_id & 0xff;
}
#endif
random_init(ds2411_id[0] + node_id); random_init(ds2411_id[0] + node_id);
leds_off(LEDS_BLUE); leds_off(LEDS_BLUE);