michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts_fixups: Use DT_ prefix in all defined labels not related to Kconfig

Browse source 
These changes were obtained by running a script  created by
Ulf Magnusson <Ulf.Magnusson@nordicsemi.no> for the following
specification:

1. Read the contents of all dts_fixup.h files in Zephyr
2. Check the left-hand side of the #define macros (i.e. the X in
   #define X Y)
3. Check if that name is also the name of a Kconfig option
   3.a If it is, then do nothing
   3.b If it is not, then replace CONFIG_ with DT_ or add DT_ if it
       has neither of these two prefixes
4. Replace the use of the changed #define in the code itself
   (.c, .h, .ld)

Additionally, some tweaks had to be added to this script to catch some
of the macros used in the code in a parameterized form, e.g.:
- CONFIG_GPIO_STM32_GPIO##__SUFFIX##_BASE_ADDRESS
- CONFIG_UART_##idx##_TX_PIN
- I2C_SBCON_##_num##_BASE_ADDR
and to prevent adding DT_ prefix to the following symbols:
- FLASH_START
- FLASH_SIZE
- SRAM_START
- SRAM_SIZE
- _ROM_ADDR
- _ROM_SIZE
- _RAM_ADDR
- _RAM_SIZE
which are surprisingly also defined in some dts_fixup.h files.

Finally, some manual corrections had to be done as well:
- name##_IRQ -> DT_##name##_IRQ in uart_stm32.c

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2018-11-13 15:15:23 +01:00 • committed by Kumar Gala
commit 20202902f2
304 changed files with 5118 additions and 5118 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/serial/leuart_gecko.c
View file

@ -318,12 +318,12 @@ static void leuart_gecko_config_func_0(struct device *dev);
#endif
static const struct leuart_gecko_config leuart_gecko_0_config = {
.base = (LEUART_TypeDef *)CONFIG_LEUART_GECKO_0_BASE_ADDRESS,
.base = (LEUART_TypeDef *)DT_LEUART_GECKO_0_BASE_ADDRESS,
.clock = cmuClock_LEUART0,
.baud_rate = CONFIG_LEUART_GECKO_0_CURRENT_SPEED,
.baud_rate = DT_LEUART_GECKO_0_CURRENT_SPEED,
.pin_rx = PIN_LEUART0_RXD,
.pin_tx = PIN_LEUART0_TXD,
.loc = CONFIG_LEUART_GECKO_0_LOCATION,
.loc = DT_LEUART_GECKO_0_LOCATION,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = leuart_gecko_config_func_0,
#endif
@ -331,7 +331,7 @@ static const struct leuart_gecko_config leuart_gecko_0_config = {
static struct leuart_gecko_data leuart_gecko_0_data;
DEVICE_AND_API_INIT(leuart_0, CONFIG_LEUART_GECKO_0_LABEL, &leuart_gecko_init,
DEVICE_AND_API_INIT(leuart_0, DT_LEUART_GECKO_0_LABEL, &leuart_gecko_init,
&leuart_gecko_0_data, &leuart_gecko_0_config, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&leuart_gecko_driver_api);
@ -339,11 +339,11 @@ DEVICE_AND_API_INIT(leuart_0, CONFIG_LEUART_GECKO_0_LABEL, &leuart_gecko_init,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void leuart_gecko_config_func_0(struct device *dev)
{
IRQ_CONNECT(CONFIG_LEUART_GECKO_0_IRQ,
CONFIG_LEUART_GECKO_0_IRQ_PRIORITY, leuart_gecko_isr,
IRQ_CONNECT(DT_LEUART_GECKO_0_IRQ,
DT_LEUART_GECKO_0_IRQ_PRIORITY, leuart_gecko_isr,
DEVICE_GET(leuart_0), 0);
irq_enable(CONFIG_LEUART_GECKO_0_IRQ);
irq_enable(DT_LEUART_GECKO_0_IRQ);
}
#endif