[PATCH 03/24] Make %pR could handle bus resource with domain
From: Yinghai Lu <yinghai@kernel.org>
Date: 2012-02-05 07:04:40
Also in:
linux-pci, lkml
Subsystem:
library code, the rest, vsprintf · Maintainers:
Andrew Morton, Linus Torvalds, Petr Mladek, Steven Rostedt
So could use %pR for busn_res with domain nr in start/end Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> --- lib/vsprintf.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 8e75003..9397998 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c@@ -451,6 +451,12 @@ char *resource_string(char *buf, char *end, struct resource *res, .precision = -1, .flags = SPECIAL | SMALL | ZEROPAD, }; + static const struct printf_spec domain_spec = { + .base = 16, + .field_width = 4, + .precision = -1, + .flags = SMALL | ZEROPAD, + }; static const struct printf_spec bus_spec = { .base = 16, .field_width = 2,
@@ -507,11 +513,26 @@ char *resource_string(char *buf, char *end, struct resource *res, specp = &mem_spec; decode = 0; } - p = number(p, pend, res->start, *specp); - if (res->start != res->end) { - *p++ = '-'; - p = number(p, pend, res->end, *specp); + + if (res->flags & IORESOURCE_BUS && busn_domain_nr(res->end)) { + p = number(p, pend, busn_domain_nr(res->start), domain_spec); + *p++ = ':'; + p = number(p, pend, busn_bus_nr(res->start), *specp); + if (res->start != res->end) { + *p++ = '-'; + p = number(p, pend, busn_domain_nr(res->end), + domain_spec); + *p++ = ':'; + p = number(p, pend, busn_bus_nr(res->end), *specp); + } + } else { + p = number(p, pend, res->start, *specp); + if (res->start != res->end) { + *p++ = '-'; + p = number(p, pend, res->end, *specp); + } } + if (decode) { if (res->flags & IORESOURCE_MEM_64) p = string(p, pend, " 64bit", str_spec);
--
1.7.7