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

refactor: cleanup PacketResponseNG init

Browse source
This commit is contained in:
douniwan5788 2024-09-24 01:42:57 +08:00
commit ef0bae7bc6
4 changed files with 11 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/src/cmdhfmfhard.c
View file

@ -1565,18 +1565,8 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
FILE *fnonces = NULL;
// init to ZERO
PacketResponseNG resp = {
.cmd = 0,
.length = 0,
.magic = 0,
.status = 0,
.crc = 0,
.ng = false,
};
resp.oldarg[0] = 0;
resp.oldarg[1] = 0;
resp.oldarg[2] = 0;
memset(resp.data.asBytes, 0, PM3_CMD_DATA_SIZE);
PacketResponseNG resp;
memset(&resp, 0, sizeof(resp));
uint8_t write_buf[9];
char progress_text[80];

13
client/src/cmdlf.c
View file

@ -426,18 +426,9 @@ int CmdLFCommandRead(const char *Cmd) {
clearCommandBuffer();
SendCommandNG(CMD_LF_MOD_THEN_ACQ_RAW_ADC, (uint8_t *)&payload, PAYLOAD_HEADER_SIZE + cmd_len + 1);
PacketResponseNG resp;
// init to ZERO
resp.cmd = 0,
resp.length = 0,
resp.magic = 0,
resp.status = 0,
resp.crc = 0,
resp.ng = false,
resp.oldarg[0] = 0;
resp.oldarg[1] = 0;
resp.oldarg[2] = 0;
memset(resp.data.asBytes, 0, PM3_CMD_DATA_SIZE);
PacketResponseNG resp;
memset(&resp, 0, sizeof(resp));
i = 10;
// 20sec wait loop

13
client/src/cmdlfem4x50.c
View file

@ -1259,18 +1259,9 @@ static int CmdEM4x50Sim(const char *Cmd) {
PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or " _GREEN_("<Enter>") " to abort simulation");
PacketResponseNG resp;
// init to ZERO
resp.cmd = 0,
resp.length = 0,
resp.magic = 0,
resp.status = 0,
resp.crc = 0,
resp.ng = false,
resp.oldarg[0] = 0;
resp.oldarg[1] = 0;
resp.oldarg[2] = 0;
memset(resp.data.asBytes, 0, PM3_CMD_DATA_SIZE);
PacketResponseNG resp;
memset(&resp, 0, sizeof(resp));
bool keypress;
do {

28
client/src/comms.c
View file

@ -1030,18 +1030,9 @@ size_t WaitForRawDataTimeout(uint8_t *buffer, size_t len, size_t ms_timeout, boo
*/
bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms_timeout, bool show_warning) {
PacketResponseNG resp;
// init to ZERO
resp.cmd = 0,
resp.length = 0,
resp.magic = 0,
resp.status = 0,
resp.crc = 0,
resp.ng = false,
resp.oldarg[0] = 0;
resp.oldarg[1] = 0;
resp.oldarg[2] = 0;
memset(resp.data.asBytes, 0, PM3_CMD_DATA_SIZE);
PacketResponseNG resp;
memset(&resp, 0, sizeof(resp));
if (response == NULL) {
response = &resp;
@ -1118,23 +1109,14 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
if (dest == NULL) return false;
// init to ZERO
PacketResponseNG resp;
memset(&resp, 0, sizeof(resp));
if (response == NULL) {
response = &resp;
}
// init to ZERO
resp.cmd = 0,
resp.length = 0,
resp.magic = 0,
resp.status = 0,
resp.crc = 0,
resp.ng = false,
resp.oldarg[0] = 0;
resp.oldarg[1] = 0;
resp.oldarg[2] = 0;
memset(resp.data.asBytes, 0, PM3_CMD_DATA_SIZE);
if (bytes == 0) return true;