github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-31 03:50:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

style

Browse source
This commit is contained in:
iceman1001 2019-12-22 12:51:40 +01:00
parent 88f4de3ef9
commit ea5680dba8
5 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/cmddata.c
View file

@ -1925,10 +1925,10 @@ int CmdSave(const char *Cmd) {
if (errors || cmdp == 0) return usage_data_save(); if (errors || cmdp == 0) return usage_data_save();
if ( as_wave ) if (as_wave)
return saveFileWAVE(filename, GraphBuffer, GraphTraceLen); return saveFileWAVE(filename, GraphBuffer, GraphTraceLen);
else else
return saveFilePM3(filename, GraphBuffer, GraphTraceLen); return saveFilePM3(filename, GraphBuffer, GraphTraceLen);
} }
static int CmdScale(const char *Cmd) { static int CmdScale(const char *Cmd) {

50
client/cmdhflto.c
View file

@ -44,7 +44,7 @@ static void lto_switch_on_field(void) {
// send a raw LTO-CM command, returns the length of the response (0 in case of error) // send a raw LTO-CM command, returns the length of the response (0 in case of error)
static int lto_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response, uint16_t *response_len, bool verbose) { static int lto_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response, uint16_t *response_len, bool verbose) {
SendCommandOLD(CMD_HF_ISO14443A_READER, ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, len, 0, cmd, len); SendCommandOLD(CMD_HF_ISO14443A_READER, ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, len, 0, cmd, len);
PacketResponseNG resp; PacketResponseNG resp;
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
@ -71,7 +71,7 @@ static int lto_send_cmd_raw(uint8_t *cmd, uint8_t len, uint8_t *response, uint16
static int topaz_select(uint8_t *id_response, uint8_t id_len, bool verbose) { static int topaz_select(uint8_t *id_response, uint8_t id_len, bool verbose) {
// Todo: implement anticollision // Todo: implement anticollision
uint8_t resp[] = {0,0}; uint8_t resp[] = {0, 0};
uint16_t resp_len; uint16_t resp_len;
uint8_t wupa_cmd[] = {LTO_REQ_STANDARD}; uint8_t wupa_cmd[] = {LTO_REQ_STANDARD};
uint8_t select_cmd[] = {LTO_SELECT, 0x20}; uint8_t select_cmd[] = {LTO_SELECT, 0x20};
@ -139,34 +139,34 @@ int infoLTO(bool verbose) {
topaz_select(serial_number, serial_len, verbose); topaz_select(serial_number, serial_len, verbose);
lto_switch_off_field(); lto_switch_off_field();
/* /*
-- "hf 14a raw -a -p -b 7 45" -- "hf 14a raw -a -p -b 7 45"
-- "hf 14a raw -c -p 9320" -- "hf 14a raw -c -p 9320"
-- "hf 14a raw -c -p 9370%s", serial_number -- "hf 14a raw -c -p 9370%s", serial_number
-- "disconnect" -- "disconnect"
SendCommandNG(CMD_HF_THINFILM_READ, NULL, 0); SendCommandNG(CMD_HF_THINFILM_READ, NULL, 0);
PacketResponseNG resp; PacketResponseNG resp;
if (!WaitForResponseTimeout(CMD_HF_THINFILM_READ, &resp, 1500)) { if (!WaitForResponseTimeout(CMD_HF_THINFILM_READ, &resp, 1500)) {
PrintAndLogEx(WARNING, "timeout while waiting for reply."); PrintAndLogEx(WARNING, "timeout while waiting for reply.");
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
}
if (resp.status == PM3_SUCCESS) {
if (resp.length == 16 || resp.length == 32) {
print_barcode(resp.data.asBytes, resp.length, verbose);
} else {
if (verbose)
PrintAndLogEx(WARNING, "Response is wrong length. (%d)", resp.length);
return PM3_ESOFT;
} }
}
return resp.status; if (resp.status == PM3_SUCCESS) {
*/ if (resp.length == 16 || resp.length == 32) {
print_barcode(resp.data.asBytes, resp.length, verbose);
} else {
if (verbose)
PrintAndLogEx(WARNING, "Response is wrong length. (%d)", resp.length);
return PM3_ESOFT;
}
}
return resp.status;
*/
return PM3_SUCCESS; return PM3_SUCCESS;
} }

2
client/fileutils.c
View file

@ -414,7 +414,7 @@ int saveFileWAVE(const char *preferredName, int *data, size_t datalen) {
wave_info.samplerate = 125000; wave_info.samplerate = 125000;
wave_info.channels = 1; wave_info.channels = 1;
wave_info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_U8; wave_info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_U8;
SNDFILE* wave_file = sf_open(fileName, SFM_WRITE, &wave_info); SNDFILE *wave_file = sf_open(fileName, SFM_WRITE, &wave_info);
if (!wave_file) { if (!wave_file) {
PrintAndLogEx(WARNING, "file not found or locked. "_YELLOW_("'%s'"), fileName); PrintAndLogEx(WARNING, "file not found or locked. "_YELLOW_("'%s'"), fileName);