Merge branch 'at91' of git://git.denx.de/u-boot-atmel

[karo-tx-uboot.git] / lib / display_options.c

diff --git a/lib/display_options.c b/lib/display_options.c
index a711425b906ae03a06849831ce718b11204196a5..d0480f510573c5b696f88013fcae843aa3984a49 100644 (file)
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -101,10 +101,12 @@ void print_size(unsigned long long size, const char *s)
 #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];
-       uint32_t *uip = (void*)linebuf;
-       uint16_t *usp = (void*)linebuf;
-       uint8_t *ucp = (void*)linebuf;
+       /* linebuf as a union causes proper alignment */
+       union linebuf {
+               uint32_t ui[MAX_LINE_LENGTH_BYTES/sizeof(uint32_t) + 1];
+               uint16_t us[MAX_LINE_LENGTH_BYTES/sizeof(uint16_t) + 1];
+               uint8_t  uc[MAX_LINE_LENGTH_BYTES/sizeof(uint8_t) + 1];
+       } lb;
        int i;
 
        if (linelen*width > MAX_LINE_LENGTH_BYTES)
@@ -121,24 +123,24 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen)
 
                /* Copy from memory into linebuf and print hex values */
                for (i = 0; i < linelen; i++) {
-                       if (width == 4) {
-                               uip[i] = *(volatile uint32_t *)data;
-                               printf(" %08x", uip[i]);
-                       } else if (width == 2) {
-                               usp[i] = *(volatile uint16_t *)data;
-                               printf(" %04x", usp[i]);
-                       } else {
-                               ucp[i] = *(volatile uint8_t *)data;
-                               printf(" %02x", ucp[i]);
-                       }
+                       uint32_t x;
+                       if (width == 4)
+                               x = lb.ui[i] = *(volatile uint32_t *)data;
+                       else if (width == 2)
+                               x = lb.us[i] = *(volatile uint16_t *)data;
+                       else
+                               x = lb.uc[i] = *(volatile uint8_t *)data;
+                       printf(" %0*x", width * 2, x);
                        data += width;
                }
 
                /* Print data in ASCII characters */
-               puts("    ");
-               for (i = 0; i < linelen * width; i++)
-                       putc(isprint(ucp[i]) && (ucp[i] < 0x80) ? ucp[i] : '.');
-               putc ('\n');
+               for (i = 0; i < linelen * width; i++) {
+                       if (!isprint(lb.uc[i]) || lb.uc[i] >= 0x80)
+                               lb.uc[i] = '.';
+               }
+               lb.uc[i] = '\0';
+               printf("    %s\n", lb.uc);
 
                /* update references */
                addr += linelen * width;