Bugfixes for LF FDX

[proxmark3-svn] / client / cmdlfhid.h

diff --git a/client/cmdlfhid.h b/client/cmdlfhid.h
index e53a95c67de058d0cd57c703ee7820ca3a7f555d..353805db779496407b8e0124b6fed94062d8c7fd 100644 (file)
--- a/client/cmdlfhid.h
+++ b/client/cmdlfhid.h
@@ -14,36 +14,14 @@
 #include <stdint.h>
 #include <stdbool.h>
 
 #include <stdint.h>
 #include <stdbool.h>
 

-// Structure for unpacked "short" (<38 bits) HID Prox tags.
-typedef struct {
-  // Format length, in bits.
-  uint8_t fmtLen;
-
-  // Facility code.
-  uint32_t fc;
-
-  // Card number.
-  uint32_t cardnum;
-
-  // Parity validity.
-  //
-  // When used with pack_short_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
-  // values for the ID.
-  bool parityValid;
-} short_hid_info;
-
-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);
 int CmdHIDReadDemod(const char *Cmd);
 int CmdHIDSim(const char *Cmd);
 int CmdHIDClone(const char *Cmd);
 int CmdLFHID(const char *Cmd);
 int CmdFSKdemodHID(const char *Cmd);
 int CmdHIDReadDemod(const char *Cmd);
 int CmdHIDSim(const char *Cmd);
 int CmdHIDClone(const char *Cmd);

-int CmdHIDPack(const char *Cmd);
-int CmdHIDUnpack(const char *Cmd);
-
+int CmdHIDDecode(const char *Cmd);
+int CmdHIDEncode(const char *Cmd);
+int CmdHIDWrite(const char *Cmd);
+// This is used by the Paradox code
+int hid_hexstring_to_int96(/* out */ uint32_t* hi2,/* out */ uint32_t* hi, /* out */ uint32_t* lo, const char* str);

 #endif
 #endif