From: Simon Glass Date: Wed, 29 Apr 2015 13:56:43 +0000 (-0600) Subject: Add print_freq() to display frequencies nicely X-Git-Tag: v2015.07-rc1~20 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=33eac2dc25eb8b38d2991c61036d20f707fdd54f;p=oweals%2Fu-boot.git Add print_freq() to display frequencies nicely Add a function similar to print_size() that works for frequencies. It can handle from Hz to GHz. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Tested-by: Bin Meng --- diff --git a/include/display_options.h b/include/display_options.h index 54bd41d10d..ac44c459b3 100644 --- a/include/display_options.h +++ b/include/display_options.h @@ -22,6 +22,17 @@ */ void print_size(uint64_t size, const char *suffix); +/** + * print_freq() - Print a frequency with a suffix + * + * Print frequencies as "x.xx GHz", "xxx KHz", etc as needed; allow for + * optional trailing string (like "\n") + * + * @freq: Frequency to print in Hz + * @suffix String to print after the frequency + */ +void print_freq(uint64_t freq, const char *suffix); + /** * print_buffer() - Print data buffer in hex and ascii form * diff --git a/lib/display_options.c b/lib/display_options.c index 3f32bcd8cf..24d8f554e5 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -22,6 +23,47 @@ int display_options (void) return 0; } +void print_freq(uint64_t freq, const char *s) +{ + unsigned long m = 0, n; + uint32_t f; + static const char names[] = {'G', 'M', 'K'}; + unsigned long d = 1e9; + char c = 0; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(names); i++, d /= 1000) { + if (freq >= d) { + c = names[i]; + break; + } + } + + if (!c) { + printf("%" PRIu64 " Hz%s", freq, s); + return; + } + + f = do_div(freq, d); + n = freq; + + /* If there's a remainder, show the first few digits */ + if (f) { + m = f; + while (m > 1000) + m /= 10; + while (m && !(m % 10)) + m /= 10; + if (m >= 100) + m = (m / 10) + (m % 100 >= 50); + } + + printf("%lu", n); + if (m) + printf(".%ld", m); + printf(" %cHz%s", c, s); +} + void print_size(uint64_t size, const char *s) { unsigned long m = 0, n;