Fixed compilation on FreeBSD

(Closes #1463)

Author: Nightwalker-87

src/st-flash/flash_opts.c

@@ -17,7 +17,7 @@
 #include <helper.h>
 
 static bool starts_with(const char * str, const char * prefix) {
-    uint32_t n = (uint32_t) strlen(prefix);
+    uint64_t n = strlen(prefix);
 
     if(strlen(str) < n) { return (false); }
 
@@ -203,7 +203,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 = (uint32_t) flash_size;
+                o->flash_size = flash_size;
             }
         } else if(strcmp(av[0], "--connect-under-reset") == 0) {
             o->connect = CONNECT_UNDER_RESET;
@@ -263,7 +263,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 = (uint32_t) size;
+                o->size = size;
             }
         }
 
@@ -287,7 +287,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 = (uint32_t) size;
+                o->size = size;
             }
 
             break;
@@ -304,7 +304,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 = (uint32_t) size;
+                    o->size = size;
                 }
             }
             break;

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

src/stlink-lib/chipid.c

@@ -214,7 +214,7 @@ void process_chipfile(char *fname) {
 
 void init_chipids(char *dir_to_scan) {
   DIR *d;
-  uint32_t nl; // namelen
+  uint64_t nl; // namelen
   struct dirent *dir;
 
   if(!dir_to_scan) {

src/stlink-lib/common_legacy.c

@@ -745,7 +745,7 @@ int32_t stlink_parse_ihex(const char *path, uint8_t erased_pattern, uint8_t **me
         break;
       }
 
-      uint32_t l = (uint32_t) strlen(line);
+      uint64_t l = strlen(line);
 
       while (l > 0 && (line[l - 1] == '\n' || line[l - 1] == '\r')) {
         --l;

src/stlink-lib/flash_loader.c

@@ -838,7 +838,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 = (uint32_t) (len / pagesize) * pagesize;
+        off = (uint32_t) ((uint64_t) (len / pagesize) * pagesize);
       }
     }
 

src/stlink-lib/usb.c

@@ -1192,7 +1192,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);
+        uint64_t serial_len = stlink_serial(handle, &desc, sl->serial);
 
         libusb_close(handle);
 
@@ -1396,7 +1396,7 @@ static uint32_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[],
             break;
         }
 
-        uint32_t serial_len = stlink_serial(handle, &desc, serial);
+        uint64_t serial_len = stlink_serial(handle, &desc, serial);
 
         libusb_close(handle);