Merge remote-tracking branch 'upstream/master'

This commit is contained in:
marshmellow42 2016-11-29 15:09:27 -05:00
commit 0b91ce03e5
32 changed files with 4484 additions and 76 deletions

View file

@ -229,6 +229,11 @@ typedef struct{
#define FLAG_ICLASS_READER_CEDITKEY 0x40
//hw tune args
#define FLAG_TUNE_LF 1
#define FLAG_TUNE_HF 2
#define FLAG_TUNE_ALL 3
// CMD_DEVICE_INFO response packet has flags in arg[0], flag definitions:
/* Whether a bootloader that understands the common_area is present */