FPGA changes (#803)

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 3854b5899611e1f573352467dfeac34c6e278cd1..14ce1bcc2bf8699a5ce4488aae8a2cccb3e94575 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -15,10 +15,10 @@
 \r
 #include "mifarecmd.h"\r
 \r
 \r
 #include "mifarecmd.h"\r
 \r

-#include "apps.h"\r

 #include "util.h"\r
 #include "parity.h"\r
 #include "crc.h"\r
 #include "util.h"\r
 #include "parity.h"\r
 #include "crc.h"\r

+#include "fpgaloader.h"\r

 \r
 #define HARDNESTED_AUTHENTICATION_TIMEOUT 848                  // card times out 1ms after wrong authentication (according to NXP documentation)\r
 #define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400             // some (non standard) cards need a pause after select before they are ready for first authentication \r
 \r
 #define HARDNESTED_AUTHENTICATION_TIMEOUT 848                  // card times out 1ms after wrong authentication (according to NXP documentation)\r
 #define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400             // some (non standard) cards need a pause after select before they are ready for first authentication \r


@@ -1149,7 +1149,7 @@ static bool isBlockTrailer(int blockN) {
        if (blockN >= 128 && blockN <= 256) {\r
                return ((blockN & 0x0F) == 0x0F);\r
        }\r
        if (blockN >= 128 && blockN <= 256) {\r
                return ((blockN & 0x0F) == 0x0F);\r
        }\r

-       return FALSE;\r
+       return false;\r

 }\r
 \r
 void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
 }\r
 \r
 void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r