michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: drivers: flash_shell: use DEVICE_DT_GET_OR_NULL

Browse source 
The optional flash device can be obtained at compile time using
DEVICE_DT_GET_OR_NULL. Init code has been adjusted so that flash_dev is
forced to NULL when device is not ready (user can later specify the
device manually).

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-03-23 15:16:37 +01:00 • committed by Carles Cufí
commit f8c0e3907e
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
samples/drivers/flash_shell/src/main.c
View file

@ -7,6 +7,7 @@
#include <string.h> #include <string.h>
#include <zephyr.h> #include <zephyr.h>
#include <devicetree.h>
#include <sys/printk.h> #include <sys/printk.h>
#include <logging/log.h> #include <logging/log.h>
#include <shell/shell.h> #include <shell/shell.h>
@ -25,13 +26,6 @@ LOG_MODULE_REGISTER(app);
shell_fprintf(shell, SHELL_INFO, fmt, ##__VA_ARGS__) shell_fprintf(shell, SHELL_INFO, fmt, ##__VA_ARGS__)
#define PR_WARNING(shell, fmt, ...) \ #define PR_WARNING(shell, fmt, ...) \
shell_fprintf(shell, SHELL_WARNING, fmt, ##__VA_ARGS__) shell_fprintf(shell, SHELL_WARNING, fmt, ##__VA_ARGS__)
/*
* When DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL is available, we use it here.
* Otherwise the device can be set at runtime with the set_device command.
*/
#ifndef DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL
#define DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL ""
#endif
/* Command usage info. */ /* Command usage info. */
#define WRITE_BLOCK_SIZE_HELP \ #define WRITE_BLOCK_SIZE_HELP \
@ -92,7 +86,8 @@ LOG_MODULE_REGISTER(app);
#error Please increase CONFIG_SHELL_ARGC_MAX parameter. #error Please increase CONFIG_SHELL_ARGC_MAX parameter.
#endif #endif
static const struct device *flash_device; static const struct device *flash_device =
DEVICE_DT_GET_OR_NULL(DT_CHOSEN(zephyr_flash_controller));
static int check_flash_device(const struct shell *shell) static int check_flash_device(const struct shell *shell)
{ {
@ -734,14 +729,12 @@ static int cmd_set_dev(const struct shell *shell, size_t argc, char **argv)
void main(void) void main(void)
{ {
flash_device = if (device_is_ready(flash_device)) {
device_get_binding(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL); printk("Found flash controller %s.\n", flash_device->name);
if (flash_device) {
printk("Found flash controller %s.\n",
DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
printk("Flash I/O commands can be run.\n"); printk("Flash I/O commands can be run.\n");
} else { } else {
printk("**No flash controller found!**\n"); flash_device = NULL;
printk("**Flash controller not ready or not found!**\n");
printk("Run set_device <name> to specify one " printk("Run set_device <name> to specify one "
"before using other commands.\n"); "before using other commands.\n");
} }