From 99f7fe6bd4ab7bc332fcbe35ef741a4142a73b1f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 21 Apr 2020 08:38:34 +1000
Subject: Clean up ATSAM ifdefs (#8808)

---
 tmk_core/protocol/arm_atsam/usb/main_usb.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'tmk_core/protocol/arm_atsam/usb/main_usb.c')

diff --git a/tmk_core/protocol/arm_atsam/usb/main_usb.c b/tmk_core/protocol/arm_atsam/usb/main_usb.c
index 3809e1fd02..5fcb9a9c61 100644
--- a/tmk_core/protocol/arm_atsam/usb/main_usb.c
+++ b/tmk_core/protocol/arm_atsam/usb/main_usb.c
@@ -18,7 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "samd51j18a.h"
 #include "conf_usb.h"
 #include "udd.h"
-#ifdef RAW
+
+#ifdef RAW_ENABLE
 #    include "raw_hid.h"
 #endif
 
@@ -34,7 +35,6 @@ void main_remotewakeup_enable(void) { ui_wakeup_enable(); }
 
 void main_remotewakeup_disable(void) { ui_wakeup_disable(); }
 
-#ifdef KBD
 volatile bool main_b_kbd_enable = false;
 bool          main_kbd_enable(void) {
     main_b_kbd_enable = true;
@@ -42,9 +42,8 @@ bool          main_kbd_enable(void) {
 }
 
 void main_kbd_disable(void) { main_b_kbd_enable = false; }
-#endif
 
-#ifdef NKRO
+#ifdef NKRO_ENABLE
 volatile bool main_b_nkro_enable = false;
 bool          main_nkro_enable(void) {
     main_b_nkro_enable = true;
@@ -54,7 +53,7 @@ bool          main_nkro_enable(void) {
 void main_nkro_disable(void) { main_b_nkro_enable = false; }
 #endif
 
-#ifdef EXK
+#ifdef EXTRAKEY_ENABLE
 volatile bool main_b_exk_enable = false;
 bool          main_exk_enable(void) {
     main_b_exk_enable = true;
@@ -64,7 +63,7 @@ bool          main_exk_enable(void) {
 void main_exk_disable(void) { main_b_exk_enable = false; }
 #endif
 
-#ifdef CON
+#ifdef CONSOLE_ENABLE
 volatile bool main_b_con_enable = false;
 bool          main_con_enable(void) {
     main_b_con_enable = true;
@@ -74,7 +73,7 @@ bool          main_con_enable(void) {
 void main_con_disable(void) { main_b_con_enable = false; }
 #endif
 
-#ifdef MOU
+#ifdef MOUSE_ENABLE
 volatile bool main_b_mou_enable = false;
 bool          main_mou_enable(void) {
     main_b_mou_enable = true;
@@ -84,7 +83,7 @@ bool          main_mou_enable(void) {
 void main_mou_disable(void) { main_b_mou_enable = false; }
 #endif
 
-#ifdef RAW
+#ifdef RAW_ENABLE
 volatile bool main_b_raw_enable = false;
 bool          main_raw_enable(void) {
     main_b_raw_enable = true;
-- 
cgit v1.2.3