Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[refactoring] st-util: removed now useless v1/v2 STLink version stuff #934

Merged
merged 3 commits into from
Apr 22, 2020
Merged

[refactoring] st-util: removed now useless v1/v2 STLink version stuff #934

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15f1c81
st-util: remove v1/v2 stlink version stuff, useless
grevaillot Apr 16, 2020
ad0e525
doc: update doc to mention STLINK_DEVICE and --probe parameters if
grevaillot Apr 22, 2020
5e0fd8b
doc: remove stlink version parameter selectors doc and examples
grevaillot Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 9 additions & 33 deletions src/gdbserver/gdb-server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ static const char* current_memory_map = NULL;

typedef struct _st_state_t {
// things from command line, bleh
int stlink_version;
int logging_level;
int listen_port;
int persistent;
Expand All @@ -86,30 +85,20 @@ static void cleanup(int signum) {


static stlink_t* do_connect(st_state_t *st) {
stlink_t *ret = NULL;
switch (st->stlink_version) {
case 2:
if (serial_specified){
ret = stlink_open_usb(st->logging_level, st->reset, serialnumber);
}
else {
ret = stlink_open_usb(st->logging_level, st->reset, NULL);
}
break;
case 1:
ret = stlink_v1_open(st->logging_level, st->reset);
break;
stlink_t *sl = NULL;
if (serial_specified) {
sl = stlink_open_usb(st->logging_level, st->reset, serialnumber);
} else {
sl = stlink_open_usb(st->logging_level, st->reset, NULL);
}
return ret;
return sl;
}


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'},
{"stlink_version", required_argument, NULL, 's'},
{"stlinkv1", no_argument, NULL, '1'},
{"listen_port", required_argument, NULL, 'p'},
{"multi", optional_argument, NULL, 'm'},
{"no-reset", optional_argument, NULL, 'n'},
Expand All @@ -123,7 +112,6 @@ int parse_options(int argc, char** argv, st_state_t *st) {
" -V, --version\t\tPrint the version\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"
" -p 4242, --listen_port=1234\n"
Expand All @@ -139,7 +127,7 @@ int parse_options(int argc, char** argv, st_state_t *st) {
" --serial <serial>\n"
"\t\t\tUse a specific serial number.\n"
"\n"
"The STLINKv2 device to use can be specified in the environment\n"
"The STLINK device to use can be specified in the environment\n"
"variable STLINK_DEVICE on the format <USB_BUS>:<USB_ADDR>.\n"
"\n"
;
Expand All @@ -148,7 +136,7 @@ int parse_options(int argc, char** argv, st_state_t *st) {
int option_index = 0;
int c;
int q;
while ((c = getopt_long(argc, argv, "hv::s:1p:mn", long_options, &option_index)) != -1) {
while ((c = getopt_long(argc, argv, "hv::p:mn", long_options, &option_index)) != -1) {
switch (c) {
case 0:
break;
Expand All @@ -163,17 +151,6 @@ int parse_options(int argc, char** argv, st_state_t *st) {
st->logging_level = DEBUG_LOGGING_LEVEL;
}
break;
case '1':
st->stlink_version = 1;
break;
case 's':
sscanf(optarg, "%i", &q);
if (q < 0 || q > 2) {
fprintf(stderr, "stlink version %d unknown!\n", q);
exit(EXIT_FAILURE);
}
st->stlink_version = q;
break;
case 'p':
sscanf(optarg, "%i", &q);
if (q < 0) {
Expand Down Expand Up @@ -225,13 +202,12 @@ int main(int argc, char** argv) {
memset(&state, 0, sizeof(state));

// set defaults...
state.stlink_version = 2;
state.logging_level = DEFAULT_LOGGING_LEVEL;
state.listen_port = DEFAULT_GDB_LISTEN_PORT;
state.reset = 1; /* By default, reset board */
parse_options(argc, argv, &state);

printf("st-util %s\n", STLINK_VERSION);
printf("st-util\n");

sl = do_connect(&state);
if (sl == NULL) return 1;
Expand Down