From 0cb07935fcaebe2375bd9e0ab81c5e5a95bc2e92 Mon Sep 17 00:00:00 2001 From: Ilgrim Date: Wed, 8 May 2024 21:53:48 +0200 Subject: [PATCH] Making some modifications for be able to build these tools in OpenBSD --- src/st-flash/flash_opts.c | 12 ++++++------ src/st-info/info.c | 2 +- src/st-util/gdb-server.c | 2 +- src/stlink-lib/chipid.c | 2 +- src/stlink-lib/common.c | 2 +- src/stlink-lib/flash_loader.c | 2 +- src/stlink-lib/map_file.c | 2 +- src/stlink-lib/usb.c | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/st-flash/flash_opts.c b/src/st-flash/flash_opts.c index e2d4154fe..2650d2ecb 100644 --- a/src/st-flash/flash_opts.c +++ b/src/st-flash/flash_opts.c @@ -17,7 +17,7 @@ #include static bool starts_with(const char * str, const char * prefix) { - uint32_t n = strlen(prefix); + uint32_t n = (uint32_t)strlen(prefix); if (strlen(str) < n) { return (false); } @@ -70,7 +70,7 @@ static int32_t get_integer_from_char_array (const char *const str, uint32_t *rea fprintf (stderr, "*** Error: Integer greater than UINT32_MAX, cannot convert to int32_t\n"); return (-1); } else { - *read_value = value; + *read_value = (uint32_t)value; return (0); } } @@ -199,7 +199,7 @@ int32_t flash_get_opts(struct flash_opts* o, int32_t ac, char** av) { if (result != 0) { return (bad_arg ("--flash")); } else { - o->flash_size = (size_t)flash_size; + o->flash_size = (uint32_t)flash_size; } } else if (strcmp(av[0], "--connect-under-reset") == 0) { o->connect = CONNECT_UNDER_RESET; @@ -259,7 +259,7 @@ int32_t flash_get_opts(struct flash_opts* o, int32_t ac, char** av) { if (result != 0) { return bad_arg ("size"); } else { - o->size = (size_t) size; + o->size = (uint32_t) size; } } @@ -283,7 +283,7 @@ int32_t flash_get_opts(struct flash_opts* o, int32_t ac, char** av) { if (result != 0) { return bad_arg ("size"); } else { - o->size = (size_t) size; + o->size = (uint32_t) size; } break; @@ -300,7 +300,7 @@ int32_t flash_get_opts(struct flash_opts* o, int32_t ac, char** av) { if (result != 0) { return bad_arg("option bytes read: invalid size"); } else { - o->size = (size_t) size; + o->size = (uint32_t) size; } } break; diff --git a/src/st-info/info.c b/src/st-info/info.c index ffdf521cc..31deeba45 100644 --- a/src/st-info/info.c +++ b/src/st-info/info.c @@ -55,7 +55,7 @@ static void stlink_probe(enum connect_type connect, int32_t freq) { stlink_t **stdevs; uint32_t size; - size = stlink_probe_usb(&stdevs, connect, freq); + size = (uint32_t)stlink_probe_usb(&stdevs, connect, freq); printf("Found %u stlink programmers\n", size); diff --git a/src/st-util/gdb-server.c b/src/st-util/gdb-server.c index 28e06231a..db743c0fa 100644 --- a/src/st-util/gdb-server.c +++ b/src/st-util/gdb-server.c @@ -1041,7 +1041,7 @@ int32_t serve(stlink_t *sl, st_state_t *st) { params = separator + 1; } - uint32_t hex_len = strlen(params); + uint32_t hex_len = (uint32_t)strlen(params); uint32_t alloc_size = (hex_len / 2) + 1; uint32_t cmd_len; char *cmd = malloc(alloc_size); diff --git a/src/stlink-lib/chipid.c b/src/stlink-lib/chipid.c index c115089a4..4845859ec 100644 --- a/src/stlink-lib/chipid.c +++ b/src/stlink-lib/chipid.c @@ -224,7 +224,7 @@ void init_chipids(char *dir_to_scan) { if (d) { while ((dir = readdir(d)) != NULL) { - nl = strlen(dir->d_name); + nl = (uint32_t)strlen(dir->d_name); if (strcmp(dir->d_name + nl - 5, ".chip") == 0) { char buf[1024]; diff --git a/src/stlink-lib/common.c b/src/stlink-lib/common.c index 3e49a779d..3ce1dd688 100644 --- a/src/stlink-lib/common.c +++ b/src/stlink-lib/common.c @@ -913,7 +913,7 @@ int32_t stlink_parse_ihex(const char *path, uint8_t erased_pattern, uint8_t **me break; } - uint32_t l = strlen(line); + uint32_t l = (uint32_t)strlen(line); while (l > 0 && (line[l - 1] == '\n' || line[l - 1] == '\r')) { --l; diff --git a/src/stlink-lib/flash_loader.c b/src/stlink-lib/flash_loader.c index 16c717ca7..1caac8489 100644 --- a/src/stlink-lib/flash_loader.c +++ b/src/stlink-lib/flash_loader.c @@ -788,7 +788,7 @@ int32_t stlink_flashloader_write(stlink_t *sl, flash_loader_t *fl, stm32_addr_t if (stm32l1_write_half_pages(sl, fl, addr, base, len, pagesize)) { return (-1); } else { - off = (size_t)(len / pagesize) * pagesize; + off = (uint32_t)(len / pagesize) * pagesize; } } diff --git a/src/stlink-lib/map_file.c b/src/stlink-lib/map_file.c index 118c80d34..f75996be5 100644 --- a/src/stlink-lib/map_file.c +++ b/src/stlink-lib/map_file.c @@ -95,7 +95,7 @@ int32_t map_file(mapped_file_t *mf, const char *path) { goto on_error; } - mf->len = (size_t)st.st_size; + mf->len = (uint32_t)st.st_size; error = 0; // success on_error: diff --git a/src/stlink-lib/usb.c b/src/stlink-lib/usb.c index 83e2652ea..3708d1d6e 100644 --- a/src/stlink-lib/usb.c +++ b/src/stlink-lib/usb.c @@ -1172,7 +1172,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, enum connect_type connect, if (ret) { continue; } // could not open device - uint32_t serial_len = stlink_serial(handle, &desc, sl->serial); + uint32_t serial_len = (uint32_t)stlink_serial(handle, &desc, sl->serial); libusb_close(handle); @@ -1375,7 +1375,7 @@ static uint32_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[], break; } - uint32_t serial_len = stlink_serial(handle, &desc, serial); + uint32_t serial_len = (uint32_t)stlink_serial(handle, &desc, serial); libusb_close(handle);