From 3c39d6ba8033ac7777499d3795dfc4df0b463a12 Mon Sep 17 00:00:00 2001 From: lementec Date: Tue, 18 Nov 2014 10:55:41 +0100 Subject: [PATCH] add command line debug option to flash util --- flash/main.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/flash/main.c b/flash/main.c index 82803fe..f875692 100644 --- a/flash/main.c +++ b/flash/main.c @@ -9,6 +9,9 @@ #include #include "stlink-common.h" +#define DEBUG_LOG_LEVEL 100 +#define STND_LOG_LEVEL 50 + enum st_cmds {DO_WRITE = 0, DO_READ = 1, DO_ERASE = 2}; struct opts { @@ -18,14 +21,15 @@ struct opts stm32_addr_t addr; size_t size; int reset; + int log_level; }; static void usage(void) { - puts("stlinkv1 command line: ./flash [--reset] {read|write} /dev/sgX path addr "); - puts("stlinkv1 command line: ./flash /dev/sgX erase"); - puts("stlinkv2 command line: ./flash [--reset] {read|write} path addr "); - puts("stlinkv2 command line: ./flash erase"); + puts("stlinkv1 command line: ./flash [--debug] [--reset] {read|write} /dev/sgX path addr "); + puts("stlinkv1 command line: ./flash [--debug] /dev/sgX erase"); + puts("stlinkv2 command line: ./flash [--debug] [--reset] {read|write} path addr "); + puts("stlinkv2 command line: ./flash [--debug] erase"); puts(" use hex format for addr and "); } @@ -38,6 +42,17 @@ static int get_opts(struct opts* o, int ac, char** av) if (ac < 1) return -1; + if (strcmp(av[0], "--debug") == 0) + { + o->log_level = DEBUG_LOG_LEVEL; + ac--; + av++; + } + else + { + o->log_level = STND_LOG_LEVEL; + } + if (strcmp(av[0], "--reset") == 0) { o->reset = 1; @@ -120,15 +135,15 @@ int main(int ac, char** av) if (o.devname != NULL) /* stlinkv1 */ { - sl = stlink_v1_open(50, 1); + sl = stlink_v1_open(o.log_level, 1); if (sl == NULL) goto on_error; - sl->verbose = 50; + sl->verbose = o.log_level; } else /* stlinkv2 */ { - sl = stlink_open_usb(50, 1); + sl = stlink_open_usb(o.log_level, 1); if (sl == NULL) goto on_error; - sl->verbose = 50; + sl->verbose = o.log_level; } if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE) -- 2.30.2