projects / fw / stlink / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove unsupported --device option to st-util
[fw/stlink] / gdbserver / gdb-server.c
diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index d0a6a02d7e9be3f88e6f5316ff8466401bc7920d..13902ee0389e012cfd13a11a8c8ee4eb7b131020 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -7,6 +7,7 @@
 */
 
 #include <getopt.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -18,7 +19,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <signal.h>
 #endif
 
 #include <stlink-common.h>
@@ -45,10 +45,8 @@ static const char* current_memory_map = NULL;
 typedef struct _st_state_t {
     // things from command line, bleh
     int stlink_version;
-    // "/dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTE531X6-if00-port0" is only 58 chars
-    char devicename[100];
     int logging_level;
-       int listen_port;
+    int listen_port;
     int persistent;
     int reset;
 } st_state_t;
@@ -74,7 +72,6 @@ int parse_options(int argc, char** argv, st_state_t *st) {
     static struct option long_options[] = {
         {"help", no_argument, NULL, 'h'},
         {"verbose", optional_argument, NULL, 'v'},
-        {"device", required_argument, NULL, 'd'},
         {"stlink_version", required_argument, NULL, 's'},
         {"stlinkv1", no_argument, NULL, '1'},
                {"listen_port", required_argument, NULL, 'p'},
@@ -84,10 +81,8 @@ int parse_options(int argc, char** argv, st_state_t *st) {
     };
        const char * help_str = "%s - usage:\n\n"
        "  -h, --help\t\tPrint this help\n"
-       "  -vXX, --verbose=XX\tspecify a specific verbosity level (0..99)\n"
-       "  -v, --verbose\tspecify generally verbose logging\n"
-       "  -d <device>, --device=/dev/stlink2_1\n"
-       "\t\t\tWhere is your stlink device connected?\n"
+       "  -vXX, --verbose=XX\tSpecify a specific verbosity level (0..99)\n"
+       "  -v, --verbose\t\tSpecify generally verbose logging\n"
        "  -s X, --stlink_version=X\n"
        "\t\t\tChoose what version of stlink to use, (defaults to 2)\n"
        "  -1, --stlinkv1\tForce stlink version 1\n"
@@ -99,13 +94,17 @@ int parse_options(int argc, char** argv, st_state_t *st) {
     "\t\t\tst-util will continue listening for connections after disconnect.\n"
     "  -n, --no-reset\n"
     "\t\t\tDo not reset board on connection.\n"
+       "\n"
+       "The STLINKv2 device to use can be specified in the environment\n"
+       "variable STLINK_DEVICE on the format <USB_BUS>:<USB_ADDR>.\n"
+       "\n"
        ;
 
 
     int option_index = 0;
     int c;
     int q;
-    while ((c = getopt_long(argc, argv, "hv::d:s:1p:mn", long_options, &option_index)) != -1) {
+    while ((c = getopt_long(argc, argv, "hv::s:1p:mn", long_options, &option_index)) != -1) {
         switch (c) {
         case 0:
             printf("XXXXX Shouldn't really normally come here, only if there's no corresponding option\n");
@@ -125,13 +124,6 @@ int parse_options(int argc, char** argv, st_state_t *st) {
             } else {
                 st->logging_level = DEFAULT_LOGGING_LEVEL;
             }
-            break;
-        case 'd':
-            if (strlen(optarg) > sizeof (st->devicename)) {
-                fprintf(stderr, "device name too long: %zd\n", strlen(optarg));
-            } else {
-                strcpy(st->devicename, optarg);
-            }
             break;
                case '1':
                        st->stlink_version = 1;
@@ -172,6 +164,7 @@ int parse_options(int argc, char** argv, st_state_t *st) {
 
 
 int main(int argc, char** argv) {
+       int32_t voltage;
 
        stlink_t *sl = NULL;
 
@@ -204,6 +197,11 @@ int main(int argc, char** argv) {
 
        printf("Chip ID is %08x, Core ID is  %08x.\n", sl->chip_id, sl->core_id);
 
+       voltage = stlink_target_voltage(sl);
+       if (voltage != -1) {
+               printf("Target voltage is %d mV.\n", voltage);
+       }
+
        sl->verbose=0;
 
        current_memory_map = make_memory_map(sl);
@@ -384,7 +382,7 @@ struct code_hw_watchpoint {
 struct code_hw_watchpoint data_watches[DATA_WATCH_NUM];
 
 static void init_data_watchpoints(stlink_t *sl) {
-       #ifdef DEBUG
+       #if DEBUG
        printf("init watchpoints\n");
        #endif
 
@@ -419,7 +417,7 @@ static int add_data_watchpoint(stlink_t *sl, enum watchfun wf, stm32_addr_t addr
                for(i = 0; i < DATA_WATCH_NUM; i++) {
                        // is this an empty slot ?
                        if(data_watches[i].fun == WATCHDISABLED) {
-                               #ifdef DEBUG
+                               #if DEBUG
                                printf("insert watchpoint %d addr %x wf %u mask %u len %d\n", i, addr, wf, mask, len);
                                #endif
 
@@ -443,7 +441,7 @@ static int add_data_watchpoint(stlink_t *sl, enum watchfun wf, stm32_addr_t addr
                }
        }
 
-       #ifdef DEBUG
+       #if DEBUG
        printf("failure: add watchpoints addr %x wf %u len %u\n", addr, wf, len);
        #endif
        return -1;
@@ -455,7 +453,7 @@ static int delete_data_watchpoint(stlink_t *sl, stm32_addr_t addr)
 
        for(i = 0 ; i < DATA_WATCH_NUM; i++) {
                if((data_watches[i].addr == addr) && (data_watches[i].fun != WATCHDISABLED)) {
-                       #ifdef DEBUG
+                       #if DEBUG
                        printf("delete watchpoint %d addr %x\n", i, addr);
                        #endif
 
@@ -466,7 +464,7 @@ static int delete_data_watchpoint(stlink_t *sl, stm32_addr_t addr)
                }
        }
 
-       #ifdef DEBUG
+       #if DEBUG
        printf("failure: delete watchpoint addr %x\n", addr);
        #endif
 
@@ -527,7 +525,7 @@ static int update_code_breakpoint(stlink_t *sl, stm32_addr_t addr, int set) {
        else    brk->type &= ~type;
 
        if(brk->type == 0) {
-               #ifdef DEBUG
+               #if DEBUG
                printf("clearing hw break %d\n", id);
                #endif
 
@@ -535,7 +533,7 @@ static int update_code_breakpoint(stlink_t *sl, stm32_addr_t addr, int set) {
        } else {
                uint32_t mask = (brk->addr) | 1 | (brk->type << 30);
 
-               #ifdef DEBUG
+               #if DEBUG
                printf("setting hw break %d at %08x (%d)\n",
                        id, brk->addr, brk->type);
                printf("reg %08x \n",
@@ -631,7 +629,7 @@ static int flash_go(stlink_t *sl) {
        stlink_reset(sl);
 
        for(struct flash_block* fb = flash_root; fb; fb = fb->next) {
-               #ifdef DEBUG
+               #if DEBUG
                printf("flash_do: block %08x -> %04x\n", fb->addr, fb->length);
                #endif
 
@@ -641,7 +639,7 @@ static int flash_go(stlink_t *sl) {
                        //Update FLASH_PAGE
                        stlink_calculate_pagesize(sl, page);
 
-                       #ifdef DEBUG
+                       #if DEBUG
                        printf("flash_do: page %08x\n", page);
                        #endif
 
@@ -728,7 +726,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                        return 1;
                }
 
-               #ifdef DEBUG
+               #if DEBUG
                printf("recv: %s\n", packet);
                #endif
 
@@ -753,7 +751,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                        char* queryName = calloc(queryNameLength + 1, 1);
                        strncpy(queryName, &packet[1], queryNameLength);
 
-                       #ifdef DEBUG
+                       #if DEBUG
                        printf("query: %s;%s\n", queryName, params);
                        #endif
 
@@ -778,7 +776,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                                unsigned addr = strtoul(__s_addr, NULL, 16),
                                       length = strtoul(s_length, NULL, 16);
 
-                               #ifdef DEBUG
+                               #if DEBUG
                                printf("Xfer: type:%s;op:%s;annex:%s;addr:%d;length:%d\n",
                                        type, op, annex, addr, length);
                                #endif
@@ -815,7 +813,7 @@ int serve(stlink_t *sl, st_state_t *st) {
 
 
                                if (!strncmp(params,"726573756d65",12)) {// resume
-#ifdef DEBUG
+#if DEBUG
                                        printf("Rcmd: resume\n");
 #endif
                                        stlink_run(sl);
@@ -826,7 +824,7 @@ int serve(stlink_t *sl, st_state_t *st) {
 
                                        stlink_force_debug(sl);
 
-#ifdef DEBUG
+#if DEBUG
                                        printf("Rcmd: halt\n");
 #endif
                 } else if (!strncmp(params,"6a7461675f7265736574",20)) { //jtag_reset
@@ -836,7 +834,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                                        stlink_jtag_reset(sl, 0);
                                        stlink_force_debug(sl);
 
-#ifdef DEBUG
+#if DEBUG
                                        printf("Rcmd: jtag_reset\n");
 #endif
                 } else if (!strncmp(params,"7265736574",10)) { //reset
@@ -847,11 +845,11 @@ int serve(stlink_t *sl, st_state_t *st) {
                                        init_code_breakpoints(sl);
                                        init_data_watchpoints(sl);
 
-#ifdef DEBUG
+#if DEBUG
                                        printf("Rcmd: reset\n");
 #endif
                                } else {
-#ifdef DEBUG
+#if DEBUG
                                        printf("Rcmd: %s\n", params);
 #endif
 
@@ -883,7 +881,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                                unsigned addr = strtoul(__s_addr, NULL, 16),
                                       length = strtoul(s_length, NULL, 16);
 
-                               #ifdef DEBUG
+                               #if DEBUG
                                printf("FlashErase: addr:%08x,len:%04x\n",
                                        addr, length);
                                #endif
@@ -921,7 +919,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                                if(dec_index % 2 != 0)
                                        dec_index++;
 
-                               #ifdef DEBUG
+                               #if DEBUG
                                printf("binary packet %d -> %d\n", data_length, dec_index);
                                #endif
 
@@ -1263,7 +1261,7 @@ int serve(stlink_t *sl, st_state_t *st) {
                }
 
                if(reply) {
-                       #ifdef DEBUG
+                       #if DEBUG
                        printf("send: %s\n", reply);
                        #endif
 
STM tools with support for Altus Metrum targets