diff options
| author | Trent Piepho <tpiepho@kymetacorp.com> | 2015-11-04 20:02:36 +0000 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-05 09:01:17 +0100 |
| commit | dbd7190295298acfb4996ec1aba5165a7be28fdc (patch) | |
| tree | df928464ae29a743ab3507e9ca64c20a677af5d3 /drivers/mci/mci-core.c | |
| parent | f1d4230a333196de0495ba631d4e795068aad6b5 (diff) | |
| download | barebox-dbd7190295298acfb4996ec1aba5165a7be28fdc.tar.gz barebox-dbd7190295298acfb4996ec1aba5165a7be28fdc.tar.xz | |
mci: Print versions with micro levels correctly
The version is stored as BCD, e.g. 0x40 -> ".4" and 0x41 -> ".41".
The latter was getting printed as ".65". Simplify the logic a bit to
not split the minor into nybbles just to re-assemble it into a byte
again.
Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci/mci-core.c')
| -rw-r--r-- | drivers/mci/mci-core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index 90001153d7..29c0d5474e 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -947,14 +947,13 @@ out: static char *mci_version_string(struct mci *mci) { static char version[sizeof("x.xx")]; - unsigned major, minor, micro; + unsigned major, minor; major = (mci->version >> 8) & 0xf; - minor = (mci->version >> 4) & 0xf; - micro = mci->version & 0xf; + minor = mci->version & 0xff; - sprintf(version, "%u.%u", major, - micro ? (minor << 4) | micro : minor); + /* Shift off last digit of minor if it's 0 */ + sprintf(version, "%u.%x", major, minor & 0xf ? minor : minor >> 4); return version; } |