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

'free_packet' in csma.c conflicted with 'free_packet' in maca.c

Browse source
This commit is contained in:
kkrentz 2014-02-07 11:51:01 -08:00
parent 648d3576a0
commit 4493783ce9
8 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cpu/mc1322x/lib/include/maca.h
View file

@ -71,7 +71,7 @@ extern volatile uint8_t prm_mode;
void tx_packet(volatile packet_t *p);
volatile packet_t* rx_packet(void);
volatile packet_t* get_free_packet(void);
void free_packet(volatile packet_t *p);
void maca_free_packet(volatile packet_t *p);
void free_all_packets(void);
extern volatile packet_t *rx_head, *tx_head;