From 763c94334b7f61dc06e962f9386f3d72650736e2 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 13 Aug 2019 17:27:52 +0200 Subject: [PATCH] add missing includes and fix mf1ksim usage in hf_colin standalone mode --- armsrc/Standalone/hf_colin.c | 18 +++++++++++++++++- armsrc/Standalone/hf_colin.h | 4 ++++ armsrc/iso14443a.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c index 4fe898a18..21df29b9d 100644 --- a/armsrc/Standalone/hf_colin.c +++ b/armsrc/Standalone/hf_colin.c @@ -8,7 +8,23 @@ //----------------------------------------------------------------------------- // main code for HF Mifare aka ColinRun by Colin Brigato //----------------------------------------------------------------------------- + +#include "standalone.h" // standalone definitions + #include "hf_colin.h" +#include "proxmark3_arm.h" +#include "appmain.h" +#include "fpgaloader.h" +#include "dbprint.h" +#include "ticks.h" +#include "util.h" +#include "commonutil.h" +#include "BigBuf.h" +#include "iso14443a.h" +#include "mifareutil.h" +#include "mifaresim.h" +#include "vtsend.h" +#include "spiffs.h" #include "frozen.h" #define MF1KSZ 1024 @@ -733,7 +749,7 @@ readysim: DbprintfEx(FLAG_NEWLINE,"\n\n\n\n\n\n\n\nn\n\nn\n\n\nflags: %d (0x%02x)",flags,flags); cjSetCursLeft(); SpinOff(1000); - Mifare1ksim(flags , 0, cjuid); + Mifare1ksim(flags , 0, cjuid, 0, 0); LED_C_OFF(); SpinOff(50); vtsend_cursor_position_restore(NULL); diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h index ca65a6df4..a4b870abc 100644 --- a/armsrc/Standalone/hf_colin.h +++ b/armsrc/Standalone/hf_colin.h @@ -9,6 +9,10 @@ // StandAlone Mod //----------------------------------------------------------------------------- +#include +#include +#include + #ifndef FALSE #define FALSE 0 #endif diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h index e4ea7f0df..1bea3a1b9 100644 --- a/armsrc/iso14443a.h +++ b/armsrc/iso14443a.h @@ -16,6 +16,7 @@ #include "common.h" #include "mifare.h" // struct #include "pm3_cmd.h" +#include "crc16.h" // compute_crc // When the PM acts as tag and is receiving it takes // 2 ticks delay in the RF part (for the first falling edge),