Align loader to 32-bit boundary

[fw/stlink] / src / st-info.c

diff --git a/src/st-info.c b/src/st-info.c
index 2cea40e5c2b602a45aabde482d48f646e68df085..1671468f01ad7d792914031953f848d094391a06 100644 (file)
--- a/src/st-info.c
+++ b/src/st-info.c
@@ -13,9 +13,30 @@ static void usage(void)
     puts("st-info --pagesize");
     puts("st-info --chipid");
     puts("st-info --serial");
+    puts("st-info --hla-serial");
     puts("st-info --probe");
 }
 
+/* Print normal or OpenOCD hla_serial with newline */
+static void stlink_print_serial(stlink_t *sl, bool openocd)
+{
+    const char *fmt;
+
+    if (openocd) {
+       printf("\"");
+       fmt = "\\x%02x";
+    } else {
+       fmt = "%02x";
+    }
+
+    for (int n = 0; n < sl->serial_size; n++)
+        printf(fmt, sl->serial[n]);
+
+    if (openocd)
+       printf("\"");
+    printf("\n");
+}
+
 static void stlink_print_info(stlink_t *sl)
 {
     const chip_params_t *params = NULL;
@@ -23,13 +44,14 @@ static void stlink_print_info(stlink_t *sl)
     if (!sl)
         return;
 
-    for (int n = 0; n < sl->serial_size; n++)
-        printf("%02x", sl->serial[n]);
-    printf("\n");
+    printf(" serial: ");
+    stlink_print_serial(sl, false);
+    printf("openocd: ");
+    stlink_print_serial(sl, true);
 
-    printf("\t flash: %zu (pagesize: %zu)\n", sl->flash_size, sl->flash_pgsz);
-    printf("\t  sram: %zu\n",       sl->sram_size);
-    printf("\tchipid: 0x%.4x\n",    sl->chip_id);
+    printf("  flash: %zu (pagesize: %zu)\n", sl->flash_size, sl->flash_pgsz);
+    printf("   sram: %zu\n",       sl->sram_size);
+    printf(" chipid: 0x%.4x\n",    sl->chip_id);
 
     for (size_t i = 0; i < sizeof(devices) / sizeof(devices[0]); i++) {
         if (devices[i].chip_id == sl->chip_id) {
@@ -39,7 +61,7 @@ static void stlink_print_info(stlink_t *sl)
     }
 
     if (params)
-        printf("\t descr: %s\n", params->description);
+        printf("  descr: %s\n", params->description);
 }
 
 static void stlink_probe(void)
@@ -57,9 +79,40 @@ static void stlink_probe(void)
     stlink_probe_usb_free(&stdevs, size);
 }
 
-static int print_data(stlink_t *sl, char **av)
+static stlink_t *stlink_open_first(void)
 {
-    int ret = 0;
+    stlink_t* sl = NULL;
+    sl = stlink_v1_open(0, 1);
+    if (sl == NULL)
+        sl = stlink_open_usb(0, 1, NULL);
+
+    return sl;
+}
+
+static int print_data(char **av)
+{
+    stlink_t* sl = NULL;
+
+    // Probe needs all devices unclaimed
+    if (strcmp(av[1], "--probe") == 0) {
+        stlink_probe();
+        return 0;
+    }
+
+    sl = stlink_open_first();
+
+    if (sl == NULL) {
+        return -1;
+    }
+
+    sl->verbose = 0;
+
+    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 (strcmp(av[1], "--flash") == 0)
         printf("0x%zx\n", sl->flash_size);
     else if (strcmp(av[1], "--sram") == 0)
@@ -68,13 +121,11 @@ static int print_data(stlink_t *sl, char **av)
         printf("0x%zx\n", sl->flash_pgsz);
     else if (strcmp(av[1], "--chipid") == 0)
         printf("0x%.4x\n", sl->chip_id);
-    else if (strcmp(av[1], "--probe") == 0)
-        stlink_probe();
-    else if (strcmp(av[1], "--serial") == 0) {
-        for (int n = 0; n < sl->serial_size; n++)
-            printf("%02x", sl->serial[n]);
-        printf("\n");
-    } else if (strcmp(av[1], "--descr") == 0) {
+    else if (strcmp(av[1], "--serial") == 0)
+        stlink_print_serial(sl, false);
+    else if (strcmp(av[1], "--hla-serial") == 0)
+        stlink_print_serial(sl, true);
+    else if (strcmp(av[1], "--descr") == 0) {
         const chip_params_t *params = NULL;
         for (size_t i = 0; i < sizeof(devices) / sizeof(devices[0]); i++) {
             if(devices[i].chip_id == sl->chip_id) {
@@ -87,48 +138,25 @@ static int print_data(stlink_t *sl, char **av)
         }
         printf("%s\n", params->description);
     }
-    return ret;
-}
 
+    if (sl)
+    {
+        stlink_exit_debug_mode(sl);
+        stlink_close(sl);
+    }
 
-stlink_t* open_sl(void)
-{
-    stlink_t* sl;
-    sl = stlink_v1_open(0, 1);
-    if (sl == NULL)
-        sl = stlink_open_usb(0, 1, NULL);
-    return sl;
+    return 0;
 }
 
-
 int main(int ac, char** av)
 {
-    stlink_t* sl = NULL;
     int err = -1;
     if (ac < 2) {
         usage();
         return -1;
     }
 
-    sl = open_sl();
-
-    if (sl == NULL) {
-        return -1;
-    }
-    sl->verbose=0;
-    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);
-
-    err = print_data(sl, av);
-
-    if (sl != NULL)
-    {
-        stlink_exit_debug_mode(sl);
-        stlink_close(sl);
-    }
+    err = print_data(av);
 
     return err;
 }