FIX: more minor issues with block Numbers.

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index f580e6d57debc8d6b6bfd9d24fd9f3ca5579b67a..03152cddb7bc0516f475b5dd2d20557d2ab53de6 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -144,7 +144,7 @@ demodError:
 
 int CmdHF14BList(const char *Cmd)
 {
-  uint8_t got[960];
+  uint8_t got[TRACE_BUFFER_SIZE];
   GetFromBigBuf(got,sizeof(got),0);
   WaitForResponse(CMD_ACK,NULL);
 
@@ -156,9 +156,8 @@ int CmdHF14BList(const char *Cmd)
   int prev = -1;
 
   for(;;) {
-    if(i >= 900) {
-      break;
-    }
+    
+       if(i >= TRACE_BUFFER_SIZE) { break; }
 
     bool isResponse;
     int timestamp = *((uint32_t *)(got+i));
@@ -175,7 +174,7 @@ int CmdHF14BList(const char *Cmd)
     if(len > 100) {
       break;
     }
-    if(i + len >= 900) {
+    if(i + len >= TRACE_BUFFER_SIZE) {
       break;
     }
 
@@ -357,7 +356,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
     SendCommand(&c);
     
     if (reply) {
-        if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+        if (WaitForResponseTimeout(CMD_ACK,&resp,10000)) {
             recv = resp.d.asBytes;
             PrintAndLog("received %i octets",resp.arg[0]);
             if(!resp.arg[0])
@@ -404,13 +403,15 @@ int CmdHF14BWrite( const char *Cmd){
        bool isSrix4k = true;
        char str[20];   
 
-       if (cmdp == 'h' || cmdp == 'H') {
+       if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
                PrintAndLog("Usage:  hf 14b write <1|2> <BLOCK> <DATA>");
-               PrintAndLog("");
+               PrintAndLog("    [1 = SRIX4K]");
+               PrintAndLog("    [2 = SRI512]");
+               PrintAndLog("    [BLOCK number depends on which tag, special block == 255]");
                PrintAndLog("     sample: hf 14b write 1 127 11223344");
-               PrintAndLog("     sample: hf 14b write 1 255 11223344");
-               PrintAndLog("     sample: hf 14b write 2 15 11223344");
-               PrintAndLog("     sample: hf 14b write 2 255 11223344");
+               PrintAndLog("           : hf 14b write 1 255 11223344");
+               PrintAndLog("           : hf 14b write 2 15 11223344");
+               PrintAndLog("           : hf 14b write 2 255 11223344");
                return 0;
        }