From 5c49fcbfdbfe6cb32f4754da4036a2f35b127c1f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 25 Apr 2019 22:51:01 +0200
Subject: [PATCH 1/3] CHG: remove WITH_EMV since its not used at all.

---
 client/cmdtrace.c   | 3 ---
 common/Makefile.hal | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index de056d814..28605c08f 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -28,9 +28,6 @@ static int usage_trace_list() {
     PrintAndLogEx(NORMAL, "    14b    - interpret data as iso14443b communications");
     PrintAndLogEx(NORMAL, "    15     - interpret data as iso15693 communications");
     PrintAndLogEx(NORMAL, "    des    - interpret data as DESFire communications");
-#ifdef WITH_EMV
-    PrintAndLogEx(NORMAL, "    emv    - interpret data as EMV / communications");
-#endif
     PrintAndLogEx(NORMAL, "    iclass - interpret data as iclass communications");
     PrintAndLogEx(NORMAL, "    topaz  - interpret data as topaz communications");
     PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
diff --git a/common/Makefile.hal b/common/Makefile.hal
index d6f87a2e6..83d2dbf41 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -95,10 +95,6 @@ $(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))
 ifneq (,$(findstring WITH_FPC_,$(PLATFORM_DEFS)))
   PLATFORM_DEFS += -DWITH_FPC
 endif
-# WITH_EMV possible if WITH_ISO14443a :
-ifneq (,$(findstring WITH_ISO14443a,$(PLATFORM_DEFS)))
-  PLATFORM_DEFS += -DWITH_EMV
-endif
 
 PLATFORM_DEFS_INFO = $(strip $(filter-out STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS))))
 PLATFORM_DEFS_INFO_STANDALONE = $(strip $(subst STANDALONE_,, $(filter STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS)))))

From 4494c3dc617bbf425358d2130afa0a147514a4f1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 26 Apr 2019 10:46:00 +0200
Subject: [PATCH 2/3] text

---
 common/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/i2c.c b/common/i2c.c
index 8cb88d9b0..1d821d645 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -593,7 +593,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 }
 
 void I2C_print_status(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816"));
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816)"));
     uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);

From 4ad9f579392e42b3ccc672689190ac30a798f108 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 26 Apr 2019 10:49:30 +0200
Subject: [PATCH 3/3] missing bracket

---
 client/comms.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 6bddf33e2..7731a65a1 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -159,9 +159,9 @@ static void UsbCommandReceived(UsbCommand *c) {
 #if defined(__linux__) || (__APPLE__)
             memcpy(s, c->d.asBytes, len);
 #else
-            if (flag & FLAG_ANSI)
+            if (flag & FLAG_ANSI) {
                 // Filter out ANSI sequences on these OS
-                uint16_t si=0;
+                uint16_t si = 0;
                 for (uint16_t i=0; i < len; i++) {
                     if ((c->d.asBytes[i] == '\x1b') && (i < len - 1) && (c->d.asBytes[i+1] >= 0x40) && (c->d.asBytes[i+1] <= 0x5F)) { // entering ANSI sequence
                         i++;