nonce2key: printf->PrintAndLog

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 6549d6ea7c6572dbbb0a8d3e66e554eff5c5216f..24b4bada9d69798d5d956a2fa538ea9133a8b332 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -26,7 +26,7 @@ static int CmdHelp(const char *Cmd);
 
 static void lookupChipID(uint32_t iChipID, uint32_t mem_used)
 {
-       char asBuff[100];
+       char asBuff[120];
        memset(asBuff, 0, sizeof(asBuff));
        uint32_t mem_avail = 0;
        
@@ -137,12 +137,17 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used)
                        mem_avail = 2048;
                        break;
        }
-       PrintAndLog("Nonvolatile Program Memory Size: %dK bytes. Used: %d bytes (%2.0f\%). Free: %d bytes (%2.0f\%).", 
+       
+       uint32_t mem_left = 0;
+       if ( mem_avail > 0 ) 
+               mem_left = (mem_avail * 1024) - mem_used;
+       
+       PrintAndLog("Nonvolatile Program Memory Size: %uK bytes. Used: %u bytes (%2.0f\%). Free: %u bytes (%2.0f\%).", 
                                mem_avail, 
                                mem_used, 
-                               mem_avail == 0 ? 0 : (float)mem_used/(mem_avail*1024)*100,
-                               mem_avail*1024 - mem_used,
-                               mem_avail == 0 ? 0 : (float)(mem_avail*1024-mem_used)/(mem_avail*1024)*100
+                               mem_avail == 0 ? 0.0f : (float)mem_used/(mem_avail*1024)*100,
+                               mem_left,
+                               mem_avail == 0 ? 0.0f : (float)mem_left/(mem_avail*1024)*100
                                );
        switch((iChipID&0xF000)>>12)
        {