Fix compilation for 32bit machines

[fw/stlink] / gdbserver / gdb-server.c

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index f1da63e45c4462ed21f82177c432b7361320a88f..65297bc0c3dcf56b1c1c40d27bf7ec1e897a662d 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -21,7 +21,7 @@
 
 #include "gdb-remote.h"
 
-#define DEFAULT_LOGGING_LEVEL 10
+#define DEFAULT_LOGGING_LEVEL 100
 #define DEFAULT_GDB_LISTEN_PORT 4242
 
 #define STRINGIFY_inner(name) #name
@@ -143,7 +143,7 @@ int parse_options(int argc, char** argv, st_state_t *st) {
             break;
         case 'd':
             if (strlen(optarg) > sizeof (st->devicename)) {
-                fprintf(stderr, "device name too long: %ld\n", strlen(optarg));
+                fprintf(stderr, "device name too long: %zd\n", strlen(optarg));
             } else {
                 strcpy(st->devicename, optarg);
             }
@@ -188,7 +188,7 @@ int main(int argc, char** argv) {
        memset(&state, 0, sizeof(state));
        // set defaults...
        state.stlink_version = 2;
-       state.logging_level = 10;
+       state.logging_level = DEFAULT_LOGGING_LEVEL;
        state.listen_port = DEFAULT_GDB_LISTEN_PORT;
        parse_options(argc, argv, &state);
        switch (state.stlink_version) {
@@ -207,7 +207,7 @@ int main(int argc, char** argv) {
                                        const int X_index = 7;
                                        DevName[X_index] = DevNum + '0';
                                        if (!access(DevName, F_OK)) {
-                                               sl = stlink_quirk_open(DevName, 0);
+                                               sl = stlink_v1_open(DevName, 0);
                                                ExistDevCount++;
                                        }
                                } else if (DevNum < 100) {
@@ -217,7 +217,7 @@ int main(int argc, char** argv) {
                                        DevName[X_index] = DevNum / 10 + '0';
                                        DevName[Y_index] = DevNum % 10 + '0';
                                        if (!access(DevName, F_OK)) {
-                                               sl = stlink_quirk_open(DevName, 0);
+                                               sl = stlink_v1_open(DevName, 0);
                                                ExistDevCount++;
                                        }
                                }
@@ -231,18 +231,17 @@ int main(int argc, char** argv) {
                                return 1;
                        }
                } else {
-                       sl = stlink_quirk_open(state.devicename, state.logging_level);
+                       sl = stlink_v1_open(state.devicename, state.logging_level);
                }
                break;
-       }
-
-       if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE) {
-               stlink_exit_dfu_mode(sl);
-       }
+    }
 
-       if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE) {
-         stlink_enter_swd_mode(sl);
-       }
+    if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE) {
+        if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE) {
+            stlink_exit_dfu_mode(sl);
+        }
+        stlink_enter_swd_mode(sl);
+    }
 
        uint32_t chip_id = stlink_chip_id(sl);
        uint32_t core_id = stlink_core_id(sl);