diff --git a/cpu/mc1322x/maca/include/maca.h b/cpu/mc1322x/maca/include/maca.h index 10fe7fc7dd..94956467d9 100644 --- a/cpu/mc1322x/maca/include/maca.h +++ b/cpu/mc1322x/maca/include/maca.h @@ -10,9 +10,11 @@ #ifndef MACA_H_ #define MACA_H_ +#include + +#include "radio/types.h" #include "maca_packet.h" -#include /*********************************************************/ /* function definitions */ @@ -29,8 +31,8 @@ void maca_check ( void ); /* functions to configure MACA */ void maca_set_power ( uint8_t power ); void maca_set_channel ( uint8_t channel ); -uint16_t maca_set_address ( uint16_t addr ); -uint16_t maca_get_address ( void ); +radio_address_t maca_set_address (radio_address_t addr ); +radio_address_t maca_get_address ( void ); uint16_t maca_set_pan(uint16_t pan); uint16_t maca_get_pan(void); diff --git a/cpu/mc1322x/maca/maca.c b/cpu/mc1322x/maca/maca.c index 9939157817..cb510b9397 100644 --- a/cpu/mc1322x/maca/maca.c +++ b/cpu/mc1322x/maca/maca.c @@ -7,12 +7,12 @@ * * This file is part of RIOT. */ +#include #include "maca.h" #include "maca_packet.h" #include "nvm.h" #include "mc1322x.h" -#include // number of packets in the maca_packet_pool #ifndef MACA_NUM_PACKETS @@ -897,7 +897,7 @@ void maca_set_channel ( uint8_t chan ) { } } -uint16_t maca_set_address ( uint16_t addr ) { +radio_address_t maca_set_address (radio_address_t addr) { safe_irq_disable ( INT_NUM_MACA ); MACA->MAC16ADDR = addr; @@ -910,7 +910,7 @@ uint16_t maca_set_address ( uint16_t addr ) { return MACA->MAC16ADDR; } -uint16_t maca_get_address ( void ) { +radio_address_t maca_get_address ( void ) { return MACA->MAC16ADDR; }