Merge pull request #943 from dgorbunov/patch-1

[proxmark3-svn] / client / hidcardformats.h

diff --git a/client/hidcardformats.h b/client/hidcardformats.h
index 8ff887f7af7fe1f28a24b3d36a299040b4a97f8c..3019b823de4c4187f511f61ff0840227528a057b 100644 (file)
--- a/client/hidcardformats.h
+++ b/client/hidcardformats.h
@@ -15,18 +15,28 @@
 #include <stdbool.h>
 #include "hidcardformatutils.h"
 
 #include <stdbool.h>
 #include "hidcardformatutils.h"
 

+
+typedef struct hidcardformatdescriptor_s{
+  bool hasCardNumber;
+  bool hasFacilityCode;
+  bool hasIssueLevel;
+  bool hasOEMCode;
+  bool hasParity;
+} hidcardformatdescriptor_t;
+

 // Structure for defined HID card formats available for packing/unpacking
 typedef struct hidcardformat_s{
   const char* Name;
   bool (*Pack)(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed);
   bool (*Unpack)(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card);
   const char* Descrp;
 // Structure for defined HID card formats available for packing/unpacking
 typedef struct hidcardformat_s{
   const char* Name;
   bool (*Pack)(/*in*/hidproxcard_t* card, /*out*/hidproxmessage_t* packed);
   bool (*Unpack)(/*in*/hidproxmessage_t* packed, /*out*/hidproxcard_t* card);
   const char* Descrp;

+  hidcardformatdescriptor_t Fields;

 } hidcardformat_t;
 
 void HIDListFormats();
 int HIDFindCardFormat(const char *format);
 hidcardformat_t HIDGetCardFormat(int idx);
 bool HIDPack(/* in */int FormatIndex, /* in */hidproxcard_t* card, /* out */hidproxmessage_t* packed);
 } hidcardformat_t;
 
 void HIDListFormats();
 int HIDFindCardFormat(const char *format);
 hidcardformat_t HIDGetCardFormat(int idx);
 bool HIDPack(/* in */int FormatIndex, /* in */hidproxcard_t* card, /* out */hidproxmessage_t* packed);

-bool HIDTryUnpack(/* in */hidproxmessage_t* packed);
+bool HIDTryUnpack(/* in */hidproxmessage_t* packed, /* in */bool ignoreParity);

 
 #endif
 
 #endif