Adding native support for HID long-format

[proxmark3-svn] / client / cmdlfhid.h

diff --git a/client/cmdlfhid.h b/client/cmdlfhid.h
index e53a95c67de058d0cd57c703ee7820ca3a7f555d..463be56f3bbb7fc144d6fe5c1b75546b81e050e3 100644 (file)
--- a/client/cmdlfhid.h
+++ b/client/cmdlfhid.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-// Structure for unpacked "short" (<38 bits) HID Prox tags.
+// Structure for unpacked HID Prox tags.
 typedef struct {
   // Format length, in bits.
   uint8_t fmtLen;
@@ -23,20 +23,21 @@ typedef struct {
   uint32_t fc;
 
   // Card number.
-  uint32_t cardnum;
+  uint64_t cardnum;
 
   // Parity validity.
   //
-  // When used with pack_short_hid, this determines if we should calculate
+  // When used with pack_hid, this determines if we should calculate
   // parity values for the ID.
   //
-  // When used with unpack_short_hid, this indicates if we got valid parity
+  // When used with unpack_hid, this indicates if we got valid parity
   // values for the ID.
   bool parityValid;
-} short_hid_info;
+} hid_info;
+
+bool pack_hid(/* out */ uint32_t *hi2, /* out */ uint32_t *hi, /* out */ uint32_t *lo, /* in */ const hid_info *info);
+bool unpack_hid(hid_info* out, uint32_t hi2, uint32_t hi, uint32_t lo);
 
-bool pack_short_hid(/* out */ uint32_t *hi, /* out */ uint32_t *lo, /* in */ const short_hid_info *info);
-bool unpack_short_hid(short_hid_info* out, uint32_t hi, uint32_t lo);
 
 int CmdLFHID(const char *Cmd);
 int CmdFSKdemodHID(const char *Cmd);