From df7e760588b4e224794cc643e4db4b79d6e508c4 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 7 Feb 2019 09:20:18 +0100 Subject: [PATCH] doxygen/I2C: don't include overridden typedefs Add missing #ifndefs to overridden I2C typedefs. Signed-off-by: Yegor Yefremov --- cpu/cc2538/include/periph_cpu.h | 3 +++ cpu/esp32/include/periph_cpu.h | 2 ++ cpu/nrf51/include/periph_cpu.h | 2 ++ cpu/nrf52/include/periph_cpu.h | 2 ++ cpu/sam0_common/include/periph_cpu_common.h | 2 ++ cpu/stm32_common/include/periph_cpu_common.h | 2 ++ 6 files changed, 13 insertions(+) diff --git a/cpu/cc2538/include/periph_cpu.h b/cpu/cc2538/include/periph_cpu.h index 9be6dcb402..a9e5f11a24 100644 --- a/cpu/cc2538/include/periph_cpu.h +++ b/cpu/cc2538/include/periph_cpu.h @@ -106,6 +106,7 @@ void gpio_init_mux(gpio_t pin, uint8_t over, uint8_t sel, uint8_t func); #define PERIPH_I2C_NEED_WRITE_REGS /** @} */ +#ifndef DOXYGEN /** * @name Override I2C clock speed values * @{ @@ -119,6 +120,8 @@ typedef enum { I2C_SPEED_HIGH = 0x03, /**< not supported */ } i2c_speed_t; /** @} */ +#endif /* ndef DOXYGEN */ + /** * @brief I2C configuration options */ diff --git a/cpu/esp32/include/periph_cpu.h b/cpu/esp32/include/periph_cpu.h index dfdfabb51b..de130d7ed4 100644 --- a/cpu/esp32/include/periph_cpu.h +++ b/cpu/esp32/include/periph_cpu.h @@ -305,6 +305,7 @@ typedef enum { * @{ */ +#ifndef DOXYGEN /** * @brief Override I2C clock speed values * @@ -320,6 +321,7 @@ typedef enum { I2C_SPEED_HIGH, /**< not supported */ } i2c_speed_t; /** @} */ +#endif /* ndef DOXYGEN */ /** * @brief I2C configuration structure type diff --git a/cpu/nrf51/include/periph_cpu.h b/cpu/nrf51/include/periph_cpu.h index 14de3ac5b6..44d80660f3 100644 --- a/cpu/nrf51/include/periph_cpu.h +++ b/cpu/nrf51/include/periph_cpu.h @@ -40,6 +40,7 @@ extern "C" { #define SPI_MISOSEL (dev(bus)->PSELMISO) /** @} */ +#ifndef DOXYGEN /** * @brief Override I2C speed settings * @{ @@ -53,6 +54,7 @@ typedef enum { I2C_SPEED_HIGH = 0x03, /**< not supported */ } i2c_speed_t; /** @} */ +#endif /* ndef DOXYGEN */ /** * @name Use the shared I2C functions diff --git a/cpu/nrf52/include/periph_cpu.h b/cpu/nrf52/include/periph_cpu.h index 2a9190a26e..5bc5f338bd 100644 --- a/cpu/nrf52/include/periph_cpu.h +++ b/cpu/nrf52/include/periph_cpu.h @@ -84,6 +84,7 @@ typedef enum { /** @} */ #endif /* ndef DOXYGEN */ +#ifndef DOXYGEN /** * @brief Override I2C speed settings * @{ @@ -97,6 +98,7 @@ typedef enum { I2C_SPEED_HIGH = 0xfd, /**< not supported */ } i2c_speed_t; /** @} */ +#endif /* ndef DOXYGEN */ /** * @brief I2C (TWI) configuration options diff --git a/cpu/sam0_common/include/periph_cpu_common.h b/cpu/sam0_common/include/periph_cpu_common.h index 2b198da456..04c923adb9 100644 --- a/cpu/sam0_common/include/periph_cpu_common.h +++ b/cpu/sam0_common/include/periph_cpu_common.h @@ -281,6 +281,7 @@ typedef enum { I2C_FLAG_RUN_STANDBY = 0x1, /**< run SERCOM in standby mode */ } i2c_flag_t; +#ifndef DOXYGEN /** * @name Override I2C clock speed values * @{ @@ -294,6 +295,7 @@ typedef enum { I2C_SPEED_HIGH = 3400000U, /**< high speed mode: ~3.4Mbit/s */ } i2c_speed_t; /** @} */ +#endif /* ndef DOXYGEN */ /** * @brief I2C device configuration diff --git a/cpu/stm32_common/include/periph_cpu_common.h b/cpu/stm32_common/include/periph_cpu_common.h index d7b4785326..a5fbb74bcc 100644 --- a/cpu/stm32_common/include/periph_cpu_common.h +++ b/cpu/stm32_common/include/periph_cpu_common.h @@ -504,6 +504,7 @@ typedef struct { #endif } spi_conf_t; +#ifndef DOXYGEN /** * @brief Default mapping of I2C bus speed values * @{ @@ -523,6 +524,7 @@ typedef enum { #endif } i2c_speed_t; /** @} */ +#endif /* ndef DOXYGEN */ /** * @brief Structure for I2C configuration data