From c12942ed41e0cb35c26b82712a02f78345dba7cc Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Mon, 7 Nov 2016 22:29:35 +0900
Subject: [PATCH] Substitute FEATURE_MSP_DISPLAYPORT with !defined(OSD)

Save feature bits.
---
 src/main/fc/config.h     | 1 -
 src/main/io/serial_cli.c | 2 +-
 src/main/main.c          | 6 ++----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/fc/config.h b/src/main/fc/config.h
index ce9cf8d5af..e6cc491229 100644
--- a/src/main/fc/config.h
+++ b/src/main/fc/config.h
@@ -55,7 +55,6 @@ typedef enum {
     FEATURE_VTX = 1 << 24,
     FEATURE_RX_SPI = 1 << 25,
     FEATURE_SOFTSPI = 1 << 26,
-    FEATURE_MSP_DISPLAYPORT = 1 << 27,
 } features_e;
 
 void beeperOffSet(uint32_t mask);
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 7f2c858df1..4ee0324e62 100755
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -229,7 +229,7 @@ static const char * const featureNames[] = {
     "SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM",
     "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD",
     "BLACKBOX", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE",
-    " ", "VTX", "RX_SPI", "SOFTSPI", "MSP_DISPLAYPORT", NULL
+    " ", "VTX", "RX_SPI", "SOFTSPI", NULL
 };
 
 // sync this with rxFailsafeChannelMode_e
diff --git a/src/main/main.c b/src/main/main.c
index 515573887b..6ad8fbc9c7 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -460,10 +460,8 @@ void init(void)
     mspFcInit();
     mspSerialInit();
 
-#ifdef USE_MSP_DISPLAYPORT
-    if (feature(FEATURE_MSP_DISPLAYPORT)) {
-        cmsDisplayPortRegister(displayPortMspInit());
-    }
+#if defined(USE_MSP_DISPLAYPORT) && defined(CMS)
+    cmsDisplayPortRegister(displayPortMspInit());
 #endif
 
 #ifdef USE_CLI