Correct names for Atmel previous radio fixes plus static declarations.

qbeacco · Apr 2, 2017 · aed5457 · aed5457
1 parent 093550e
commit aed5457
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/cpu/avr/radio/rf230bb/halbb.c b/cpu/avr/radio/rf230bb/halbb.c
@@ -81,7 +81,7 @@ extern uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
 #include "at86rf230_registermap.h"
 #endif
 
-extern void get_last_rx_packet_timestamp(void);
+extern void rf230_get_last_rx_packet_timestamp(void);
 /*============================ VARIABLES =====================================*/
 
 volatile extern signed char rf230_last_rssi;
@@ -668,7 +668,7 @@ ISR(TRX24_RX_START_vect)
 #if !RF230_CONF_AUTOACK
     rf230_last_rssi = 3 * hal_subregister_read(SR_RSSI);
 #endif
-    get_last_rx_packet_timestamp();
+    rf230_get_last_rx_packet_timestamp();
 }
 
 /* PLL has locked, either from a transition out of TRX_OFF or a channel change while on */

diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
@@ -146,7 +146,7 @@ uint8_t ack_pending,ack_seqnum;
 #warning RF230 Untested Configuration!
 #endif
 
-rtimer_clock_t last_rx_packet_timestamp;
+static rtimer_clock_t rf230_last_rx_packet_timestamp;
 
 struct timestamp {
   uint16_t time;
@@ -283,7 +283,7 @@ get_poll_mode(void)
   return poll_mode;
 }
 
-void
+static void
 set_frame_filtering(bool i)
 {
   if(i)
@@ -302,7 +302,7 @@ get_frame_filtering(void)
   return 1;
 }
 
-void
+static void
 set_auto_ack(bool i)
 {
   if(i)
@@ -334,14 +334,14 @@ rf230_get_panid(void)
   return pan;
 }
 
-void
+static void
 rf230_set_panid(uint16_t pan)
 {
   hal_register_write(RG_PAN_ID_1, (pan >> 8));
   hal_register_write(RG_PAN_ID_0, (pan & 0xFF));
 }
 
-uint16_t
+static uint16_t
 rf230_get_short_addr(void)
 {
   unsigned char a0, a1;
@@ -350,7 +350,7 @@ rf230_get_short_addr(void)
   return (a1 << 8) | a0;
 }
 
-void
+static void
 rf230_set_short_addr(uint16_t addr)
 {
   hal_register_write(RG_SHORT_ADDR_0, (addr & 0xFF));
@@ -489,7 +489,7 @@ get_object(radio_param_t param, void *dest, size_t size)
     if(size != sizeof(rtimer_clock_t) || !dest) {
       return RADIO_RESULT_INVALID_VALUE;
     }
-    *(rtimer_clock_t *)dest = last_rx_packet_timestamp;
+    *(rtimer_clock_t *)dest = rf230_last_rx_packet_timestamp;
 
     return RADIO_RESULT_OK;
   }
@@ -1548,9 +1548,9 @@ rf230_set_pan_addr(unsigned pan,
 
 /* From ISR context */
 void
-get_last_rx_packet_timestamp(void)
+rf230_get_last_rx_packet_timestamp(void)
 {
-    last_rx_packet_timestamp = RTIMER_NOW();
+    rf230_last_rx_packet_timestamp = RTIMER_NOW();
 }
 
 /*---------------------------------------------------------------------------*/