Add the target name to debug output for better understanding and error identification.

[openocd.git] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 6d3a99decd8adc9031124c8506a9411601ad7e86..45b45770197d2bb569e034d1665a2ab5f9060748 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -87,7 +87,7 @@ extern struct target_type dsp563xx_target;
 extern struct target_type dsp5680xx_target;
 extern struct target_type testee_target;
 extern struct target_type avr32_ap7k_target;
-extern struct target_type stm32_stlink_target;
+extern struct target_type hla_target;
 
 static struct target_type *target_types[] = {
        &arm7tdmi_target,
@@ -110,7 +110,7 @@ static struct target_type *target_types[] = {
        &dsp5680xx_target,
        &testee_target,
        &avr32_ap7k_target,
-       &stm32_stlink_target,
+       &hla_target,
        NULL,
 };
 
@@ -2248,7 +2248,8 @@ static int handle_target(void *priv)
                                        backoff_times *= 2;
                                        backoff_times++;
                                }
-                               LOG_USER("Polling target failed, GDB will be halted. Polling again in %dms",
+                               LOG_USER("Polling target %s failed, GDB will be halted. Polling again in %dms",
+                                               target_name(target),
                                                backoff_times * polling_interval);
 
                                /* Tell GDB to halt the debugger. This allows the user to
@@ -2259,7 +2260,7 @@ static int handle_target(void *priv)
                        }
                        /* Since we succeeded, we reset backoff count */
                        if (backoff_times > 0)
-                               LOG_USER("Polling succeeded again");
+                               LOG_USER("Polling target %s succeeded again", target_name(target));
                        backoff_times = 0;
                }
        }
@@ -4909,6 +4910,15 @@ static int target_create(Jim_GetOptInfo *goi)
                        /* found */
                        break;
                }
+
+               /* check for deprecated name */
+               if (target_types[x]->deprecated_name) {
+                       if (0 == strcmp(cp, target_types[x]->deprecated_name)) {
+                               /* found */
+                               LOG_WARNING("target name is deprecated use: \'%s\'", target_types[x]->name);
+                               break;
+                       }
+               }
        }
        if (target_types[x] == NULL) {
                Jim_SetResultFormatted(goi->interp, "Unknown target type %s, try one of ", cp);