| Message ID | 1430174911-27538-7-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Simon, On Tue, Apr 28, 2015 at 6:48 AM, Simon Glass <sjg@chromium.org> wrote: > Add a function similar to print_size() that works for frequencies. It can > handle from Hz to GHz. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > include/display_options.h | 11 +++++++++++ > lib/display_options.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 52 insertions(+) > > diff --git a/include/display_options.h b/include/display_options.h > index c222ea2..10b4641 100644 > --- a/include/display_options.h > +++ b/include/display_options.h > @@ -23,6 +23,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 print->Print > + * 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 > * > * Data reads are buffered so that each memory address is only read once. > diff --git a/lib/display_options.c b/lib/display_options.c > index 3f32bcd..cf6f50b 100644 > --- a/lib/display_options.c > +++ b/lib/display_options.c > @@ -7,6 +7,7 @@ > > #include <config.h> > #include <common.h> > +#include <div64.h> > #include <inttypes.h> > #include <version.h> > #include <linux/ctype.h> > @@ -22,6 +23,46 @@ int display_options (void) > return 0; > } > > +#ifndef CONFIG_SH > +/* SH gcc 4.6 toolchain produces "undefined reference to '__umoddi3' here */ > +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 /= 10) { I think this is broken. Should be 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 % 1000; This is broken too. Should be m = f % d; > + while (!(m % 10)) And I think you need add a variable to control how many first few digits you want to show in this loop. > + m /= 10; > + } > + > + printf("%lu", n); > + if (m) > + printf(".%ld", m); > + printf(" %cHz%s", c, s); > +} > +#endif > + > void print_size(uint64_t size, const char *s) > { > unsigned long m = 0, n; > -- Regards, Bin
diff --git a/include/display_options.h b/include/display_options.h index c222ea2..10b4641 100644 --- a/include/display_options.h +++ b/include/display_options.h @@ -23,6 +23,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 * * Data reads are buffered so that each memory address is only read once. diff --git a/lib/display_options.c b/lib/display_options.c index 3f32bcd..cf6f50b 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -7,6 +7,7 @@ #include <config.h> #include <common.h> +#include <div64.h> #include <inttypes.h> #include <version.h> #include <linux/ctype.h> @@ -22,6 +23,46 @@ int display_options (void) return 0; } +#ifndef CONFIG_SH +/* SH gcc 4.6 toolchain produces "undefined reference to '__umoddi3' here */ +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 /= 10) { + 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 % 1000; + while (!(m % 10)) + m /= 10; + } + + printf("%lu", n); + if (m) + printf(".%ld", m); + printf(" %cHz%s", c, s); +} +#endif + void print_size(uint64_t size, const char *s) { unsigned long m = 0, n;
Add a function similar to print_size() that works for frequencies. It can handle from Hz to GHz. Signed-off-by: Simon Glass <sjg@chromium.org> --- include/display_options.h | 11 +++++++++++ lib/display_options.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+)