fix few -Wformat warnings (#582)

* fix wrong libusb extract command * update libusb to 1.0.21 under windows * fix few -Wformat warnings * add usleep realisation for win32 under mingw
stlink-org · Apr 3, 2017 · 6902f47 · 6902f47
1 parent 78ced6a
commit 6902f47
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/common.c b/src/common.c
@@ -1753,7 +1753,7 @@ int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, uint32_t
             return -1;
         }
         fprintf(stdout,"\rFlash page at addr: 0x%08lx erased",
-                (unsigned long)addr + off);
+                (unsigned long)(addr + off));
         fflush(stdout);
         page_count++;
     }
@@ -1934,7 +1934,7 @@ int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, uint32_t
             if (sl->verbose >= 1) {
                 /* show progress. writing procedure is slow
                    and previous errors are misleading */
-                fprintf(stdout, "\r%3u/%lu pages written", write_block_count++, (unsigned long)len/sl->flash_pgsz);
+                fprintf(stdout, "\r%3u/%lu pages written", write_block_count++, (unsigned long)(len/sl->flash_pgsz));
                 fflush(stdout);
             }
         }

diff --git a/src/mingw/mingw.c b/src/mingw/mingw.c
@@ -265,6 +265,18 @@ char *win32_strsep (char **stringp, const char *delim)
     /* NOTREACHED */
 }
 
+void usleep(DWORD waitTime)
+{
+    LARGE_INTEGER perf_cnt, start, now;
+
+    QueryPerformanceFrequency(&perf_cnt);
+    QueryPerformanceCounter(&start);
+
+    do {
+        QueryPerformanceCounter((LARGE_INTEGER*) &now);
+    } while ((now.QuadPart - start.QuadPart) / (float)perf_cnt.QuadPart * 1000 * 1000 < waitTime);
+}
+
 #endif
 
 
diff --git a/src/mingw/mingw.h b/src/mingw/mingw.h
@@ -66,5 +66,6 @@ ssize_t win32_read_socket(SOCKET fd, void *buf, int n);
 ssize_t win32_write_socket(SOCKET fd, void *buf, int n);
 
 static inline void sleep(unsigned ms) { Sleep(ms); }
+void usleep(DWORD waitTime);
 
 #endif
diff --git a/src/tools/flash.c b/src/tools/flash.c
@@ -67,7 +67,7 @@ int main(int ac, char** av)
 
     if ( o.flash_size != 0u && o.flash_size != sl->flash_size ) {
         sl->flash_size = o.flash_size;
-        printf("Forcing flash size: --flash=0x%08zX\n",sl->flash_size);
+        printf("Forcing flash size: --flash=0x%08X\n",(unsigned int)sl->flash_size);
     }
 
     sl->verbose = o.log_level;