michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: use visitor to get required devices

Browse source 
Update to use the API that will be aware of runtime-added
dependencies.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2021-02-22 11:42:50 -06:00 • committed by Anas Nashif
commit 52567cf7ce
1 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
subsys/shell/modules/device_service.c
View file

@ -10,6 +10,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <device.h> #include <device.h>
#include <sys/arch_interface.h>
extern const struct device __device_PRE_KERNEL_1_start[]; extern const struct device __device_PRE_KERNEL_1_start[];
extern const struct device __device_PRE_KERNEL_2_start[]; extern const struct device __device_PRE_KERNEL_2_start[];
@ -106,6 +107,23 @@ static int cmd_device_levels(const struct shell *shell,
return 0; return 0;
} }
struct cmd_device_list_visitor_context {
const struct shell *shell;
char *buf;
size_t buf_size;
};
static int cmd_device_list_visitor(const struct device *dev,
void *context)
{
const struct cmd_device_list_visitor_context *ctx = context;
shell_fprintf(ctx->shell, SHELL_NORMAL, " requires: %s\n",
get_device_name(dev, ctx->buf, ctx->buf_size));
return 0;
}
static int cmd_device_list(const struct shell *shell, static int cmd_device_list(const struct shell *shell,
size_t argc, char **argv) size_t argc, char **argv)
{ {
@ -122,9 +140,6 @@ static int cmd_device_list(const struct shell *shell,
char buf[20]; char buf[20];
const char *name = get_device_name(dev, buf, sizeof(buf)); const char *name = get_device_name(dev, buf, sizeof(buf));
const char *state = "READY"; const char *state = "READY";
size_t nhdls = 0;
const device_handle_t *hdls =
device_required_handles_get(dev, &nhdls);
shell_fprintf(shell, SHELL_NORMAL, "- %s", name); shell_fprintf(shell, SHELL_NORMAL, "- %s", name);
if (!device_is_ready(dev)) { if (!device_is_ready(dev)) {
@ -141,12 +156,14 @@ static int cmd_device_list(const struct shell *shell,
} }
shell_fprintf(shell, SHELL_NORMAL, " (%s)\n", state); shell_fprintf(shell, SHELL_NORMAL, " (%s)\n", state);
for (size_t di = 0; di < nhdls; ++di) { if (!_is_user_context()) {
device_handle_t dh = hdls[di]; struct cmd_device_list_visitor_context ctx = {
const struct device *rdp = device_from_handle(dh); .shell = shell,
.buf = buf,
.buf_size = sizeof(buf),
};
shell_fprintf(shell, SHELL_NORMAL, " requires: %s\n", (void)device_required_foreach(dev, cmd_device_list_visitor, &ctx);
get_device_name(rdp, buf, sizeof(buf)));
} }
} }