From 6371dfc5b639c1c2b359a2eee779ede107fda7ab Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 6 Feb 2018 22:32:08 +0100
Subject: [PATCH] chg:  made DropField function a compiler macro instead.

---
 client/cmdhf14a.c |  6 ------
 client/cmdhf14a.h |  5 +----
 client/util.h     | 10 ++++++++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index afebae101..c91a36401 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -662,12 +662,6 @@ int CmdHF14ASniff(const char *Cmd) {
 	return 0;
 }
 
-void DropField() {
-	UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}}; 
-	clearCommandBuffer();
-	SendCommand(&c);
-}
-
 int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
 	uint16_t cmdc = 0;
 	
diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index e80d00a2c..948e20678 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -50,10 +50,7 @@ extern int CmdHF14ACmdRaw(const char *Cmd);
 extern int CmdHF14ACUIDs(const char *Cmd);
 
 extern char* getTagInfo(uint8_t uid);
-extern void DropField();
-extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
-
-											
+extern int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);									
 
 extern int usage_hf_14a_sim(void);
 extern int usage_hf_14a_sniff(void);
diff --git a/client/util.h b/client/util.h
index b2170dda8..8f74a7123 100644
--- a/client/util.h
+++ b/client/util.h
@@ -139,9 +139,15 @@
 #endif
 
 #if defined(__linux__)	|| (__APPLE__)
-# define BLUE_MSG(s) "\e[34m(s)\e[0m"
+# define BLUE_MSG(s) "\e[34m" #s "\e[0m"
 #else
-# define BLUE_MSG(s) "(s)"
+# define BLUE_MSG(s) #s
+#endif
+
+#ifndef DropField
+#define DropField() { \
+	UsbCommand c = {CMD_READER_ISO_14443a, {0,0,0}}; clearCommandBuffer(); SendCommand(&c); \
+}
 #endif
 
 extern int ukbhit(void);