michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: drivers: Convert to new DT_INST macros

Browse source 
Convert older DT_INST_ macro use the new include/devicetree.h
DT_INST macro APIs.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-03-30 13:30:58 -05:00 • committed by Kumar Gala
commit d8432ce8da
14 changed files with 50 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
samples/drivers/crypto/src/main.c
View file

@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(main);
#elif CONFIG_CRYPTO_MBEDTLS_SHIM #elif CONFIG_CRYPTO_MBEDTLS_SHIM
#define CRYPTO_DRV_NAME CONFIG_CRYPTO_MBEDTLS_SHIM_DRV_NAME #define CRYPTO_DRV_NAME CONFIG_CRYPTO_MBEDTLS_SHIM_DRV_NAME
#elif CONFIG_CRYPTO_STM32 #elif CONFIG_CRYPTO_STM32
#define CRYPTO_DRV_NAME DT_INST_0_ST_STM32_CRYP_LABEL #define CRYPTO_DRV_NAME DT_LABEL(DT_INST(0, st_stm32_cryp))
#else #else
#error "You need to enable one crypto device" #error "You need to enable one crypto device"
#endif #endif

33
samples/drivers/display/dts_fixup.h
View file

@ -1,33 +0,0 @@
/*
* Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifdef DT_INST_0_ILITEK_ILI9340_LABEL
#define DISPLAY_DEV_NAME DT_INST_0_ILITEK_ILI9340_LABEL
#endif
#ifdef DT_INST_0_SOLOMON_SSD1306FB_LABEL
#define DISPLAY_DEV_NAME DT_INST_0_SOLOMON_SSD1306FB_LABEL
#endif
#ifdef DT_INST_0_GOODDISPLAY_GDEH0213B1_LABEL
#define DISPLAY_DEV_NAME DT_INST_0_GOODDISPLAY_GDEH0213B1_LABEL
#endif
#ifdef DT_INST_0_SITRONIX_ST7789V_LABEL
#define DISPLAY_DEV_NAME DT_INST_0_SITRONIX_ST7789V_LABEL
#endif
#ifdef DT_INST_0_FSL_IMX6SX_LCDIF_LABEL
#define DISPLAY_DEV_NAME DT_INST_0_FSL_IMX6SX_LCDIF_LABEL
#endif
#ifdef CONFIG_SDL_DISPLAY_DEV_NAME
#define DISPLAY_DEV_NAME CONFIG_SDL_DISPLAY_DEV_NAME
#endif
#ifdef CONFIG_DUMMY_DISPLAY_DEV_NAME
#define DISPLAY_DEV_NAME CONFIG_DUMMY_DISPLAY_DEV_NAME
#endif

27
samples/drivers/display/src/main.c
View file

@ -14,6 +14,33 @@ LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
#include <device.h> #include <device.h>
#include <drivers/display.h> #include <drivers/display.h>
#if DT_HAS_NODE(DT_INST(0, ilitek_ili9340))
#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, ilitek_ili9340))
#endif
#if DT_HAS_NODE(DT_INST(0, solomon_ssd1306fb))
#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, solomon_ssd1306fb))
#endif
#if DT_HAS_NODE(DT_INST(0, gooddisplay_gdeh0213b1))
#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, gooddisplay_gdeh0213b1))
#endif
#if DT_HAS_NODE(DT_INST(0, sitronix_st7789v))
#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, sitronix_st7789v))
#endif
#if DT_HAS_NODE(DT_INST(0, fsl_imx6sx_lcdif))
#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, fsl_imx6sx_lcdif))
#endif
#ifdef CONFIG_SDL_DISPLAY_DEV_NAME
#define DISPLAY_DEV_NAME CONFIG_SDL_DISPLAY_DEV_NAME
#endif
#ifdef CONFIG_DUMMY_DISPLAY_DEV_NAME
#define DISPLAY_DEV_NAME CONFIG_DUMMY_DISPLAY_DEV_NAME
#endif
#ifdef CONFIG_ARCH_POSIX #ifdef CONFIG_ARCH_POSIX
#include "posix_board_if.h" #include "posix_board_if.h"
#endif #endif

8
samples/drivers/ht16k33/src/main.c
View file

@ -13,10 +13,10 @@
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(main); LOG_MODULE_REGISTER(main);
#define LED_DEV_NAME DT_INST_0_HOLTEK_HT16K33_LABEL #define LED_DEV_NAME DT_LABEL(DT_INST(0, holtek_ht16k33))
#define KS0_DEV_NAME DT_INST_0_HOLTEK_HT16K33_KEYSCAN_LABEL #define KS0_DEV_NAME DT_LABEL(DT_INST(0, holtek_ht16k33_keyscan))
#define KS1_DEV_NAME DT_INST_1_HOLTEK_HT16K33_KEYSCAN_LABEL #define KS1_DEV_NAME DT_LABEL(DT_INST(1, holtek_ht16k33_keyscan))
#define KS2_DEV_NAME DT_INST_2_HOLTEK_HT16K33_KEYSCAN_LABEL #define KS2_DEV_NAME DT_LABEL(DT_INST(2, holtek_ht16k33_keyscan))
#define KEYSCAN_DEVICES 3 #define KEYSCAN_DEVICES 3

6
samples/drivers/led_apa102/src/main.c
View file

@ -56,11 +56,11 @@ void main(void)
struct device *strip; struct device *strip;
size_t i, time; size_t i, time;
strip = device_get_binding(DT_INST_0_APA_APA102_LABEL); strip = device_get_binding(DT_LABEL(DT_INST(0, apa_apa102)));
if (strip) { if (strip) {
LOG_INF("Found LED strip device %s", DT_INST_0_APA_APA102_LABEL); LOG_INF("Found LED strip device %s", DT_LABEL(DT_INST(0, apa_apa102)));
} else { } else {
LOG_ERR("LED strip device %s not found", DT_INST_0_APA_APA102_LABEL); LOG_ERR("LED strip device %s not found", DT_LABEL(DT_INST(0, apa_apa102)));
return; return;
} }

2
samples/drivers/led_lp3943/src/main.c
View file

@ -14,7 +14,7 @@
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(app); LOG_MODULE_REGISTER(app);
#define LED_DEV_NAME DT_INST_0_TI_LP3943_LABEL #define LED_DEV_NAME DT_LABEL(DT_INST(0, ti_lp3943))
#define NUM_LEDS 16 #define NUM_LEDS 16
#define DELAY_TIME K_MSEC(1000) #define DELAY_TIME K_MSEC(1000)

2
samples/drivers/led_lp5562/src/main.c
View file

@ -14,7 +14,7 @@
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(main); LOG_MODULE_REGISTER(main);
#define LED_DEV_NAME DT_INST_0_TI_LP5562_LABEL #define LED_DEV_NAME DT_LABEL(DT_INST(0, ti_lp5562))
#define NUM_LEDS 4 #define NUM_LEDS 4
#define BLINK_DELAY_ON 500 #define BLINK_DELAY_ON 500
#define BLINK_DELAY_OFF 500 #define BLINK_DELAY_OFF 500

2
samples/drivers/led_lpd8806/src/main.c
View file

@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(main);
*/ */
#define STRIP_NUM_LEDS 32 #define STRIP_NUM_LEDS 32
#define STRIP_DEV_NAME DT_INST_0_COLORWAY_LPD8806_LABEL #define STRIP_DEV_NAME DT_LABEL(DT_INST(0, colorway_lpd8806))
#define DELAY_TIME K_MSEC(40) #define DELAY_TIME K_MSEC(40)
static const struct led_rgb colors[] = { static const struct led_rgb colors[] = {

2
samples/drivers/led_pca9633/src/main.c
View file

@ -14,7 +14,7 @@
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(main); LOG_MODULE_REGISTER(main);
#define LED_DEV_NAME DT_INST_0_NXP_PCA9633_LABEL #define LED_DEV_NAME DT_LABEL(DT_INST(0, nxp_pca9633))
#define NUM_LEDS 4 #define NUM_LEDS 4
#define MAX_BRIGHTNESS 100 #define MAX_BRIGHTNESS 100
#define HALF_BRIGHTNESS (MAX_BRIGHTNESS / 2) #define HALF_BRIGHTNESS (MAX_BRIGHTNESS / 2)

4
samples/drivers/lora/receive/src/main.c
View file

@ -25,9 +25,9 @@ void main(void)
s16_t rssi; s16_t rssi;
s8_t snr; s8_t snr;
lora_dev = device_get_binding(DT_INST_0_SEMTECH_SX1276_LABEL); lora_dev = device_get_binding(DT_LABEL(DT_INST(0, semtech_sx1276)));
if (!lora_dev) { if (!lora_dev) {
LOG_ERR("%s Device not found", DT_INST_0_SEMTECH_SX1276_LABEL); LOG_ERR("%s Device not found", DT_LABEL(DT_INST(0, semtech_sx1276)));
return; return;
} }

4
samples/drivers/lora/send/src/main.c
View file

@ -24,9 +24,9 @@ void main(void)
struct lora_modem_config config; struct lora_modem_config config;
int ret; int ret;
lora_dev = device_get_binding(DT_INST_0_SEMTECH_SX1276_LABEL); lora_dev = device_get_binding(DT_LABEL(DT_INST(0, semtech_sx1276)));
if (!lora_dev) { if (!lora_dev) {
LOG_ERR("%s Device not found", DT_INST_0_SEMTECH_SX1276_LABEL); LOG_ERR("%s Device not found", DT_LABEL(DT_INST(0, semtech_sx1276)));
return; return;
} }

4
samples/drivers/ps2/src/main.c
View file

@ -175,8 +175,8 @@ void main(void)
/* The ps2 blocks are generic, therefore, it is allowed to swap /* The ps2 blocks are generic, therefore, it is allowed to swap
* keybaord and mouse as deired * keybaord and mouse as deired
*/ */
#ifdef DT_INST_0_MICROCHIP_XEC_PS2 #if DT_HAS_NODE(DT_INST(0, microchip_xec_ps2))
ps2_0_dev = device_get_binding(DT_INST_0_MICROCHIP_XEC_PS2_LABEL); ps2_0_dev = device_get_binding(DT_LABEL(DT_INST(0, microchip_xec_ps2)));
ps2_config(ps2_0_dev, mb_callback); ps2_config(ps2_0_dev, mb_callback);
/*Make sure there is a PS/2 device connected */ /*Make sure there is a PS/2 device connected */
initialize_mouse(); initialize_mouse();

8
samples/drivers/spi_flash/src/main.c
View file

@ -14,11 +14,11 @@
/* NB: W25Q16DV is a JEDEC spi-nor device, but has a separate driver. */ /* NB: W25Q16DV is a JEDEC spi-nor device, but has a separate driver. */
#define FLASH_DEVICE CONFIG_SPI_FLASH_W25QXXDV_DRV_NAME #define FLASH_DEVICE CONFIG_SPI_FLASH_W25QXXDV_DRV_NAME
#define FLASH_NAME "W25QXXDV" #define FLASH_NAME "W25QXXDV"
#elif (CONFIG_SPI_NOR - 0) || defined(DT_INST_0_JEDEC_SPI_NOR_LABEL) #elif (CONFIG_SPI_NOR - 0) || DT_HAS_NODE(DT_INST(0, jedec_spi_nor))
#define FLASH_DEVICE DT_INST_0_JEDEC_SPI_NOR_LABEL #define FLASH_DEVICE DT_LABEL(DT_INST(0, jedec_spi_nor))
#define FLASH_NAME "JEDEC SPI-NOR" #define FLASH_NAME "JEDEC SPI-NOR"
#elif (CONFIG_NORDIC_QSPI_NOR - 0) || defined(DT_INST_0_NORDIC_QSPI_NOR_LABEL) #elif (CONFIG_NORDIC_QSPI_NOR - 0) || DT_HAS_NODE(DT_INST(0, nordic_qspi_nor))
#define FLASH_DEVICE DT_INST_0_NORDIC_QSPI_NOR_LABEL #define FLASH_DEVICE DT_LABEL(DT_INST(0, nordic_qspi_nor))
#define FLASH_NAME "JEDEC QSPI-NOR" #define FLASH_NAME "JEDEC QSPI-NOR"
#else #else
#error Unsupported flash driver #error Unsupported flash driver

2
samples/drivers/watchdog/src/main.c
View file

@ -19,7 +19,7 @@
#define WDT_DEV_NAME DT_ALIAS_WATCHDOG0_LABEL #define WDT_DEV_NAME DT_ALIAS_WATCHDOG0_LABEL
#else #else
#ifdef CONFIG_WWDG_STM32 #ifdef CONFIG_WWDG_STM32
#define WDT_DEV_NAME DT_INST_0_ST_STM32_WINDOW_WATCHDOG_LABEL #define WDT_DEV_NAME DT_LABEL(DT_INST(0, st_stm32_window_watchdog))
#else #else
#define WDT_DEV_NAME DT_WDT_0_NAME #define WDT_DEV_NAME DT_WDT_0_NAME
#endif #endif