From d2fe67aa45370c862f6755fd54b78ce1e0804808 Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Sat, 1 Apr 2017 02:07:55 +0900
Subject: [PATCH] Fix (bad) CMS device registration order

---
 src/main/fc/fc_init.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index 28e8e4b5e..af9fdcc33 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -427,10 +427,6 @@ void init(void)
     mspFcInit();
     mspSerialInit();
 
-#if defined(USE_MSP_DISPLAYPORT) && defined(CMS)
-    cmsDisplayPortRegister(displayPortMspInit());
-#endif
-
 #ifdef USE_CLI
     cliInit(serialConfig());
 #endif
@@ -439,19 +435,30 @@ void init(void)
 
     rxInit();
 
+    displayPort_t *osdDisplayPort = NULL;
+
 #ifdef OSD
     //The OSD need to be initialised after GYRO to avoid GYRO initialisation failure on some targets
+
     if (feature(FEATURE_OSD)) {
 #if defined(USE_MAX7456)
         // if there is a max7456 chip for the OSD then use it, otherwise use MSP
-        displayPort_t *osdDisplayPort = max7456DisplayPortInit(vcdProfile());
+        osdDisplayPort = max7456DisplayPortInit(vcdProfile());
 #elif defined(USE_MSP_DISPLAYPORT)
-        displayPort_t *osdDisplayPort = displayPortMspInit();
+        osdDisplayPort = displayPortMspInit();
 #endif
         osdInit(osdDisplayPort);
     }
 #endif
 
+#if defined(USE_MSP_DISPLAYPORT) && defined(CMS)
+    // If BFOSD is active, then register it as CMS device, else register MSP.
+    if (osdDisplayPort)
+        cmsDisplayPortRegister(osdDisplayPort);
+    else
+        cmsDisplayPortRegister(displayPortMspInit());
+#endif
+
 #ifdef GPS
     if (feature(FEATURE_GPS)) {
         gpsInit();