From 4e09a2b6b74146b96b49a00e9042b14a5f97da07 Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Thu, 31 May 2018 15:57:31 +0200
Subject: [PATCH] boards*: adapt stm32f4 based board with new i2c conf style
---
boards/msbiot/include/periph_conf.h | 41 +++++++++----------
boards/nucleo-f401re/include/periph_conf.h | 38 ++++++++---------
boards/nucleo-f410rb/include/periph_conf.h | 40 ++++++++----------
boards/nucleo-f411re/include/periph_conf.h | 38 ++++++++---------
boards/nucleo-f412zg/include/periph_conf.h | 38 ++++++++---------
boards/nucleo-f413zh/include/periph_conf.h | 38 ++++++++---------
boards/nucleo-f429zi/include/periph_conf.h | 40 ++++++++----------
boards/nucleo-f446re/include/periph_conf.h | 38 ++++++++---------
boards/nucleo-f446ze/include/periph_conf.h | 40 ++++++++----------
boards/stm32f4discovery/include/periph_conf.h | 40 ++++++++----------
10 files changed, 176 insertions(+), 215 deletions(-)
diff --git a/boards/msbiot/include/periph_conf.h b/boards/msbiot/include/periph_conf.h
index fc93e33f6e..b083dbc0bb 100644
--- a/boards/msbiot/include/periph_conf.h
+++ b/boards/msbiot/include/periph_conf.h
@@ -186,28 +186,25 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (CLOCK_APB1)
-
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (periph_clk_en(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_CLKDIS() (periph_clk_dis(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 6
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 7
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 6),
+ .sda_pin = GPIO_PIN(PORT_B, 7),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
+/** @} */
#ifdef __cplusplus
}
diff --git a/boards/nucleo-f401re/include/periph_conf.h b/boards/nucleo-f401re/include/periph_conf.h
index 3069ee9e33..322a6c753f 100644
--- a/boards/nucleo-f401re/include/periph_conf.h
+++ b/boards/nucleo-f401re/include/periph_conf.h
@@ -254,28 +254,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (CLOCK_APB1)
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 8),
+ .sda_pin = GPIO_PIN(PORT_B, 9),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (periph_clk_en(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_CLKDIS() (periph_clk_dis(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 8
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 9
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/nucleo-f410rb/include/periph_conf.h b/boards/nucleo-f410rb/include/periph_conf.h
index bc67feb4c0..605212d4c3 100644
--- a/boards/nucleo-f410rb/include/periph_conf.h
+++ b/boards/nucleo-f410rb/include/periph_conf.h
@@ -166,28 +166,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (CLOCK_APB1)
-
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (RCC->APB1ENR |= RCC_APB1ENR_I2C1EN)
-#define I2C_0_CLKDIS() (RCC->APB1ENR &= ~(RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 8
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (RCC->AHB1ENR |= RCC_AHB1ENR_GPIOBEN)
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 9
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (RCC->AHB1ENR |= RCC_AHB1ENR_GPIOBEN)
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 8),
+ .sda_pin = GPIO_PIN(PORT_B, 9),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/nucleo-f411re/include/periph_conf.h b/boards/nucleo-f411re/include/periph_conf.h
index 60e7fa08a8..49c0283071 100644
--- a/boards/nucleo-f411re/include/periph_conf.h
+++ b/boards/nucleo-f411re/include/periph_conf.h
@@ -212,28 +212,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (CLOCK_APB1)
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 8),
+ .sda_pin = GPIO_PIN(PORT_B, 9),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (RCC->APB1ENR |= RCC_APB1ENR_I2C1EN)
-#define I2C_0_CLKDIS() (RCC->APB1ENR &= ~(RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 8
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (RCC->AHB1ENR |= RCC_AHB1ENR_GPIOBEN)
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 9
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (RCC->AHB1ENR |= RCC_AHB1ENR_GPIOBEN)
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/nucleo-f412zg/include/periph_conf.h b/boards/nucleo-f412zg/include/periph_conf.h
index 631b18c7d1..968d472b5d 100644
--- a/boards/nucleo-f412zg/include/periph_conf.h
+++ b/boards/nucleo-f412zg/include/periph_conf.h
@@ -223,28 +223,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (42000000U)
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 8),
+ .sda_pin = GPIO_PIN(PORT_B, 9),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (periph_clk_en(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_CLKDIS() (periph_clk_dis(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 8
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 9
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/nucleo-f413zh/include/periph_conf.h b/boards/nucleo-f413zh/include/periph_conf.h
index 1f34609f19..5a88440574 100644
--- a/boards/nucleo-f413zh/include/periph_conf.h
+++ b/boards/nucleo-f413zh/include/periph_conf.h
@@ -252,28 +252,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (CLOCK_APB1)
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 8),
+ .sda_pin = GPIO_PIN(PORT_B, 9),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (periph_clk_en(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_CLKDIS() (periph_clk_dis(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 8
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 9
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/nucleo-f429zi/include/periph_conf.h b/boards/nucleo-f429zi/include/periph_conf.h
index 281a3b5434..9c5387b515 100644
--- a/boards/nucleo-f429zi/include/periph_conf.h
+++ b/boards/nucleo-f429zi/include/periph_conf.h
@@ -161,28 +161,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (42000000U)
-
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (periph_clk_en(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_CLKDIS() (periph_clk_dis(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 8
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 9
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 8),
+ .sda_pin = GPIO_PIN(PORT_B, 9),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/nucleo-f446re/include/periph_conf.h b/boards/nucleo-f446re/include/periph_conf.h
index 4bd67dc009..ca1f2b9e72 100644
--- a/boards/nucleo-f446re/include/periph_conf.h
+++ b/boards/nucleo-f446re/include/periph_conf.h
@@ -218,28 +218,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (CLOCK_APB1)
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 8),
+ .sda_pin = GPIO_PIN(PORT_B, 9),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (periph_clk_en(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_CLKDIS() (periph_clk_dis(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 8
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 9
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/nucleo-f446ze/include/periph_conf.h b/boards/nucleo-f446ze/include/periph_conf.h
index 9735453e8a..ff88e4573d 100644
--- a/boards/nucleo-f446ze/include/periph_conf.h
+++ b/boards/nucleo-f446ze/include/periph_conf.h
@@ -161,28 +161,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (42000000U)
-
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (periph_clk_en(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_CLKDIS() (periph_clk_dis(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 8
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 9
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 8),
+ .sda_pin = GPIO_PIN(PORT_B, 9),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/stm32f4discovery/include/periph_conf.h b/boards/stm32f4discovery/include/periph_conf.h
index 984295c4cb..755e5dc4e4 100644
--- a/boards/stm32f4discovery/include/periph_conf.h
+++ b/boards/stm32f4discovery/include/periph_conf.h
@@ -191,28 +191,24 @@ static const spi_conf_t spi_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF (1U)
-#define I2C_0_EN 1
-#define I2C_IRQ_PRIO 1
-#define I2C_APBCLK (CLOCK_APB1)
-
-/* I2C 0 device configuration */
-#define I2C_0_DEV I2C1
-#define I2C_0_CLKEN() (periph_clk_en(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_CLKDIS() (periph_clk_dis(APB1, RCC_APB1ENR_I2C1EN))
-#define I2C_0_EVT_IRQ I2C1_EV_IRQn
-#define I2C_0_EVT_ISR isr_i2c1_ev
-#define I2C_0_ERR_IRQ I2C1_ER_IRQn
-#define I2C_0_ERR_ISR isr_i2c1_er
-/* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT GPIOB
-#define I2C_0_SCL_PIN 6
-#define I2C_0_SCL_AF 4
-#define I2C_0_SCL_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
-#define I2C_0_SDA_PORT GPIOB
-#define I2C_0_SDA_PIN 7
-#define I2C_0_SDA_AF 4
-#define I2C_0_SDA_CLKEN() (periph_clk_en(AHB1, RCC_AHB1ENR_GPIOBEN))
+static const i2c_conf_t i2c_config[] = {
+ {
+ .dev = I2C1,
+ .speed = I2C_SPEED_NORMAL,
+ .scl_pin = GPIO_PIN(PORT_B, 6),
+ .sda_pin = GPIO_PIN(PORT_B, 7),
+ .scl_af = GPIO_AF4,
+ .sda_af = GPIO_AF4,
+ .bus = APB1,
+ .rcc_mask = RCC_APB1ENR_I2C1EN,
+ .clk = CLOCK_APB1,
+ .irqn = I2C1_EV_IRQn
+ }
+};
+
+#define I2C_0_ISR isr_i2c1_ev
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
#ifdef __cplusplus
--
GitLab