riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace uint16_t with radio_address_t in maca

Browse Source 
adpots includes and makes them adhere to the coding conventions
This commit is contained in:
Ludwig Ortmann 2014-01-31 09:48:17 +01:00
parent e091c17040
commit 85c6b6587e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpu/mc1322x/maca/include/maca.h
View File

@ -10,9 +10,11 @@
#ifndef MACA_H_ #ifndef MACA_H_
#define MACA_H_ #define MACA_H_
#include <stdint.h>
#include "radio/types.h"
#include "maca_packet.h" #include "maca_packet.h"
#include <stdint.h>
/*********************************************************/ /*********************************************************/
/* function definitions */ /* function definitions */
@ -29,8 +31,8 @@ void maca_check ( void );
/* functions to configure MACA */ /* functions to configure MACA */
void maca_set_power ( uint8_t power ); void maca_set_power ( uint8_t power );
void maca_set_channel ( uint8_t channel ); void maca_set_channel ( uint8_t channel );
uint16_t maca_set_address ( uint16_t addr ); radio_address_t maca_set_address (radio_address_t addr );
uint16_t maca_get_address ( void ); radio_address_t maca_get_address ( void );
uint16_t maca_set_pan(uint16_t pan); uint16_t maca_set_pan(uint16_t pan);
uint16_t maca_get_pan(void); uint16_t maca_get_pan(void);

6
cpu/mc1322x/maca/maca.c
View File

@ -7,12 +7,12 @@
* *
* This file is part of RIOT. * This file is part of RIOT.
*/ */
#include <stdio.h>
#include "maca.h" #include "maca.h"
#include "maca_packet.h" #include "maca_packet.h"
#include "nvm.h" #include "nvm.h"
#include "mc1322x.h" #include "mc1322x.h"
#include <stdio.h>
// number of packets in the maca_packet_pool // number of packets in the maca_packet_pool
#ifndef MACA_NUM_PACKETS #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 ); safe_irq_disable ( INT_NUM_MACA );
MACA->MAC16ADDR = addr; MACA->MAC16ADDR = addr;
@ -910,7 +910,7 @@ uint16_t maca_set_address ( uint16_t addr ) {
return MACA->MAC16ADDR; return MACA->MAC16ADDR;
} }
uint16_t maca_get_address ( void ) { radio_address_t maca_get_address ( void ) {
return MACA->MAC16ADDR; return MACA->MAC16ADDR;
} }