fd1423620e
A pointer is not properly declared properly which causes the build to fail. flash_map_shell.c and flash_map.h do not include device.h so the device struct has an incomplete type hence the build error. Including device.h resolves the problem. Also fixes a Wformat warning when referencing fa_off which is a pointer. Cast the pointer to an uint32_t. Fixes #48722 Signed-off-by: Steven Slupsky <sslupsky@gmail.com>
50 lines
1.3 KiB
C
50 lines
1.3 KiB
C
/*
|
|
* Copyright (c) 2019 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr/shell/shell.h>
|
|
#include <zephyr/init.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <ctype.h>
|
|
#include <zephyr/storage/flash_map.h>
|
|
#include <zephyr/logging/log.h>
|
|
#include <zephyr/device.h>
|
|
|
|
#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
|
|
|
|
LOG_MODULE_REGISTER(flash_map_shell);
|
|
|
|
extern const struct flash_area *flash_map;
|
|
|
|
static void fa_cb(const struct flash_area *fa, void *user_data)
|
|
{
|
|
struct shell *shell = user_data;
|
|
|
|
shell_print(shell, "%-4d %-8d %-20s 0x%-10x 0x%-12x",
|
|
fa->fa_id, fa->fa_device_id, fa->fa_dev->name,
|
|
(uint32_t) fa->fa_off, fa->fa_size);
|
|
}
|
|
|
|
static int cmd_flash_map_list(const struct shell *shell, size_t argc,
|
|
char **argv)
|
|
{
|
|
shell_print(shell, "ID | Device | Device Name"
|
|
" | Offset | Size");
|
|
shell_print(shell, "-------------------------"
|
|
"------------------------------");
|
|
flash_area_foreach(fa_cb, (struct shell *)shell);
|
|
return 0;
|
|
}
|
|
|
|
SHELL_STATIC_SUBCMD_SET_CREATE(sub_flash_map,
|
|
/* Alphabetically sorted. */
|
|
SHELL_CMD(list, NULL, "List flash areas", cmd_flash_map_list),
|
|
SHELL_SUBCMD_SET_END /* Array terminated. */
|
|
);
|
|
|
|
SHELL_CMD_REGISTER(flash_map, &sub_flash_map, "Flash map commands", NULL);
|