From d1302712f2dbef03048ad67c7038af8e03cc53a9 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Fri, 28 Apr 2017 09:46:44 +0100
Subject: [PATCH] Tidied blackbox function names to have blackbox prefix

---
 src/main/blackbox/blackbox.c     | 18 +++++++++---------
 src/main/blackbox/blackbox.h     |  9 ++++-----
 src/main/cms/cms_menu_blackbox.c |  2 +-
 src/main/fc/fc_core.c            |  4 ++--
 src/main/fc/fc_init.c            |  2 +-
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index 661495625..ab53027a6 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -787,7 +787,7 @@ static int gcd(int num, int denom)
     return gcd(denom, num % denom);
 }
 
-void validateBlackboxConfig()
+void blackboxValidateConfig()
 {
     int div;
 
@@ -825,9 +825,9 @@ void validateBlackboxConfig()
 /**
  * Start Blackbox logging if it is not already running. Intended to be called upon arming.
  */
-void startBlackbox(void)
+static void blackboxStart(void)
 {
-    validateBlackboxConfig();
+    blackboxValidateConfig();
 
     if (!blackboxDeviceOpen()) {
         blackboxSetState(BLACKBOX_STATE_DISABLED);
@@ -870,7 +870,7 @@ void startBlackbox(void)
 /**
  * Begin Blackbox shutdown.
  */
-void finishBlackbox(void)
+void blackboxFinish(void)
 {
     switch (blackboxState) {
     case BLACKBOX_STATE_DISABLED:
@@ -903,14 +903,14 @@ void startInTestMode(void)
                 return; // When in test mode, we cannot share the MSP and serial logger port!
             }
         }
-        startBlackbox();
+        blackboxStart();
         startedLoggingInTestMode = true;
     }
 }
 void stopInTestMode(void)
 {
     if(startedLoggingInTestMode) {
-        finishBlackbox();
+        blackboxFinish();
         startedLoggingInTestMode = false;
     }
 }
@@ -1484,7 +1484,7 @@ static void blackboxLogIteration(timeUs_t currentTimeUs)
 /**
  * Call each flight loop iteration to perform blackbox logging.
  */
-void handleBlackbox(timeUs_t currentTimeUs)
+void blackboxUpdate(timeUs_t currentTimeUs)
 {
     int i;
   
@@ -1492,7 +1492,7 @@ void handleBlackbox(timeUs_t currentTimeUs)
     case BLACKBOX_STATE_STOPPED:
         if (ARMING_FLAG(ARMED)) {
             blackboxOpen();
-            startBlackbox();
+            blackboxStart();
         }
 #ifdef USE_FLASHFS
         if (IS_RC_MODE_ACTIVE(BOXBLACKBOXERASE)) {
@@ -1676,7 +1676,7 @@ void handleBlackbox(timeUs_t currentTimeUs)
 /**
  * Call during system startup to initialize the blackbox.
  */
-void initBlackbox(void)
+void blackboxInit(void)
 {
     if (blackboxConfig()->device) {
         blackboxSetState(BLACKBOX_STATE_STOPPED);
diff --git a/src/main/blackbox/blackbox.h b/src/main/blackbox/blackbox.h
index 44269c5b4..acb145542 100644
--- a/src/main/blackbox/blackbox.h
+++ b/src/main/blackbox/blackbox.h
@@ -45,10 +45,9 @@ PG_DECLARE(blackboxConfig_t, blackboxConfig);
 
 void blackboxLogEvent(FlightLogEvent event, flightLogEventData_t *data);
 
-void initBlackbox(void);
-void handleBlackbox(timeUs_t currentTimeUs);
-void validateBlackboxConfig();
-void startBlackbox(void);
-void finishBlackbox(void);
+void blackboxInit(void);
+void blackboxUpdate(timeUs_t currentTimeUs);
+void blackboxValidateConfig();
+void blackboxFinish(void);
 
 bool blackboxMayEditConfig(void);
diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c
index ac42ad85e..e86b730e7 100644
--- a/src/main/cms/cms_menu_blackbox.c
+++ b/src/main/cms/cms_menu_blackbox.c
@@ -178,7 +178,7 @@ static long cmsx_Blackbox_onExit(const OSD_Entry *self)
 
     if (blackboxMayEditConfig()) {
         blackboxConfigMutable()->device = cmsx_BlackboxDevice;
-        validateBlackboxConfig();
+        blackboxValidateConfig();
     }
     blackboxConfigMutable()->rate_denom = blackboxConfig_rate_denom;
     return 0;
diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
index 3a0d91044..cc23aed86 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/fc_core.c
@@ -177,7 +177,7 @@ void mwDisarm(void)
 
 #ifdef BLACKBOX
         if (blackboxConfig()->device) {
-            finishBlackbox();
+            blackboxFinish();
         }
 #endif
         BEEP_OFF;
@@ -555,7 +555,7 @@ static void subTaskMainSubprocesses(timeUs_t currentTimeUs)
 
 #ifdef BLACKBOX
     if (!cliMode && blackboxConfig()->device) {
-        handleBlackbox(currentTimeUs);
+        blackboxUpdate(currentTimeUs);
     }
 #else
     UNUSED(currentTimeUs);
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index a19d15192..b14857e34 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -550,7 +550,7 @@ void init(void)
 #endif
 
 #ifdef BLACKBOX
-    initBlackbox();
+    blackboxInit();
 #endif
 
     if (mixerConfig()->mixerMode == MIXER_GIMBAL) {