ADD: Mifare Desfire defines

[proxmark3-svn] / client / cmdlfawid.c

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 676a18c1ed92098f4388fe51bb37912282c3de6f..2334e3e3321ffba7ded59066a8ae37d167f22650 100644 (file)
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -7,19 +7,9 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Low frequency AWID26 commands
+// Low frequency AWID26/50 commands
 //-----------------------------------------------------------------------------
-
-#include <stdio.h>      // sscanf
-#include "proxmark3.h"  // Definitions, USB controls, etc
-#include "ui.h"         // PrintAndLog
-#include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "cmdlfawid.h"  // AWID function declarations
-#include "lfdemod.h"    // parityTest
-#include "util.h"       // weigandparity
-#include "protocols.h"  // for T55xx config register definitions
-#include "cmdmain.h"
-#include "sleep.h"
  
 static int CmdHelp(const char *Cmd);
 
@@ -94,7 +84,7 @@ int usage_lf_awid_brute(void){
        return 0;
 }
 
-static boolean sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bs, size_t bs_len){
+static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, uint8_t *bs, size_t bs_len){
 
        PrintAndLog("Trying FC: %u; CN: %u", fc, cn);           
        if ( !getAWIDBits(fmtlen, fc, cn, bs)) {
@@ -114,8 +104,9 @@ static boolean sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay,
 static int sendPing(){
        UsbCommand resp;
        UsbCommand ping = {CMD_PING};
-       clearCommandBuffer();
-       SendCommand(&ping);
+       clearCommandBuffer(); SendCommand(&ping);
+       clearCommandBuffer(); SendCommand(&ping);
+       clearCommandBuffer(); SendCommand(&ping);
        if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
                PrintAndLog("aborted via keyboard!");
                return 0;
@@ -384,7 +375,7 @@ int CmdAWIDBrute(const char *Cmd){
                
                // Do one down  (if cardnumber is given)
                if ( cn > 1 )
-                       if ( down > 0 )
+                       if ( down > 1 )
                                if ( !sendTry(fmtlen, fc, --down, delay, bs, size)) return 1;
        }
        return 0;