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

cpu/mc1322x/contiki-maca.c

@@ -229,7 +229,7 @@ int contiki_maca_read(void *buf, unsigned short bufsize) {
 		}
 #endif
 		PRINTF("\n\r");
-		free_packet(p);
+		maca_free_packet(p);
 		return bufsize;
 	} else {
 		return 0;

cpu/mc1322x/lib/include/maca.h

@@ -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;

cpu/mc1322x/lib/maca.c

@@ -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();

cpu/mc1322x/tests/autoack-rx.c

@@ -94,7 +94,7 @@ void main(void) {
 			/* print and free the packet */
 			printf("autoack-rx --- ");
 			print_packet(p);
-			free_packet(p);
+			maca_free_packet(p);
 		}
 
 		if(uart1_can_get()) {

cpu/mc1322x/tests/autoack-tx.c

@@ -139,7 +139,7 @@ void main(void) {
 			if(p) {
 				printf("RX: ");
 				print_packet(p);
-				free_packet(p);
+				maca_free_packet(p);
 			}
 		}
 

cpu/mc1322x/tests/per.c

@@ -146,7 +146,7 @@ void main(void) {
 				print_packet(p);
 				type = get_packet_type((packet_t *) p);
 				addr = 0; /* FIXME */
-				free_packet(p);
+				maca_free_packet(p);
 				/* pick a new address if someone else is using ours */
 				if(addr == my_addr) {
 					my_addr = random_short_addr();

cpu/mc1322x/tests/rftest-rx.c

@@ -87,7 +87,7 @@ void main(void) {
 			/* print and free the packet */
 			printf("rftest-rx --- ");
 			print_packet(p);
-			free_packet(p);
+			maca_free_packet(p);
 		}
 
 		if(uart1_can_get()) {

cpu/mc1322x/tests/rftest-tx.c

@@ -94,7 +94,7 @@ void main(void) {
 		check_maca();
 
 		while((p = rx_packet())) {
-			if(p) free_packet(p);
+			if(p) maca_free_packet(p);
 		}
 
 		p = get_free_packet();