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@xxxxxxxxxxxxxx>
---
drivers/mci/mci-core.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 9000115..29c0d54 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;
}
--
1.8.3.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
