From 9331c22620fb9a4012a370d717e6362a5ab84ec4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 18 Mar 2021 11:48:09 +1100
Subject: XT converter cleanup (#12264)

---
 tmk_core/protocol/xt.h | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'tmk_core/protocol/xt.h')

diff --git a/tmk_core/protocol/xt.h b/tmk_core/protocol/xt.h
index 6dc5f19d00..cc55b7dbca 100644
--- a/tmk_core/protocol/xt.h
+++ b/tmk_core/protocol/xt.h
@@ -38,33 +38,36 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
 
-#define XT_DATA_IN()                        \
-    do {                                    \
-        XT_DATA_DDR &= ~(1 << XT_DATA_BIT); \
-        XT_DATA_PORT |= (1 << XT_DATA_BIT); \
+#include "quantum.h"
+
+#define XT_DATA_IN()               \
+    do {                           \
+        setPinInput(XT_DATA_PIN);  \
+        writePinHigh(XT_DATA_PIN); \
     } while (0)
 
-#define XT_DATA_READ() (XT_DATA_PIN & (1 << XT_DATA_BIT))
+#define XT_DATA_READ() readPin(XT_DATA_PIN)
 
-#define XT_DATA_LO()                         \
-    do {                                     \
-        XT_DATA_PORT &= ~(1 << XT_DATA_BIT); \
-        XT_DATA_DDR |= (1 << XT_DATA_BIT);   \
+#define XT_DATA_LO()               \
+    do {                           \
+        writePinLow(XT_DATA_PIN);  \
+        setPinOutput(XT_DATA_PIN); \
     } while (0)
 
-#define XT_CLOCK_IN()                         \
-    do {                                      \
-        XT_CLOCK_DDR &= ~(1 << XT_CLOCK_BIT); \
-        XT_CLOCK_PORT |= (1 << XT_CLOCK_BIT); \
+#define XT_CLOCK_IN()               \
+    do {                            \
+        setPinInput(XT_CLOCK_PIN);  \
+        writePinHigh(XT_CLOCK_PIN); \
     } while (0)
 
-#define XT_CLOCK_READ() (XT_CLOCK_PIN & (1 << XT_CLOCK_BIT))
+#define XT_CLOCK_READ() readPin(XT_CLOCK_PIN)
 
-#define XT_CLOCK_LO()                          \
-    do {                                       \
-        XT_CLOCK_PORT &= ~(1 << XT_CLOCK_BIT); \
-        XT_CLOCK_DDR |= (1 << XT_CLOCK_BIT);   \
+#define XT_CLOCK_LO()               \
+    do {                            \
+        writePinLow(XT_CLOCK_PIN);  \
+        setPinOutput(XT_CLOCK_PIN); \
     } while (0)
 
 void    xt_host_init(void);
+
 uint8_t xt_host_recv(void);
-- 
cgit v1.2.3