From 8c89b35f1e6a811247d0261d20ce3e5eca13d804 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 18 Apr 2019 21:41:48 +0200 Subject: [PATCH] style --- armsrc/appmain.c | 4 ++-- armsrc/iclass.c | 36 ++++++++++++++++++------------------ client/comms.c | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 704e95dd8..d453fe01e 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -634,13 +634,13 @@ void ListenReaderField(int limit) { } static void PacketReceived(PacketCommandNG *packet) { -/* + /* if (packet->ng) { Dbprintf("received NG frame with %d bytes payload, with command: 0x%04x", packet->length, cmd); } 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]); } -*/ + */ switch (packet->cmd) { #ifdef WITH_LF diff --git a/armsrc/iclass.c b/armsrc/iclass.c index bafa1593a..9e8dfd653 100644 --- a/armsrc/iclass.c +++ b/armsrc/iclass.c @@ -2181,12 +2181,12 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) { if (stored_data_length + 8 > USB_CMD_DATA_SIZE) { //Time to send this off and start afresh reply_old(CMD_ACK, - stored_data_length,//data length - failedRead,//Failed blocks? - 0,//Not used ATM - card_data, - stored_data_length - ); + stored_data_length,//data length + failedRead,//Failed blocks? + 0,//Not used ATM + card_data, + stored_data_length + ); //reset stored_data_length = 0; failedRead = 0; @@ -2201,24 +2201,24 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac) { //Send off any remaining data if (stored_data_length > 0) { reply_old(CMD_ACK, - stored_data_length,//data length - failedRead,//Failed blocks? - 0,//Not used ATM - card_data, - stored_data_length - ); + stored_data_length,//data length + failedRead,//Failed blocks? + 0,//Not used ATM + card_data, + stored_data_length + ); } //If we got here, let's break break; } //Signal end of transmission reply_old(CMD_ACK, - 0,//data length - 0,//Failed blocks? - 0,//Not used ATM - card_data, - 0 - ); + 0,//data length + 0,//Failed blocks? + 0,//Not used ATM + card_data, + 0 + ); switch_off(); } diff --git a/client/comms.c b/client/comms.c index 536b3af14..7b20307d9 100644 --- a/client/comms.c +++ b/client/comms.c @@ -125,7 +125,7 @@ void SendCommandNG(uint16_t cmd, uint8_t *data, size_t len) { txBufferNG.pre.length = len; txBufferNG.pre.cmd = cmd; memcpy(&txBufferNG.data, data, len); - + if ((send_via_fpc && send_with_crc_on_fpc) || ((!send_via_fpc) && send_with_crc_on_usb)) { uint8_t first, second; compute_crc(CRC_14443_A, (uint8_t *)&txBufferNG, sizeof(PacketCommandNGPreamble) + len, &first, &second);