mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 05:13:46 -07:00
style
This commit is contained in:
parent
49f7ae57dc
commit
e22776a7e0
8 changed files with 48 additions and 48 deletions
|
@ -1212,7 +1212,7 @@ static int CmdHF15ELoad(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16_t bytestosend = MIN(chuncksize, bytes_read);
|
uint16_t bytestosend = MIN(chuncksize, bytes_read);
|
||||||
if (hf15EmlSetMem((uint8_t*)tag + offset, bytestosend, offset) != PM3_SUCCESS) {
|
if (hf15EmlSetMem((uint8_t *)tag + offset, bytestosend, offset) != PM3_SUCCESS) {
|
||||||
PrintAndLogEx(FAILED, "Can't set emulator memory at offest: %zu / 0x%zx", offset, offset);
|
PrintAndLogEx(FAILED, "Can't set emulator memory at offest: %zu / 0x%zx", offset, offset);
|
||||||
free(tag);
|
free(tag);
|
||||||
return PM3_ESOFT;
|
return PM3_ESOFT;
|
||||||
|
|
|
@ -8447,7 +8447,7 @@ static int CmdHF14AGen4ChangePwd(const char *Cmd) {
|
||||||
static void parse_gdm_cfg(const uint8_t *d) {
|
static void parse_gdm_cfg(const uint8_t *d) {
|
||||||
PrintAndLogEx(SUCCESS, "Config... " _YELLOW_("%s"), sprint_hex(d, MFBLOCK_SIZE));
|
PrintAndLogEx(SUCCESS, "Config... " _YELLOW_("%s"), sprint_hex(d, MFBLOCK_SIZE));
|
||||||
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X %02X") " .......................................... %s %s", d[0], d[1], (d[0] == 0x85 && d[1] == 0x00) ? "Magic wakeup disabled" : _GREEN_("Magic wakeup enabled"), (d[0] == 0x85 && d[1] == 0x00) ? "" : ((d[0] == 0x7A && d[1] == 0xFF) ? _GREEN_("with GDM config block access") : _RED_("without GDM config block access")));
|
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X %02X") " .......................................... %s %s", d[0], d[1], (d[0] == 0x85 && d[1] == 0x00) ? "Magic wakeup disabled" : _GREEN_("Magic wakeup enabled"), (d[0] == 0x85 && d[1] == 0x00) ? "" : ((d[0] == 0x7A && d[1] == 0xFF) ? _GREEN_("with GDM config block access") : _RED_("without GDM config block access")));
|
||||||
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X") " ....................................... Magic wakeup style %s", d[2], ((d[2] == 0x85) ? "GDM 20(7)/23": "Gen1a 40(7)/43"));
|
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X") " ....................................... Magic wakeup style %s", d[2], ((d[2] == 0x85) ? "GDM 20(7)/23" : "Gen1a 40(7)/43"));
|
||||||
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X %02X %02X") " .............................. Unknown", d[3], d[4], d[5]);
|
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X %02X %02X") " .............................. Unknown", d[3], d[4], d[5]);
|
||||||
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X") " ........................... %s", d[6], (d[6] == 0x5A) ? "Key B use blocked when readable by ACL" : "Key B use allowed when readable by ACL");
|
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X") " ........................... %s", d[6], (d[6] == 0x5A) ? "Key B use blocked when readable by ACL" : "Key B use allowed when readable by ACL");
|
||||||
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X") " ........................ %s", d[7], (d[7] == 0x5A) ? _GREEN_("Block 0 Direct Write Enabled (CUID)") : "Block 0 Direct Write Disabled (CUID)");
|
PrintAndLogEx(SUCCESS, " " _YELLOW_("%02X") " ........................ %s", d[7], (d[7] == 0x5A) ? _GREEN_("Block 0 Direct Write Enabled (CUID)") : "Block 0 Direct Write Disabled (CUID)");
|
||||||
|
|
|
@ -80,7 +80,7 @@ static const int Iso15693FrameSOF[] = {
|
||||||
-1, -1, -1, -1,
|
-1, -1, -1, -1,
|
||||||
1, 1, 1, 1,
|
1, 1, 1, 1,
|
||||||
1, 1, 1, 1
|
1, 1, 1, 1
|
||||||
};
|
};
|
||||||
static const int Iso15693Logic0[] = {
|
static const int Iso15693Logic0[] = {
|
||||||
1, 1, 1, 1,
|
1, 1, 1, 1,
|
||||||
1, 1, 1, 1,
|
1, 1, 1, 1,
|
||||||
|
@ -92,7 +92,7 @@ static const int Iso15693Logic1[] = {
|
||||||
-1, -1, -1, -1,
|
-1, -1, -1, -1,
|
||||||
1, 1, 1, 1,
|
1, 1, 1, 1,
|
||||||
1, 1, 1, 1
|
1, 1, 1, 1
|
||||||
};
|
};
|
||||||
|
|
||||||
// EOF defined as
|
// EOF defined as
|
||||||
// 1) logic '0' (8 pulses of 423.75kHz followed by unmodulated for 18.88us)
|
// 1) logic '0' (8 pulses of 423.75kHz followed by unmodulated for 18.88us)
|
||||||
|
|
|
@ -280,7 +280,7 @@ typedef struct {
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
// 64KB SRAM -> 524288 bits(max sample num) < 2^30
|
// 64KB SRAM -> 524288 bits(max sample num) < 2^30
|
||||||
uint32_t samples :
|
uint32_t samples :
|
||||||
LF_SAMPLES_BITS;
|
LF_SAMPLES_BITS;
|
||||||
bool realtime : 1;
|
bool realtime : 1;
|
||||||
bool verbose : 1;
|
bool verbose : 1;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue