From 3d2c7346ccaf13690189987c1b2d29376ed4f00b Mon Sep 17 00:00:00 2001
From: Tom Pittenger <magicrub@gmail.com>
Date: Sat, 9 Feb 2019 21:06:15 -0800
Subject: [PATCH] AP_Radio: unify singleton naming to _singleton and
 get_singleton()

---
 libraries/AP_Radio/AP_Radio.cpp         |  4 ++--
 libraries/AP_Radio/AP_Radio.h           |  6 +++---
 libraries/AP_Radio/AP_Radio_cc2500.cpp  | 20 ++++++++++----------
 libraries/AP_Radio/AP_Radio_cypress.cpp |  8 ++++----
 libraries/AP_Radio/AP_Radio_cypress.h   |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/libraries/AP_Radio/AP_Radio.cpp b/libraries/AP_Radio/AP_Radio.cpp
index d32e32aa8e..40b8e4bfd8 100644
--- a/libraries/AP_Radio/AP_Radio.cpp
+++ b/libraries/AP_Radio/AP_Radio.cpp
@@ -140,10 +140,10 @@ AP_Radio *AP_Radio::_instance;
 AP_Radio::AP_Radio(void)
 {
     AP_Param::setup_object_defaults(this, var_info);
-    if (_instance != nullptr) {
+    if (_singleton != nullptr) {
         AP_HAL::panic("Multiple AP_Radio declarations");
     }
-    _instance = this;
+    _singleton = this;
 }
 
 bool AP_Radio::init(void)
diff --git a/libraries/AP_Radio/AP_Radio.h b/libraries/AP_Radio/AP_Radio.h
index fdd39ef584..2f18f58d15 100644
--- a/libraries/AP_Radio/AP_Radio.h
+++ b/libraries/AP_Radio/AP_Radio.h
@@ -86,8 +86,8 @@ public:
     static const struct AP_Param::GroupInfo var_info[];
 
     // get singleton instance
-    static AP_Radio *instance(void) {
-        return _instance;
+    static AP_Radio *get_singleton(void) {
+        return _singleton;
     }
 
     // handle a data96 mavlink packet for fw upload
@@ -117,5 +117,5 @@ private:
     AP_Int8 auto_bind_time;
     AP_Int8 auto_bind_rssi;
     
-    static AP_Radio *_instance;
+    static AP_Radio *_singleton;
 };
diff --git a/libraries/AP_Radio/AP_Radio_cc2500.cpp b/libraries/AP_Radio/AP_Radio_cc2500.cpp
index aa16b6da56..38b4058172 100644
--- a/libraries/AP_Radio/AP_Radio_cc2500.cpp
+++ b/libraries/AP_Radio/AP_Radio_cc2500.cpp
@@ -34,7 +34,7 @@ extern const AP_HAL::HAL& hal;
 #define LP_FIFO_SIZE  16      // Physical data FIFO lengths in Radio
 
 // object instance for trampoline
-AP_Radio_cc2500 *AP_Radio_cc2500::radio_instance;
+AP_Radio_cc2500 *AP_Radio_cc2500::radio_singleton;
 #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
 thread_t *AP_Radio_cc2500::_irq_handler_ctx;
 virtual_timer_t AP_Radio_cc2500::timeout_vt;
@@ -49,7 +49,7 @@ AP_Radio_cc2500::AP_Radio_cc2500(AP_Radio &_radio) :
     cc2500(hal.spi->get_device("cc2500"))
 {
     // link to instance for irq_trampoline
-    radio_instance = this;
+    radio_singleton = this;
 }
 
 /*
@@ -704,31 +704,31 @@ void AP_Radio_cc2500::irq_handler_thd(void *arg)
     while(true) {
         eventmask_t evt = chEvtWaitAny(ALL_EVENTS);
 
-        radio_instance->cc2500.lock_bus();
+        radio_singleton->cc2500.lock_bus();
         
         switch(evt) {
         case EVT_IRQ:
-            if (radio_instance->protocolState == STATE_FCCTEST) {
+            if (radio_singleton->protocolState == STATE_FCCTEST) {
                 hal.console->printf("IRQ FCC\n");
             }
-            radio_instance->irq_handler();
+            radio_singleton->irq_handler();
             break;
         case EVT_TIMEOUT:
-            if (radio_instance->cc2500.ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x80) {
+            if (radio_singleton->cc2500.ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x80) {
                 irq_time_us = AP_HAL::micros();
-                radio_instance->irq_handler();
+                radio_singleton->irq_handler();
             } else {
-                radio_instance->irq_timeout();
+                radio_singleton->irq_timeout();
             }
             break;
         case EVT_BIND:
-            radio_instance->initTuneRx();
+            radio_singleton->initTuneRx();
             break;
         default:
             break;
         }
 
-        radio_instance->cc2500.unlock_bus();
+        radio_singleton->cc2500.unlock_bus();
     }
 }
 
diff --git a/libraries/AP_Radio/AP_Radio_cypress.cpp b/libraries/AP_Radio/AP_Radio_cypress.cpp
index eeb72dbf64..5c3594979d 100644
--- a/libraries/AP_Radio/AP_Radio_cypress.cpp
+++ b/libraries/AP_Radio/AP_Radio_cypress.cpp
@@ -241,7 +241,7 @@ enum {
 #define AUTOBIND_CHANNEL 12
 
 // object instance for trampoline
-AP_Radio_cypress *AP_Radio_cypress::radio_instance;
+AP_Radio_cypress *AP_Radio_cypress::radio_singleton;
 #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
 thread_t *AP_Radio_cypress::_irq_handler_ctx;
 #endif
@@ -252,7 +252,7 @@ AP_Radio_cypress::AP_Radio_cypress(AP_Radio &_radio) :
     AP_Radio_backend(_radio)
 {
     // link to instance for irq_trampoline
-    radio_instance = this;
+    radio_singleton = this;
 }
 
 /*
@@ -1197,10 +1197,10 @@ void AP_Radio_cypress::irq_handler_thd(void *arg)
     while(true) {
         eventmask_t evt = chEvtWaitAny(ALL_EVENTS);
         if (evt & EVT_IRQ) {
-            radio_instance->irq_handler();
+            radio_singleton->irq_handler();
         }
         if (evt & EVT_TIMEOUT) {
-            radio_instance->irq_timeout();
+            radio_singleton->irq_timeout();
         }
     }
 }
diff --git a/libraries/AP_Radio/AP_Radio_cypress.h b/libraries/AP_Radio/AP_Radio_cypress.h
index 728b1386d3..30eac3ab4e 100644
--- a/libraries/AP_Radio/AP_Radio_cypress.h
+++ b/libraries/AP_Radio/AP_Radio_cypress.h
@@ -77,7 +77,7 @@ public:
     
 private:
     AP_HAL::OwnPtr<AP_HAL::SPIDevice> dev;
-    static AP_Radio_cypress *radio_instance;
+    static AP_Radio_cypress *radio_singleton;
 
     void radio_init(void);