Remove unsupported --device option to st-util

Setting the STLINK device with -d hasn't worked for some time, but
the STLINK_DEVICE environment variable works instead. Remove the
option, update documentation and help text.

diff --git a/README b/README
index 01751a7cf357a0807e1e50975c0e5f56109b3ad8..853c5182652b8d4bc8f9eb897a017558bedd697d 100644 (file)
--- a/README
+++ b/README
@@ -55,14 +55,22 @@ There are a few options:
 
 ./st-util - usage:
 
-  -h, --help        Print this help
-  -vXX, --verbose=XX    specify a specific verbosity level (0..99)
-  -v, --verbose specify generally verbose logging
+  -h, --help           Print this help
+  -vXX, --verbose=XX   Specify a specific verbosity level (0..99)
+  -v, --verbose                Specify generally verbose logging
   -s X, --stlink_version=X
-            Choose what version of stlink to use, (defaults to 2)
-  -1, --stlinkv1    Force stlink version 1
+                       Choose what version of stlink to use, (defaults to 2)
+  -1, --stlinkv1       Force stlink version 1
   -p 4242, --listen_port=1234
-            Set the gdb server listen port. (default port: 4242)
+                       Set the gdb server listen port. (default port: 4242)
+  -m, --multi
+                       Set gdb server to extended mode.
+                       st-util will continue listening for connections after disconnect.
+  -n, --no-reset
+                       Do not reset board on connection.
+
+The STLINKv2 device to use can be specified in the environment
+variable STLINK_DEVICE on the format <USB_BUS>:<USB_ADDR>.
 
 Then, in your project directory, someting like this...
 (remember, you need to run an _ARM_ gdb, not an x86 gdb)

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index 7e8bb685a7ab7e7e12a931ce7fd7fd6cd86e834d..13902ee0389e012cfd13a11a8c8ee4eb7b131020 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -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;