"env grep" - add support for regular expression matches

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

diff --git a/lib/display_options.c b/lib/display_options.c
index 20319e64bd1501ca440b5cd4e4bdf1a24fd9599e..e6d684bd60bdc3e18ef077775d8f532eaeb8d352 100644 (file)
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -23,13 +23,12 @@
 
 #include <config.h>
 #include <common.h>
+#include <version.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
@@ -99,12 +98,15 @@ void print_size(unsigned long long size, const char *s)
  */
 #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)
+int print_buffer(ulong addr, const 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;
+       /* 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)
@@ -113,35 +115,44 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen)
                linelen = DEFAULT_LINE_LENGTH_BYTES / width;
 
        while (count) {
+               uint thislinelen = linelen;
                printf("%08lx:", addr);
 
                /* check for overflow condition */
-               if (count < linelen)
-                       linelen = count;
+               if (count < thislinelen)
+                       thislinelen = count;
 
                /* Copy from memory into linebuf and print hex values */
-               for (i = 0; i < linelen; i++) {
+               for (i = 0; i < thislinelen; i++) {
                        uint32_t x;
                        if (width == 4)
-                               x = uip[i] = *(volatile uint32_t *)data;
+                               x = lb.ui[i] = *(volatile uint32_t *)data;
                        else if (width == 2)
-                               x = usp[i] = *(volatile uint16_t *)data;
+                               x = lb.us[i] = *(volatile uint16_t *)data;
                        else
-                               x = ucp[i] = *(volatile uint8_t *)data;
+                               x = lb.uc[i] = *(volatile uint8_t *)data;
                        printf(" %0*x", width * 2, x);
                        data += width;
                }
 
+               while (thislinelen < linelen) {
+                       /* fill line with whitespace for nice ASCII print */
+                       for (i=0; i<width*2+1; i++)
+                               puts(" ");
+                       linelen--;
+               }
+
                /* 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);
+               for (i = 0; i < thislinelen * 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;
-               count -= linelen;
+               addr += thislinelen * width;
+               count -= thislinelen;
 
                if (ctrlc())
                        return -1;