From 5ea92a9c1cbe3e20bf4830d550d797a8e9650da8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 6 Feb 2021 09:20:48 +1100
Subject: Serial refactor (#11521)

---
 keyboards/hhkb/ansi/config.h | 35 ++++++++++++++---------------------
 keyboards/hhkb/jp/config.h   | 35 ++++++++++++++---------------------
 2 files changed, 28 insertions(+), 42 deletions(-)

(limited to 'keyboards/hhkb')

diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h
index 5e4fece17d..78fe0c47ae 100644
--- a/keyboards/hhkb/ansi/config.h
+++ b/keyboards/hhkb/ansi/config.h
@@ -52,27 +52,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SUART_IN_PIN    PIND
 #define SUART_IN_BIT    1
 
-#ifdef __AVR_ATmega32U4__
-    #define SERIAL_UART_BAUD        115200
-    #define SERIAL_UART_DATA        UDR1
-    #define SERIAL_UART_UBRR        ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5))
-    #define SERIAL_UART_RXD_VECT    USART1_RX_vect
-    #define SERIAL_UART_TXD_READY   (UCSR1A&(1<<UDRE1))
-    #define SERIAL_UART_INIT()      do { \
-        UBRR1L = (uint8_t) SERIAL_UART_UBRR;       /* baud rate */ \
-        UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8);  /* baud rate */ \
-        UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \
-        UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \
-        UCSR1C |= (0<<UPM11) | (0<<UPM10);  /* parity: none(00), even(01), odd(11) */ \
-        UCSR1D |= (0<<RTSEN) | (0<<CTSEN);  /* RTS, CTS(no flow control by hardware) */ \
-        DDRD |= (1<<5); PORTD &= ~(1<<5);   /* RTS for flow control by firmware */ \
-        sei(); \
-    } while(0)
-    #define SERIAL_UART_RTS_LO()    do { PORTD &= ~(1<<5); } while (0)
-    #define SERIAL_UART_RTS_HI()    do { PORTD |=  (1<<5); } while (0)
-#else
-    #error "USART configuration is needed."
-#endif
+#define SERIAL_UART_BAUD 115200
+#define SERIAL_UART_INIT_CUSTOM                 \
+    /* RX interrupt, RX: enable */              \
+    UCSR1B |= (1<<RXCIE1) | (1<<RXEN1);         \
+    /* TX interrupt, TX: enable */              \
+    UCSR1B |= (0<<TXCIE1) | (1<<TXEN1);         \
+    /* parity: none(00), even(01), odd(11) */   \
+    UCSR1C |= (0<<UPM11) | (0<<UPM10);          \
+    /* RTS, CTS(no flow control by hardware) */ \
+    UCSR1D |= (0<<RTSEN) | (0<<CTSEN);          \
+    /* RTS for flow control by firmware */      \
+    DDRD |= (1<<5); PORTD &= ~(1<<5);
+#define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0)
+#define SERIAL_UART_RTS_HI() do { PORTD |=  (1<<5); } while (0)
 
 /* power control of key switch board */
 #define HHKB_POWER_SAVING
diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h
index c06c554b2a..22ac6aa623 100644
--- a/keyboards/hhkb/jp/config.h
+++ b/keyboards/hhkb/jp/config.h
@@ -52,27 +52,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SUART_IN_PIN    PIND
 #define SUART_IN_BIT    1
 
-#ifdef __AVR_ATmega32U4__
-    #define SERIAL_UART_BAUD        115200
-    #define SERIAL_UART_DATA        UDR1
-    #define SERIAL_UART_UBRR        ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5))
-    #define SERIAL_UART_RXD_VECT    USART1_RX_vect
-    #define SERIAL_UART_TXD_READY   (UCSR1A&(1<<UDRE1))
-    #define SERIAL_UART_INIT()      do { \
-        UBRR1L = (uint8_t) SERIAL_UART_UBRR;       /* baud rate */ \
-        UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8);  /* baud rate */ \
-        UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \
-        UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \
-        UCSR1C |= (0<<UPM11) | (0<<UPM10);  /* parity: none(00), even(01), odd(11) */ \
-        UCSR1D |= (0<<RTSEN) | (0<<CTSEN);  /* RTS, CTS(no flow control by hardware) */ \
-        DDRD |= (1<<5); PORTD &= ~(1<<5);   /* RTS for flow control by firmware */ \
-        sei(); \
-    } while(0)
-    #define SERIAL_UART_RTS_LO()    do { PORTD &= ~(1<<5); } while (0)
-    #define SERIAL_UART_RTS_HI()    do { PORTD |=  (1<<5); } while (0)
-#else
-    #error "USART configuration is needed."
-#endif
+#define SERIAL_UART_BAUD 115200
+#define SERIAL_UART_INIT_CUSTOM                 \
+    /* RX interrupt, RX: enable */              \
+    UCSR1B |= (1<<RXCIE1) | (1<<RXEN1);         \
+    /* TX interrupt, TX: enable */              \
+    UCSR1B |= (0<<TXCIE1) | (1<<TXEN1);         \
+    /* parity: none(00), even(01), odd(11) */   \
+    UCSR1C |= (0<<UPM11) | (0<<UPM10);          \
+    /* RTS, CTS(no flow control by hardware) */ \
+    UCSR1D |= (0<<RTSEN) | (0<<CTSEN);          \
+    /* RTS for flow control by firmware */      \
+    DDRD |= (1<<5); PORTD &= ~(1<<5);
+#define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0)
+#define SERIAL_UART_RTS_HI() do { PORTD |=  (1<<5); } while (0)
 
 /* power control of key switch board */
 #define HHKB_POWER_SAVING
-- 
cgit v1.2.1