github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

-p refs - unify param

Browse source
This commit is contained in:
iceman1001 2020-10-01 00:26:18 +02:00
commit 46e6ba5ded
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/cmdhf14b.c
View file

@ -926,10 +926,10 @@ static int CmdHF14BReadSri(const char *Cmd) {
static int CmdHF14BWriteSri(const char *Cmd) { static int CmdHF14BWriteSri(const char *Cmd) {
/* /*
* For SRIX4K blocks 00 - 7F * For SRIX4K blocks 00 - 7F
* hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata * hf 14b raw -c -k 09 $srix4kwblock $srix4kwdata
* *
* For SR512 blocks 00 - 0F * For SR512 blocks 00 - 0F
* hf 14b raw -c -p 09 $sr512wblock $sr512wdata * hf 14b raw -c -k 09 $sr512wblock $sr512wdata
* *
* Special block FF = otp_lock_reg block. * Special block FF = otp_lock_reg block.
* Data len 4 bytes- * Data len 4 bytes-

12
client/src/cmdhffelica.c
View file

@ -84,11 +84,11 @@ static int usage_hf_felica_dumplite(void) {
} }
static int usage_hf_felica_raw(void) { static int usage_hf_felica_raw(void) {
PrintAndLogEx(NORMAL, "Usage: hf felica raw [-h] [-r] [-c] [-p] [-a] <0A 0B 0C ... hex>"); PrintAndLogEx(NORMAL, "Usage: hf felica raw [-h] [-r] [-c] [-k] [-a] <0A 0B 0C ... hex>");
PrintAndLogEx(NORMAL, " -h this help"); PrintAndLogEx(NORMAL, " -h this help");
PrintAndLogEx(NORMAL, " -r do not read response"); PrintAndLogEx(NORMAL, " -r do not read response");
PrintAndLogEx(NORMAL, " -c calculate and append CRC"); PrintAndLogEx(NORMAL, " -c calculate and append CRC");
PrintAndLogEx(NORMAL, " -p leave the signal field ON after receive"); PrintAndLogEx(NORMAL, " -k keep signal field ON after receive");
PrintAndLogEx(NORMAL, " -a active signal field ON without select"); PrintAndLogEx(NORMAL, " -a active signal field ON without select");
PrintAndLogEx(NORMAL, " -s active signal field ON with select"); PrintAndLogEx(NORMAL, " -s active signal field ON with select");
return PM3_SUCCESS; return PM3_SUCCESS;
@ -1687,7 +1687,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
static int CmdHFFelicaCmdRaw(const char *Cmd) { static int CmdHFFelicaCmdRaw(const char *Cmd) {
bool reply = 1; bool reply = 1;
bool crc = false; bool crc = false;
bool power = false; bool keep_field_on = false;
bool active = false; bool active = false;
bool active_select = false; bool active_select = false;
uint16_t numbits = 0; uint16_t numbits = 0;
@ -1714,8 +1714,8 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
case 'c': case 'c':
crc = true; crc = true;
break; break;
case 'p': case 'k':
power = true; keep_field_on = true;
break; break;
case 'a': case 'a':
active = true; active = true;
@ -1771,7 +1771,7 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
flags |= FELICA_NO_SELECT; flags |= FELICA_NO_SELECT;
} }
if (power) { if (keep_field_on) {
flags |= FELICA_NO_DISCONNECT; flags |= FELICA_NO_DISCONNECT;
} }