From 4b7ac3edd7f078123ecf7e15459b9fb351ecee25 Mon Sep 17 00:00:00 2001 From: Benjamin Vernoux Date: Wed, 12 Jun 2024 02:49:47 +0200 Subject: [PATCH] Fix hex2dfu.c build issue with Ubuntu 20.04 LTS --- src/build-scripts/hex2dfu.c | 13 ++++++++----- src/build-scripts/hex2dfu.exe | Bin 460279 -> 460279 bytes 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/build-scripts/hex2dfu.c b/src/build-scripts/hex2dfu.c index ecc73dd..5f922f5 100644 --- a/src/build-scripts/hex2dfu.c +++ b/src/build-scripts/hex2dfu.c @@ -7,6 +7,7 @@ #include #include #include +#include #define ED25519_SUPPORT 0 @@ -75,13 +76,15 @@ int main (int argc, char **argv) { targen_number = strtol(optarg, NULL, 16); break; case 'r': // Target Revision format "xx.yy" - uint16_t revision_number_MSB, revision_number_LSB; - if (sscanf(optarg, "%hx.%hx", &revision_number_MSB, &revision_number_LSB) != 2) { - fprintf(stderr, "Invalid revision format: %s\n", optarg); - exit(EXIT_FAILURE); // or return an error code - } + { + uint16_t revision_number_MSB, revision_number_LSB; + if (sscanf(optarg, "%hx.%hx", &revision_number_MSB, &revision_number_LSB) != 2) { + fprintf(stderr, "Invalid revision format: %s\n", optarg); + exit(EXIT_FAILURE); // or return an error code + } ver = (int)(revision_number_MSB << 8 | revision_number_LSB);; break; + } case 'd': //device version ver = strtol (optarg, NULL, 16); break; diff --git a/src/build-scripts/hex2dfu.exe b/src/build-scripts/hex2dfu.exe index e89e3b1f571ccb3072ce204ffe0bb1bdb1264803..bd37ce9b886be9b1b4d4040df4fa858309fa20d3 100644 GIT binary patch delta 42 zcmV+_0M-BZiyZfh9FT|titv$&P6FbRf!c-I0fpKEh1vs!+60B#1%=uMwb}