From 2ce30201b20be2e8086ca949ed9e78648e8bda81 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 28 Aug 2021 19:10:14 +0200
Subject: [PATCH] Fix lf em 410x watch and standalone bug introduced with
 Electra changes

---
 armsrc/Standalone/lf_icehid.c |  2 +-
 armsrc/lfops.c                | 88 ++++++++++++++++++-----------------
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/armsrc/Standalone/lf_icehid.c b/armsrc/Standalone/lf_icehid.c
index 01b164afd..fa5de45b5 100644
--- a/armsrc/Standalone/lf_icehid.c
+++ b/armsrc/Standalone/lf_icehid.c
@@ -98,7 +98,7 @@ static uint32_t IceEM410xdemod(void) {
 
     int type = Em410xDecode(dest, &size, &idx, &hi, &lo);
     // Did we find a Short EM or a Long EM?
-    if ((type & (0x1 | 0x2)) == 0) {
+    if ((type < 0) || ((type & (0x1 | 0x2)) == 0)) {
         BigBuf_free();
         return PM3_ESOFT;
     }
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index e9be77169..8e776b88c 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1477,50 +1477,52 @@ int lf_em410x_watch(int findone, uint32_t *high, uint64_t *low) {
         WDT_HIT();
 
         int type = Em410xDecode(dest, &size, &idx, &hi, &lo);
-        if (type & 0x1) {
-            Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d )",
-                     (uint32_t)(lo >> 32),
-                     (uint32_t)lo,
-                     (uint32_t)(lo & 0xFFFF),
-                     (uint32_t)((lo >> 16LL) & 0xFF),
-                     (uint32_t)(lo & 0xFFFFFF));
-        }
-        if (type & 0x2) {
-            Dbprintf("EM XL TAG ID: " _GREEN_("%06x%08x%08x") " - ( %05d_%03d_%08d )",
-                     hi,
-                     (uint32_t)(lo >> 32),
-                     (uint32_t)lo,
-                     (uint32_t)(lo & 0xFFFF),
-                     (uint32_t)((lo >> 16LL) & 0xFF),
-                     (uint32_t)(lo & 0xFFFFFF));
-        }
-        if (type & 0x4) {
-            uint64_t data = (lo << 20) >> 20;
-            // Convert back to Short ID
-            uint64_t id = ((uint64_t)hi << 16) | (lo >> 48);
-            if ((data & 0xFFFFFFFF) == 0) {
-                Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d ) Electra "_GREEN_("%i"),
-                         (uint32_t)(id >> 32),
-                         (uint32_t)id,
-                         (uint32_t)(id & 0xFFFF),
-                         (uint32_t)((id >> 16LL) & 0xFF),
-                         (uint32_t)(id & 0xFFFFFF),
-                         (uint32_t)(data >> 32));
-            } else {
-                Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d ) on 128b frame with data "_GREEN_("%03x%08x"),
-                         (uint32_t)(id >> 32),
-                         (uint32_t)id,
-                         (uint32_t)(id & 0xFFFF),
-                         (uint32_t)((id >> 16LL) & 0xFF),
-                         (uint32_t)(id & 0xFFFFFF),
-                         (uint32_t)(data >> 32),
-                         (uint32_t)data);
+        if (type > 0) {
+            if (type & 0x1) {
+                Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d )",
+                        (uint32_t)(lo >> 32),
+                        (uint32_t)lo,
+                        (uint32_t)(lo & 0xFFFF),
+                        (uint32_t)((lo >> 16LL) & 0xFF),
+                        (uint32_t)(lo & 0xFFFFFF));
+            }
+            if (type & 0x2) {
+                Dbprintf("EM XL TAG ID: " _GREEN_("%06x%08x%08x") " - ( %05d_%03d_%08d )",
+                        hi,
+                        (uint32_t)(lo >> 32),
+                        (uint32_t)lo,
+                        (uint32_t)(lo & 0xFFFF),
+                        (uint32_t)((lo >> 16LL) & 0xFF),
+                        (uint32_t)(lo & 0xFFFFFF));
+            }
+            if (type & 0x4) {
+                uint64_t data = (lo << 20) >> 20;
+                // Convert back to Short ID
+                uint64_t id = ((uint64_t)hi << 16) | (lo >> 48);
+                if ((data & 0xFFFFFFFF) == 0) {
+                    Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d ) Electra "_GREEN_("%i"),
+                            (uint32_t)(id >> 32),
+                            (uint32_t)id,
+                            (uint32_t)(id & 0xFFFF),
+                            (uint32_t)((id >> 16LL) & 0xFF),
+                            (uint32_t)(id & 0xFFFFFF),
+                            (uint32_t)(data >> 32));
+                } else {
+                    Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d ) on 128b frame with data "_GREEN_("%03x%08x"),
+                            (uint32_t)(id >> 32),
+                            (uint32_t)id,
+                            (uint32_t)(id & 0xFFFF),
+                            (uint32_t)((id >> 16LL) & 0xFF),
+                            (uint32_t)(id & 0xFFFFFF),
+                            (uint32_t)(data >> 32),
+                            (uint32_t)data);
+                }
+            }
+            if (findone) {
+                *high = hi;
+                *low = lo;
+                break;
             }
-        }
-        if ((type > 0) && findone) {
-            *high = hi;
-            *low = lo;
-            break;
         }
         hi = lo = size = idx = 0;
         clk = invert = 0;