removing color stuff; introducing debug stuff (cmd)

[labortage2013badge.git] / hostware / commandline / hexdump.c

diff --git a/hostware/commandline/hexdump.c b/hostware/commandline/hexdump.c
index 6fb3742855cbabf8cb3850f0ee4f6c9b2be5c828..42ac6a0e4974b3c492dc0bce75dba1f5e4651c2b 100644 (file)
--- a/hostware/commandline/hexdump.c
+++ b/hostware/commandline/hexdump.c
@@ -20,14 +20,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <stdint.h>
+#include <inttypes.h>
 
 static
 void int_hexdump_line_buffer(FILE* stream, uint8_t* buffer, unsigned width, unsigned fill){
        unsigned i;
        for(i=0; i<width; ++i){
                if(i<fill){
-                       fprintf(stream, "%2.2x ", buffer[i]);
+                       fprintf(stream, "%2.2"PRIx8" ", buffer[i]);
                }else{
                        fputs("   ", stream);
                }
@@ -54,7 +54,7 @@ void hexdump_block(FILE* stream, void* block, void* print_addr, unsigned length,
        while(length>width){
                memcpy(buffer, block, width);
                if(print_addr){
-                       fprintf(stream, "%8.8x ", (uint32_t)print_addr);
+                       fprintf(stream, "%p ", print_addr);
                        print_addr = (uint8_t*)print_addr + width;
                }
                fprintf(stream, "<%4.4x>: ", index);
@@ -66,7 +66,7 @@ void hexdump_block(FILE* stream, void* block, void* print_addr, unsigned length,
        }
        memcpy(buffer, block, length);
        if(print_addr){
-               fprintf(stream, "%8.8x ", (uint32_t)print_addr);
+               fprintf(stream, "%p ", print_addr);
        }
        fprintf(stream, "<%4.4x>: ", index);
        int_hexdump_line_buffer(stream, buffer, width, length);