fix compiler warning on arm-none-eabi 11.1.0

This commit is contained in:
iceman1001 2021-05-13 13:28:03 +02:00
parent 19a2ce4cb3
commit 3b7153045f
2 changed files with 24 additions and 17 deletions

View file

@ -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;

View file

@ -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