From 0981433277c6ebf40743aa5bed1a2520b0660d95 Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Mon, 8 Oct 2018 15:48:29 +0900
Subject: [PATCH] Add conditionals for receiver protocols

---
 src/main/rx/crsf.c          | 2 +-
 src/main/rx/fport.c         | 2 +-
 src/main/rx/ibus.c          | 2 +-
 src/main/rx/jetiexbus.c     | 4 ++--
 src/main/rx/sbus.c          | 2 +-
 src/main/rx/sbus_channels.c | 2 +-
 src/main/rx/spektrum.c      | 3 ++-
 src/main/rx/sumd.c          | 2 +-
 src/main/rx/sumh.c          | 4 +---
 src/main/rx/xbus.c          | 2 +-
 10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/rx/crsf.c b/src/main/rx/crsf.c
index 0e62f46ffc..b901559aa1 100644
--- a/src/main/rx/crsf.c
+++ b/src/main/rx/crsf.c
@@ -25,7 +25,7 @@
 
 #include "platform.h"
 
-#ifdef USE_SERIAL_RX
+#ifdef USE_SERIALRX_CRSF
 
 #include "build/build_config.h"
 #include "build/debug.h"
diff --git a/src/main/rx/fport.c b/src/main/rx/fport.c
index bd4b1ac0b2..9b2bf72427 100644
--- a/src/main/rx/fport.c
+++ b/src/main/rx/fport.c
@@ -25,7 +25,7 @@
 
 #include "platform.h"
 
-#if defined(USE_SERIALRX_FPORT)
+#ifdef USE_SERIALRX_FPORT
 
 #include "build/debug.h"
 
diff --git a/src/main/rx/ibus.c b/src/main/rx/ibus.c
index dd9bca21fc..727f071e3d 100644
--- a/src/main/rx/ibus.c
+++ b/src/main/rx/ibus.c
@@ -31,7 +31,7 @@
 
 #include "platform.h"
 
-#ifdef USE_SERIAL_RX
+#ifdef USE_SERIALRX_IBUS
 
 #include "pg/rx.h"
 
diff --git a/src/main/rx/jetiexbus.c b/src/main/rx/jetiexbus.c
index a98b18af85..c2a64e8a76 100644
--- a/src/main/rx/jetiexbus.c
+++ b/src/main/rx/jetiexbus.c
@@ -42,7 +42,7 @@
 
 #include "platform.h"
 
-#ifdef USE_SERIAL_RX
+#ifdef USE_SERIALRX_JETIEXBUS
 
 #include "build/build_config.h"
 #include "build/debug.h"
@@ -278,4 +278,4 @@ bool jetiExBusInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfi
         );
     return jetiExBusPort != NULL;
 }
-#endif // SERIAL_RX
\ No newline at end of file
+#endif // SERIAL_RX
diff --git a/src/main/rx/sbus.c b/src/main/rx/sbus.c
index c5fb0787d5..14a544c723 100644
--- a/src/main/rx/sbus.c
+++ b/src/main/rx/sbus.c
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 
-#ifdef USE_SERIAL_RX
+#ifdef USE_SERIALRX_SBUS
 
 #include "build/debug.h"
 
diff --git a/src/main/rx/sbus_channels.c b/src/main/rx/sbus_channels.c
index a709427e20..740d76a16c 100644
--- a/src/main/rx/sbus_channels.c
+++ b/src/main/rx/sbus_channels.c
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 
-#ifdef USE_SERIAL_RX
+#ifdef USE_SERIALRX_SBUS
 
 #include "common/utils.h"
 
diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c
index bd0fcabe6f..05e74ec97e 100644
--- a/src/main/rx/spektrum.c
+++ b/src/main/rx/spektrum.c
@@ -19,7 +19,8 @@
  */
 
 #include "platform.h"
-#ifdef USE_SERIAL_RX
+
+#ifdef USE_SERIALRX_SPEKTRUM
 
 #include <string.h>
 
diff --git a/src/main/rx/sumd.c b/src/main/rx/sumd.c
index 9b838a1287..717d126ba8 100644
--- a/src/main/rx/sumd.c
+++ b/src/main/rx/sumd.c
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 
-#ifdef USE_SERIAL_RX
+#ifdef USE_SERIALRX_SUMD
 
 #include "common/crc.h"
 #include "common/utils.h"
diff --git a/src/main/rx/sumh.c b/src/main/rx/sumh.c
index c23f30e6a4..07af12aa20 100644
--- a/src/main/rx/sumh.c
+++ b/src/main/rx/sumh.c
@@ -30,7 +30,7 @@
 
 #include "platform.h"
 
-#ifdef USE_SERIAL_RX
+#ifdef USE_SERIALRX_SUMH
 
 #include "common/utils.h"
 
@@ -47,8 +47,6 @@
 #include "rx/rx.h"
 #include "rx/sumh.h"
 
-// driver for SUMH receiver using UART2
-
 #define SUMH_BAUDRATE 115200
 
 #define SUMH_MAX_CHANNEL_COUNT 8
diff --git a/src/main/rx/xbus.c b/src/main/rx/xbus.c
index 748f70b0fe..8ac66055b4 100644
--- a/src/main/rx/xbus.c
+++ b/src/main/rx/xbus.c
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 
-#if defined(USE_SERIAL_RX) && defined(USE_SERIALRX_XBUS)
+#ifdef USE_SERIALRX_XBUS
 
 #include "common/crc.h"