Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: Tidy up 'dm tree' output when there are many devices

Browse source 
At present the 'Index' column assumes there is only one digit. But on some
devices (e.g. snow) there are a lot of regulators and GPIO banks. Adjust
the output to allow for two digits without messing up the display.

Also capatalise the heading to match.

Fixes: 5197dafc42 (dm: core: Widen the dump tree to show more of the
driver's name.)

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Liviu Dudau <liviu.dudau@foss.arm.com>
This commit is contained in:
Simon Glass 2018-12-05 18:42:52 -07:00
parent 90a29fcc1f
commit 54d2cfe6ee
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/core/dump.c
View file

@ -16,7 +16,7 @@ static void show_devices(struct udevice *dev, int depth, int last_flag)
struct udevice *child; struct udevice *child;
/* print the first 20 characters to not break the tree-format. */ /* print the first 20 characters to not break the tree-format. */
printf(" %-10.10s %d [ %c ] %-20.20s ", dev->uclass->uc_drv->name, printf(" %-10.10s %2d [ %c ] %-20.20s ", dev->uclass->uc_drv->name,
dev_get_uclass_index(dev, NULL), dev_get_uclass_index(dev, NULL),
dev->flags & DM_FLAG_ACTIVATED ? '+' : ' ', dev->driver->name); dev->flags & DM_FLAG_ACTIVATED ? '+' : ' ', dev->driver->name);
@ -49,7 +49,7 @@ void dm_dump_all(void)
root = dm_root(); root = dm_root();
if (root) { if (root) {
printf(" Class index Probed Driver Name\n"); printf(" Class Index Probed Driver Name\n");
printf("-----------------------------------------------------------\n"); printf("-----------------------------------------------------------\n");
show_devices(root, -1, 0); show_devices(root, -1, 0);
} }

3
test/py/tests/test_bind.py
View file

@ -13,7 +13,8 @@ def in_tree(response, name, uclass, drv, depth, last_child):
else: else:
leaf = leaf + '`' leaf = leaf + '`'
leaf = leaf + '-- ' + name leaf = leaf + '-- ' + name
line = ' *{:10.10} [0-9]* \[ [ +] \] {:20.20} {}$'.format(uclass, drv, leaf) line = (' *{:10.10} [0-9]* \[ [ +] \] {:20.20} {}$'
.format(uclass, drv, leaf))
prog = re.compile(line) prog = re.compile(line)
for l in lines: for l in lines:
if prog.match(l): if prog.match(l):