UltralightCard fixes - byte order of ATQA, number of blocks in Ultral…

…ightEV1 (dotnet#2022) Co-authored-by: John D. Bruner <[email protected]>
fredatgithub · Jan 25, 2023 · 5d07526 · 5d07526
1 parent 3394f8e
commit 5d07526
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/devices/Card/Ultralight/UltralightCard.cs b/src/devices/Card/Ultralight/UltralightCard.cs
@@ -76,7 +76,7 @@ public class UltralightCard
         /// <param name="ATQA">The ATQA</param>
         /// <param name="SAK">The SAK</param>
         /// <returns>True if this is an Ultralight</returns>
-        public static bool IsUltralightCard(ushort ATQA, byte SAK) => (ATQA == 0x4400) && (SAK == 0);
+        public static bool IsUltralightCard(ushort ATQA, byte SAK) => (ATQA == 0x0044) && (SAK == 0);
 
         /// <summary>
         /// Constructor for Ultralight
@@ -435,18 +435,17 @@ public bool IsPageReadOnly(byte page)
         /// </summary>
         public int NumberBlocks => UltralightCardType switch
         {
-            // Whenever NdefCapacity + 9 is used, then it's a guess
             UltralightCardType.UltralightNtag210 => 16,
             UltralightCardType.UltralightNtag212 => 45,
             UltralightCardType.UltralightNtag213 => 45,
             UltralightCardType.UltralightNtag213F => 45,
             UltralightCardType.UltralightNtag215 => 135,
             UltralightCardType.UltralightNtag216 => 231,
             UltralightCardType.UltralightNtag216F => 231,
-            UltralightCardType.UltralightEV1MF0UL1101 => 41,
-            UltralightCardType.UltralightEV1MF0ULH1101 => 41,
-            UltralightCardType.UltralightEV1MF0UL2101 => NdefCapacity + 9,
-            UltralightCardType.UltralightEV1MF0ULH2101 => NdefCapacity + 9,
+            UltralightCardType.UltralightEV1MF0UL1101 => 20,
+            UltralightCardType.UltralightEV1MF0ULH1101 => 20,
+            UltralightCardType.UltralightEV1MF0UL2101 => 41,
+            UltralightCardType.UltralightEV1MF0ULH2101 => 41,
             UltralightCardType.UltralightNtagI2cNT3H1101 => 231,
             UltralightCardType.UltralightNtagI2cNT3H1101W0 => 231,
             UltralightCardType.UltralightNtagI2cNT3H2111W0 => 476 + 9,