Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 08:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: Move device display into its own function

Browse source 
The device display for 'dm tree' and 'dm uclass' is mostly the same, so
move it into a common function.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-07-23 06:55:10 -06:00
parent 5c33c9fdbb
commit fffa24d7c5
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
test/dm/cmd_dm.c
View file

@ -16,6 +16,22 @@
#include <dm/test.h> #include <dm/test.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
/**
* dm_display_line() - Display information about a single device
*
* Displays a single line of information with an option prefix
*
* @dev: Device to display
* @buf: Prefix to display at the start of the line
*/
static void dm_display_line(struct udevice *dev, char *buf)
{
printf("%s- %c %s @ %08lx", buf,
dev->flags & DM_FLAG_ACTIVATED ? '*' : ' ',
dev->name, (ulong)map_to_sysmem(dev));
puts("\n");
}
static int display_succ(struct udevice *in, char *buf) static int display_succ(struct udevice *in, char *buf)
{ {
int len; int len;
@ -23,10 +39,7 @@ static int display_succ(struct udevice *in, char *buf)
char local[16]; char local[16];
struct udevice *pos, *n, *prev = NULL; struct udevice *pos, *n, *prev = NULL;
printf("%s- %c %s @ %08lx", buf, dm_display_line(in, buf);
in->flags & DM_FLAG_ACTIVATED ? '*' : ' ',
in->name, (ulong)map_to_sysmem(in));
puts("\n");
if (list_empty(&in->child_head)) if (list_empty(&in->child_head))
return 0; return 0;
@ -84,9 +97,7 @@ static int do_dm_dump_uclass(cmd_tbl_t *cmdtp, int flag, int argc,
for (ret = uclass_first_device(id, &dev); for (ret = uclass_first_device(id, &dev);
dev; dev;
ret = uclass_next_device(&dev)) { ret = uclass_next_device(&dev)) {
printf(" %c %s @ %08lx:\n", dm_display_line(dev, "");
dev->flags & DM_FLAG_ACTIVATED ? '*' : ' ',
dev->name, (ulong)map_to_sysmem(dev));
} }
puts("\n"); puts("\n");
} }
@ -135,7 +146,7 @@ static int do_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
U_BOOT_CMD( U_BOOT_CMD(
dm, 2, 1, do_dm, dm, 2, 1, do_dm,
"Driver model low level access", "Driver model low level access",
"tree Dump driver model tree\n" "tree Dump driver model tree ('*' = activated)\n"
"dm uclass Dump list of instances for each uclass" "dm uclass Dump list of instances for each uclass"
TEST_HELP TEST_HELP
); );