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

6
cpu/mc1322x/lib/maca.c
View file

@ -300,7 +300,7 @@ void bound_check(volatile packet_t *p) {
/* public packet routines */
/* heads are to the right */
/* ends are to the left */
void free_packet(volatile packet_t *p) {
void maca_free_packet(volatile packet_t *p) {
safe_irq_disable(MACA);
BOUND_CHECK(p);
@ -495,7 +495,7 @@ void free_all_packets(void) {
free_head = 0;
for(i=0; i<NUM_PACKETS; i++) {
free_packet((volatile packet_t *)&(packet_pool[i]));
maca_free_packet((volatile packet_t *)&(packet_pool[i]));
}
rx_head = 0; rx_end = 0;
tx_head = 0; tx_end = 0;
@ -517,7 +517,7 @@ void free_tx_head(void) {
p = tx_head;
tx_head = tx_head->left;
if(tx_head == 0) { tx_end = 0; }
free_packet(p);
maca_free_packet(p);
// print_packets("free tx head");
irq_restore();