@@ -376,20 +376,18 @@ show_size(u64 x)
static void
show_range(char *prefix, u64 base, u64 limit, int is_64bit)
{
- if (base > limit && verbose < 3)
+ printf("%s:", prefix);
+ if (base <= limit || verbose > 2)
{
- printf("%s: None\n", prefix);
- return;
+ if (is_64bit)
+ printf(" %016" PCI_U64_FMT_X "-%016" PCI_U64_FMT_X, base, limit);
+ else
+ printf(" %08x-%08x", (unsigned) base, (unsigned) limit);
}
- printf("%s: ", prefix);
- if (is_64bit)
- printf("%016" PCI_U64_FMT_X "-%016" PCI_U64_FMT_X, base, limit);
- else
- printf("%08x-%08x", (unsigned) base, (unsigned) limit);
if (base <= limit)
show_size(limit - base + 1);
else
- printf(" [empty]");
+ printf(" [disabled]");
putchar('\n');
}
Change output displayed for memory behind bridge when the range is empty to be consistent between each verbosity level. Replace "None" and "[empty]" with "[disabled]". Old and new output examples listed below for each verbosity level. Show_range() is not called unless verbose == true. No output given unless a verbose argument is provided. OLD output for -v and -vv which uses "None" and -vvv uses "[empty]": Memory behind bridge: None # lspci -v Memory behind bridge: None # lspci -vv Memory behind bridge: 0000e000-0000efff [empty] # lspci -vvv NEW output for -v, -vv, and -vvv to use "[disabled]": Memory behind bridge: [disabled] # lspci -v Memory behind bridge: [disabled] # lspci -vv Memory behind bridge: 0000e000-0000efff [disabled] # lspci -vvv Advantage is consistent output regardless of verbosity level chosen and to simplify the code. Signed-off-by: Kelsey Skunberg <skunberg.kelsey@gmail.com> --- lspci.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)