mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-20 08:58:52 +09:00
![Mike Frysinger](/assets/img/avatar_default.png)
Applying a little creative format string allows us to shrink the initial data read & display loop by only calling printf once. Re-using the local data buffer to generate the string we want to display then allows us to output everything with just one printf call instead of multiple calls to the putc function. The local stack buffer needs increasing by 1 byte, but the resulting code shrink and speed up is worth it I think. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
152 lines
3.7 KiB
C
152 lines
3.7 KiB
C
/*
|
|
* (C) Copyright 2000-2002
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <common.h>
|
|
#include <linux/ctype.h>
|
|
#include <asm/io.h>
|
|
|
|
int display_options (void)
|
|
{
|
|
extern char version_string[];
|
|
|
|
#if defined(BUILD_TAG)
|
|
printf ("\n\n%s, Build: %s\n\n", version_string, BUILD_TAG);
|
|
#else
|
|
printf ("\n\n%s\n\n", version_string);
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* print sizes as "xxx KiB", "xxx.y KiB", "xxx MiB", "xxx.y MiB",
|
|
* xxx GiB, xxx.y GiB, etc as needed; allow for optional trailing string
|
|
* (like "\n")
|
|
*/
|
|
void print_size(unsigned long long size, const char *s)
|
|
{
|
|
unsigned long m = 0, n;
|
|
unsigned long long f;
|
|
static const char names[] = {'E', 'P', 'T', 'G', 'M', 'K'};
|
|
unsigned long d = 10 * ARRAY_SIZE(names);
|
|
char c = 0;
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(names); i++, d -= 10) {
|
|
if (size >> d) {
|
|
c = names[i];
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!c) {
|
|
printf("%llu Bytes%s", size, s);
|
|
return;
|
|
}
|
|
|
|
n = size >> d;
|
|
f = size & ((1ULL << d) - 1);
|
|
|
|
/* If there's a remainder, deal with it */
|
|
if (f) {
|
|
m = (10ULL * f + (1ULL << (d - 1))) >> d;
|
|
|
|
if (m >= 10) {
|
|
m -= 10;
|
|
n += 1;
|
|
}
|
|
}
|
|
|
|
printf ("%lu", n);
|
|
if (m) {
|
|
printf (".%ld", m);
|
|
}
|
|
printf (" %ciB%s", c, s);
|
|
}
|
|
|
|
/*
|
|
* Print data buffer in hex and ascii form to the terminal.
|
|
*
|
|
* data reads are buffered so that each memory address is only read once.
|
|
* Useful when displaying the contents of volatile registers.
|
|
*
|
|
* parameters:
|
|
* addr: Starting address to display at start of line
|
|
* data: pointer to data buffer
|
|
* width: data value width. May be 1, 2, or 4.
|
|
* count: number of values to display
|
|
* linelen: Number of values to print per line; specify 0 for default length
|
|
*/
|
|
#define MAX_LINE_LENGTH_BYTES (64)
|
|
#define DEFAULT_LINE_LENGTH_BYTES (16)
|
|
int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen)
|
|
{
|
|
uint8_t linebuf[MAX_LINE_LENGTH_BYTES + 1];
|
|
uint32_t *uip = (void*)linebuf;
|
|
uint16_t *usp = (void*)linebuf;
|
|
uint8_t *ucp = (void*)linebuf;
|
|
int i;
|
|
|
|
if (linelen*width > MAX_LINE_LENGTH_BYTES)
|
|
linelen = MAX_LINE_LENGTH_BYTES / width;
|
|
if (linelen < 1)
|
|
linelen = DEFAULT_LINE_LENGTH_BYTES / width;
|
|
|
|
while (count) {
|
|
printf("%08lx:", addr);
|
|
|
|
/* check for overflow condition */
|
|
if (count < linelen)
|
|
linelen = count;
|
|
|
|
/* Copy from memory into linebuf and print hex values */
|
|
for (i = 0; i < linelen; i++) {
|
|
uint32_t x;
|
|
if (width == 4)
|
|
x = uip[i] = *(volatile uint32_t *)data;
|
|
else if (width == 2)
|
|
x = usp[i] = *(volatile uint16_t *)data;
|
|
else
|
|
x = ucp[i] = *(volatile uint8_t *)data;
|
|
printf(" %0*x", width * 2, x);
|
|
data += width;
|
|
}
|
|
|
|
/* Print data in ASCII characters */
|
|
for (i = 0; i < linelen * width; i++)
|
|
if (!isprint(ucp[i]) || ucp[i] >= 0x80)
|
|
ucp[i] = '.';
|
|
ucp[i] = '\0';
|
|
printf(" %s\n", ucp);
|
|
|
|
/* update references */
|
|
addr += linelen * width;
|
|
count -= linelen;
|
|
|
|
if (ctrlc())
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|