From 8f5e937129d96081f0342aa4377b1ffd48f9ea75 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 11 Aug 2016 12:47:34 +0300 Subject: kmsprint: improve property enum prints --- utils/kmsprint.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'utils') diff --git a/utils/kmsprint.cpp b/utils/kmsprint.cpp index e6a4be4..7f02b41 100644 --- a/utils/kmsprint.cpp +++ b/utils/kmsprint.cpp @@ -138,10 +138,10 @@ static string format_property(const Property* prop, uint64_t val) for (auto kvp : prop->get_enums()) { if (val & (1 << kvp.first)) v.push_back(kvp.second); - vall.push_back(kvp.second); + vall.push_back(sformat("%s=0x%x", kvp.second.c_str(), 1 << kvp.first)); } - ret += sformat("%s (%s)", join(v, "|").c_str(), join(vall, "|").c_str()); + ret += sformat("0x%llx (%s) [%s]", val, join(v, "|").c_str(), join(vall, "|").c_str()); break; } @@ -170,10 +170,10 @@ static string format_property(const Property* prop, uint64_t val) for (auto kvp : prop->get_enums()) { if (val == kvp.first) cur = kvp.second; - vall.push_back(kvp.second); + vall.push_back(sformat("%s=%llu", kvp.second.c_str(), kvp.first)); } - ret += sformat("%s (%s)", cur.c_str(), join(vall, "|").c_str()); + ret += sformat("%llu (%s) [%s]", val, cur.c_str(), join(vall, "|").c_str()); break; } -- cgit v1.2.3