cpu/nrfxx: move uart_conf_t struct to periph_cpu_common.h

Signed-off-by: Dylan Laduranty <[email protected]>

Author: dylad

cpu/nrf52/include/periph_cpu.h

@@ -201,23 +201,6 @@ typedef struct {
 } pwm_conf_t;
 #endif
 
-#if !defined(CPU_MODEL_NRF52832XXAA)
-/**
- * @brief   Structure for UART configuration data
- */
-typedef struct {
-    NRF_UARTE_Type *dev;    /**< UART with EasyDMA device base
-                             * register address */
-    gpio_t rx_pin;          /**< RX pin */
-    gpio_t tx_pin;          /**< TX pin */
-#ifdef MODULE_PERIPH_UART_HW_FC
-    gpio_t rts_pin;         /**< RTS pin */
-    gpio_t cts_pin;         /**< CTS pin */
-#endif
-    uint8_t irqn;           /**< IRQ channel */
-} uart_conf_t;
-#endif
-
 /**
  * @brief   Size of the UART TX buffer for non-blocking mode.
  */

cpu/nrf5x_common/include/periph_cpu_common.h

@@ -277,6 +277,31 @@ typedef struct {
  */
 uint8_t gpio_int_get_exti(gpio_t pin);
 
+#if !defined(CPU_MODEL_NRF52832XXAA) && !defined(CPU_FAM_NRF51)
+/**
+ * @brief   Structure for UART configuration data
+ */
+typedef struct {
+    NRF_UARTE_Type *dev;    /**< UART with EasyDMA device base
+                             * register address */
+    gpio_t rx_pin;          /**< RX pin */
+    gpio_t tx_pin;          /**< TX pin */
+#ifdef MODULE_PERIPH_UART_HW_FC
+    gpio_t rts_pin;         /**< RTS pin */
+    gpio_t cts_pin;         /**< CTS pin */
+#endif
+    uint8_t irqn;           /**< IRQ channel */
+} uart_conf_t;
+
+/**
+ * @brief   Size of the UART TX buffer for non-blocking mode.
+ */
+#ifndef UART_TXBUF_SIZE
+#define UART_TXBUF_SIZE    (64)
+#endif
+
+#endif /* ndef CPU_MODEL_NRF52832XXAA && ndef CPU_FAM_NRF51 */
+
 #ifdef __cplusplus
 }
 #endif

cpu/nrf9160/include/periph_cpu.h

@@ -36,28 +36,6 @@ extern "C" {
  */
 #define PERIPH_CLOCK        MHZ(16)
 
-/**
- * @brief   Structure for UART configuration data
- */
-typedef struct {
-    NRF_UARTE_Type *dev;    /**< UART with EasyDMA device base
-                             * register address */
-    gpio_t rx_pin;          /**< RX pin */
-    gpio_t tx_pin;          /**< TX pin */
-#ifdef MODULE_PERIPH_UART_HW_FC
-    gpio_t rts_pin;         /**< RTS pin */
-    gpio_t cts_pin;         /**< CTS pin */
-#endif
-    uint8_t irqn;           /**< IRQ channel */
-} uart_conf_t;
-
-/**
- * @brief   Size of the UART TX buffer for non-blocking mode.
- */
-#ifndef UART_TXBUF_SIZE
-#define UART_TXBUF_SIZE    (64)
-#endif
-
 #ifndef DOXYGEN
 /**
  * @brief Wrapper to fix differences between nRF9160 and