Merge remote branch 'libmc1322x/master'

2011-03-11 16:28:14 -05:00 · 2011-03-11 16:28:14 -05:00 · 59d7fad746
commit 59d7fad746
parent abf6f1a153 c27e96f1e9
13 changed files with 1127 additions and 4 deletions
--- a/cpu/mc1322x/lib/include/maca.h
+++ b/cpu/mc1322x/lib/include/maca.h
@ -121,8 +121,8 @@ enum {
 #define LFSR            6                    /* 1 use polynomial for Turbolink */
 #define TM              5

-#define MODE            3
-#define MODE_MASK       bit_mask(2,MODE)
+#define MACA_MODE       3
+#define MODE_MASK       bit_mask(2,MACA_MODE)
 #define NO_CCA          0
 #define NO_SLOT_CCA     1
 #define SLOT_CCA        2