From 3b7153045ff61ff17676e1e7396a9b03fc9bf69d Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 13 May 2021 13:28:03 +0200 Subject: [PATCH] fix compiler warning on arm-none-eabi 11.1.0 --- armsrc/lfops.c | 39 +++++++++++++++++++++++---------------- armsrc/optimized_ikeys.h | 2 +- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/armsrc/lfops.c b/armsrc/lfops.c index c4ee39948..12ef076b2 100644 --- a/armsrc/lfops.c +++ b/armsrc/lfops.c @@ -227,40 +227,47 @@ void printT55xxConfig(void) { break; } - if (T55xx_Timing.m[i].start_gap != 0xFFFF) + if (T55xx_Timing.m[i].start_gap != 0xFFFF) { sprintf(s + strlen(s), " %3d | ", T55xx_Timing.m[i].start_gap / 8); - else + } else { PRN_NA; + } - if (T55xx_Timing.m[i].write_gap != 0xFFFF) + if (T55xx_Timing.m[i].write_gap != 0xFFFF) { sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_gap / 8); - else + } else { PRN_NA; + } - if (T55xx_Timing.m[i].write_0 != 0xFFFF) + if (T55xx_Timing.m[i].write_0 != 0xFFFF) { sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_0 / 8); - else + } else { PRN_NA; + } - if (T55xx_Timing.m[i].write_1 != 0xFFFF) + if (T55xx_Timing.m[i].write_1 != 0xFFFF) { sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_1 / 8); - else + } else { PRN_NA; + } - if (T55xx_Timing.m[i].read_gap != 0xFFFF) + if (T55xx_Timing.m[i].read_gap != 0xFFFF) { sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].read_gap / 8); - else + } else { PRN_NA; + } - if (T55xx_Timing.m[i].write_2 != 0xFFFF && i == T55XX_DLMODE_1OF4) + if (T55xx_Timing.m[i].write_2 != 0xFFFF && i == T55XX_DLMODE_1OF4) { sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_2 / 8); - else + } else { PRN_NA + } - if (T55xx_Timing.m[i].write_3 != 0xFFFF && i == T55XX_DLMODE_1OF4) - sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_3 / 8); - else - PRN_NA; + if (T55xx_Timing.m[i].write_3 != 0xFFFF && i == T55XX_DLMODE_1OF4) { + sprintf(s + strlen(s), "%3d | ", T55xx_Timing.m[i].write_3 / 8); + } else { + PRN_NA; + } // remove last space s[strlen(s)] = 0; diff --git a/armsrc/optimized_ikeys.h b/armsrc/optimized_ikeys.h index 0915482e3..ae02911cc 100644 --- a/armsrc/optimized_ikeys.h +++ b/armsrc/optimized_ikeys.h @@ -59,7 +59,7 @@ void hash0(uint64_t c, uint8_t k[8]); * @param div_key */ -void diversifyKey(uint8_t *csn, *uint8_t key, uint8_t *div_key); +void diversifyKey(uint8_t *csn, uint8_t *key, uint8_t *div_key); /** * @brief Permutes a key from standard NIST format to Iclass specific format * @param key