mc1322x: setup hardware addresses and enable AUTOACK mode if

configured
2011-02-23 11:29:21 -08:00 · 2011-02-23 11:29:21 -08:00 · c2c70a22df
commit c2c70a22df
parent c12ab0d484
1 changed files with 0 additions and 2 deletions
--- a/platform/redbee-econotag/contiki-mc1322x-main.c
+++ b/platform/redbee-econotag/contiki-mc1322x-main.c
@ -422,8 +422,6 @@ main(void)
         RF_CHANNEL);
 #endif /* WITH_UIP6 */

-<<<<<<< HEAD
-=======
  *MACA_MACPANID = 0xcdab; /* this is the hardcoded contiki pan, register is PACKET order */
  *MACA_MAC16ADDR = 0xffff; /* short addressing isn't used, set this to 0xffff for now */