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

style

Browse source
This commit is contained in:
Philippe Teuwen 2019-04-18 21:41:48 +02:00
commit 8c89b35f1e
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/appmain.c
View file

@ -634,13 +634,13 @@ void ListenReaderField(int limit) {
} }
static void PacketReceived(PacketCommandNG *packet) { static void PacketReceived(PacketCommandNG *packet) {
/* /*
if (packet->ng) { if (packet->ng) {
Dbprintf("received NG frame with %d bytes payload, with command: 0x%04x", packet->length, cmd); Dbprintf("received NG frame with %d bytes payload, with command: 0x%04x", packet->length, cmd);
} else { } else {
Dbprintf("received OLD frame of %d bytes, with command: 0x%04x and args: %d %d %d", packet->length, packet->cmd, packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]); Dbprintf("received OLD frame of %d bytes, with command: 0x%04x and args: %d %d %d", packet->length, packet->cmd, packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
} }
*/ */
switch (packet->cmd) { switch (packet->cmd) {
#ifdef WITH_LF #ifdef WITH_LF

36
armsrc/iclass.c
View file

@ -2181,12 +2181,12 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
if (stored_data_length + 8 > USB_CMD_DATA_SIZE) { if (stored_data_length + 8 > USB_CMD_DATA_SIZE) {
//Time to send this off and start afresh //Time to send this off and start afresh
reply_old(CMD_ACK, reply_old(CMD_ACK,
stored_data_length,//data length stored_data_length,//data length
failedRead,//Failed blocks? failedRead,//Failed blocks?
0,//Not used ATM 0,//Not used ATM
card_data, card_data,
stored_data_length stored_data_length
); );
//reset //reset
stored_data_length = 0; stored_data_length = 0;
failedRead = 0; failedRead = 0;
@ -2201,24 +2201,24 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) {
//Send off any remaining data //Send off any remaining data
if (stored_data_length > 0) { if (stored_data_length > 0) {
reply_old(CMD_ACK, reply_old(CMD_ACK,
stored_data_length,//data length stored_data_length,//data length
failedRead,//Failed blocks? failedRead,//Failed blocks?
0,//Not used ATM 0,//Not used ATM
card_data, card_data,
stored_data_length stored_data_length
); );
} }
//If we got here, let's break //If we got here, let's break
break; break;
} }
//Signal end of transmission //Signal end of transmission
reply_old(CMD_ACK, reply_old(CMD_ACK,
0,//data length 0,//data length
0,//Failed blocks? 0,//Failed blocks?
0,//Not used ATM 0,//Not used ATM
card_data, card_data,
0 0
); );
switch_off(); switch_off();
} }

2
client/comms.c
View file

@ -125,7 +125,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) {
txBufferNG.pre.length = len; txBufferNG.pre.length = len;
txBufferNG.pre.cmd = cmd; txBufferNG.pre.cmd = cmd;
memcpy(&txBufferNG.data, data, len); memcpy(&txBufferNG.data, data, len);
if ((send_via_fpc && send_with_crc_on_fpc) || ((!send_via_fpc) && send_with_crc_on_usb)) { if ((send_via_fpc && send_with_crc_on_fpc) || ((!send_via_fpc) && send_with_crc_on_usb)) {
uint8_t first, second; uint8_t first, second;
compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second); compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);