Serial refactor (#11521)

4 files changed, 10 insertions, 31 deletions

diff --git a/keyboards/sirius/uni660/rev2/ansi/config.h b/keyboards/sirius/uni660/rev2/ansi/config.h
index 7bca743633..13e33ebf11 100644
--- a/keyboards/sirius/uni660/rev2/ansi/config.h
+++ b/keyboards/sirius/uni660/rev2/ansi/config.h
@@ -59,19 +59,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //UART settings for communication with the RF microcontroller
 #define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_DATA UDR1
-#define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1)
-#define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1))
 #define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT() do { \
-    /* baud rate */ \
-    UBRR1L = SERIAL_UART_UBRR; \
-    /* baud rate */ \
-    UBRR1H = SERIAL_UART_UBRR >> 8; \
-    /* enable TX and RX */ \
+#define SERIAL_UART_INIT_CUSTOM       \
+    /* enable TX and RX */            \
     UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */ \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \
-} while (0)
+    /* 8-bit data */                  \
+    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/sirius/uni660/rev2/iso/config.h b/keyboards/sirius/uni660/rev2/iso/config.h
index 0cbbe0c5ba..3283f0cd67 100644
--- a/keyboards/sirius/uni660/rev2/iso/config.h
+++ b/keyboards/sirius/uni660/rev2/iso/config.h
@@ -59,19 +59,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //UART settings for communication with the RF microcontroller
 #define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_DATA UDR1
-#define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1)
-#define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1))
 #define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT() do { \
-    /* baud rate */ \
-    UBRR1L = SERIAL_UART_UBRR; \
-    /* baud rate */ \
-    UBRR1H = SERIAL_UART_UBRR >> 8; \
-    /* enable TX and RX */ \
+#define SERIAL_UART_INIT_CUSTOM       \
+    /* enable TX and RX */            \
     UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */ \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \
-} while (0)
+    /* 8-bit data */                  \
+    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/sirius/uni660/rev2/matrix.c b/keyboards/sirius/uni660/rev2/matrix.c
index 3e231b33bc..355fa7e5e9 100644
--- a/keyboards/sirius/uni660/rev2/matrix.c
+++ b/keyboards/sirius/uni660/rev2/matrix.c
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "matrix.h"
 #include "timer.h"
 #include "debounce.h"
+#include "protocol/serial.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -80,14 +81,13 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
     debounce_init(MATRIX_ROWS);
     matrix_init_quantum();
+    serial_init();
 }
 
 uint8_t matrix_scan(void)
 {
     bool matrix_has_changed = false;
 
-    SERIAL_UART_INIT();
-
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
diff --git a/keyboards/sirius/uni660/rev2/rev2.c b/keyboards/sirius/uni660/rev2/rev2.c
index e19240ccc3..048495b992 100644
--- a/keyboards/sirius/uni660/rev2/rev2.c
+++ b/keyboards/sirius/uni660/rev2/rev2.c
@@ -1,9 +1,5 @@
 #include "rev2.h"
 
-void uart_init(void) {
-    SERIAL_UART_INIT();
-}
-
 void led_init(void) {
     setPinOutput(D1); // Pin to green, set as output
     writePinHigh(D1); // Turn it off
@@ -17,7 +13,6 @@ void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
     matrix_init_user();
-    uart_init();
     led_init();
 }