summaryrefslogtreecommitdiffstats
path: root/common/memory_display.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-05-27 10:36:46 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-05-28 12:29:49 +0200
commitccd8dd48cd8eb9af5049d87ec6b2431d82976a7f (patch)
treea36212a9d09da1d1799016bc69ca84b0d2c78e1b /common/memory_display.c
parent6792d94a4b1a1b3cbdf55bf4e357a46030c060fa (diff)
downloadbarebox-ccd8dd48cd8eb9af5049d87ec6b2431d82976a7f.tar.gz
memory_display: Use consistent types
memory_display uses three different types for 32bit variables, three types for 16bit variables and three types for 8bit variables. Clean up this mess and use one type per variable width. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/memory_display.c')
-rw-r--r--common/memory_display.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/common/memory_display.c b/common/memory_display.c
index 7b1d35e..1ad0f05 100644
--- a/common/memory_display.c
+++ b/common/memory_display.c
@@ -6,8 +6,8 @@
int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int swab)
{
- ulong linebytes, i;
- u_char *cp;
+ unsigned long linebytes, i;
+ unsigned char *cp;
/* Print the lines.
*
@@ -15,10 +15,10 @@ int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int
* once, and all accesses are with the specified bus width.
*/
do {
- char linebuf[DISP_LINE_LEN];
- uint32_t *uip = (uint *)linebuf;
- uint16_t *usp = (ushort *)linebuf;
- uint8_t *ucp = (u_char *)linebuf;
+ unsigned char linebuf[DISP_LINE_LEN];
+ uint32_t *uip = (uint32_t *)linebuf;
+ uint16_t *usp = (uint16_t *)linebuf;
+ uint8_t *ucp = (uint8_t *)linebuf;
unsigned count = 52;
printf("%08llx:", offs);
@@ -26,9 +26,9 @@ int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int
for (i = 0; i < linebytes; i += size) {
if (size == 4) {
- u32 res;
+ uint32_t res;
data_abort_mask();
- res = *((uint *)addr);
+ res = *((uint32_t *)addr);
if (swab)
res = __swab32(res);
if (data_abort_unmask()) {
@@ -39,9 +39,9 @@ int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int
}
*uip++ = res;
} else if (size == 2) {
- u16 res;
+ uint16_t res;
data_abort_mask();
- res = *((ushort *)addr);
+ res = *((uint16_t *)addr);
if (swab)
res = __swab16(res);
if (data_abort_unmask()) {
@@ -52,9 +52,9 @@ int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int
}
*usp++ = res;
} else {
- u8 res;
+ uint8_t res;
data_abort_mask();
- res = *((u_char *)addr);
+ res = *((uint8_t *)addr);
if (data_abort_unmask()) {
res = 0xff;
count -= printf(" xx");
@@ -70,7 +70,7 @@ int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int
while (count--)
putchar(' ');
- cp = (uint8_t *)linebuf;
+ cp = linebuf;
for (i = 0; i < linebytes; i++) {
if ((*cp < 0x20) || (*cp > 0x7e))
putchar('.');