target/armv7m_trace: Use prefix for enums

Change-Id: I3f199e6053146a1094d96b98ea174b41bb021599
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3905
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index c078102a0a97c1b06071393727f05824c39972af..e74965e61f6f409b66c635c8eb5c205c7c5085d3 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1275,7 +1275,7 @@ static int config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
                return ERROR_FAIL;
        }
 
-       if (pin_protocol != ASYNC_UART) {
+       if (pin_protocol != TPIU_PIN_PROTOCOL_ASYNC_UART) {
                LOG_ERROR("Selected pin protocol is not supported.");
                return ERROR_FAIL;
        }

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 01f94713102edc29c68ed13467e00b3bc771c5d8..d9ca53e29cb77ecce334ef0db42da8e05305508e 100644 (file)
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -2199,7 +2199,8 @@ int stlink_config_trace(void *handle, bool enabled, enum tpiu_pin_protocol pin_p
 {
        struct stlink_usb_handle_s *h = handle;
 
-       if (enabled && (h->jtag_api < 2 || pin_protocol != ASYNC_UART)) {
+       if (enabled && (h->jtag_api < 2 ||
+                       pin_protocol != TPIU_PIN_PROTOCOL_ASYNC_UART)) {
                LOG_ERROR("The attached ST-LINK version doesn't support this trace mode");
                return ERROR_FAIL;
        }

diff --git a/src/target/armv7m_trace.c b/src/target/armv7m_trace.c
index c1e4f5baac33d7f2b8a5c282c7c56f605bddfc59..62f0f8e61db7a1a47de4877b509e323d50c496d6 100644 (file)
--- a/src/target/armv7m_trace.c
+++ b/src/target/armv7m_trace.c
@@ -62,7 +62,7 @@ int armv7m_trace_tpiu_config(struct target *target)
        target_unregister_timer_callback(armv7m_poll_trace, target);
 
 
-       retval = adapter_config_trace(trace_config->config_type == INTERNAL,
+       retval = adapter_config_trace(trace_config->config_type == TRACE_CONFIG_TYPE_INTERNAL,
                                      trace_config->pin_protocol,
                                      trace_config->port_size,
                                      &trace_config->trace_freq);
@@ -83,7 +83,7 @@ int armv7m_trace_tpiu_config(struct target *target)
                          trace_config->trace_freq, trace_config->traceclkin_freq,
                          trace_freq);
                trace_config->trace_freq = trace_freq;
-               retval = adapter_config_trace(trace_config->config_type == INTERNAL,
+               retval = adapter_config_trace(trace_config->config_type == TRACE_CONFIG_TYPE_INTERNAL,
                                              trace_config->pin_protocol,
                                              trace_config->port_size,
                                              &trace_config->trace_freq);
@@ -115,7 +115,7 @@ int armv7m_trace_tpiu_config(struct target *target)
        if (retval != ERROR_OK)
                return retval;
 
-       if (trace_config->config_type == INTERNAL)
+       if (trace_config->config_type == TRACE_CONFIG_TYPE_INTERNAL)
                target_register_timer_callback(armv7m_poll_trace, 1, 1, target);
 
        target_call_event_callbacks(target, TARGET_EVENT_TRACE_CONFIG);
@@ -173,7 +173,7 @@ COMMAND_HANDLER(handle_tpiu_config_command)
                if (CMD_ARGC == cmd_idx + 1) {
                        close_trace_file(armv7m);
 
-                       armv7m->trace_config.config_type = DISABLED;
+                       armv7m->trace_config.config_type = TRACE_CONFIG_TYPE_DISABLED;
                        if (CMD_CTX->mode == COMMAND_EXEC)
                                return armv7m_trace_tpiu_config(target);
                        else
@@ -183,13 +183,13 @@ COMMAND_HANDLER(handle_tpiu_config_command)
                   !strcmp(CMD_ARGV[cmd_idx], "internal")) {
                close_trace_file(armv7m);
 
-               armv7m->trace_config.config_type = EXTERNAL;
+               armv7m->trace_config.config_type = TRACE_CONFIG_TYPE_EXTERNAL;
                if (!strcmp(CMD_ARGV[cmd_idx], "internal")) {
                        cmd_idx++;
                        if (CMD_ARGC == cmd_idx)
                                return ERROR_COMMAND_SYNTAX_ERROR;
 
-                       armv7m->trace_config.config_type = INTERNAL;
+                       armv7m->trace_config.config_type = TRACE_CONFIG_TYPE_INTERNAL;
 
                        if (strcmp(CMD_ARGV[cmd_idx], "-") != 0) {
                                armv7m->trace_config.trace_file = fopen(CMD_ARGV[cmd_idx], "ab");
@@ -204,7 +204,7 @@ COMMAND_HANDLER(handle_tpiu_config_command)
                        return ERROR_COMMAND_SYNTAX_ERROR;
 
                if (!strcmp(CMD_ARGV[cmd_idx], "sync")) {
-                       armv7m->trace_config.pin_protocol = SYNC;
+                       armv7m->trace_config.pin_protocol = TPIU_PIN_PROTOCOL_SYNC;
 
                        cmd_idx++;
                        if (CMD_ARGC == cmd_idx)
@@ -213,9 +213,9 @@ COMMAND_HANDLER(handle_tpiu_config_command)
                        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[cmd_idx], armv7m->trace_config.port_size);
                } else {
                        if (!strcmp(CMD_ARGV[cmd_idx], "manchester"))
-                               armv7m->trace_config.pin_protocol = ASYNC_MANCHESTER;
+                               armv7m->trace_config.pin_protocol = TPIU_PIN_PROTOCOL_ASYNC_MANCHESTER;
                        else if (!strcmp(CMD_ARGV[cmd_idx], "uart"))
-                               armv7m->trace_config.pin_protocol = ASYNC_UART;
+                               armv7m->trace_config.pin_protocol = TPIU_PIN_PROTOCOL_ASYNC_UART;
                        else
                                return ERROR_COMMAND_SYNTAX_ERROR;
 
@@ -237,7 +237,7 @@ COMMAND_HANDLER(handle_tpiu_config_command)
                        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[cmd_idx], armv7m->trace_config.trace_freq);
                        cmd_idx++;
                } else {
-                       if (armv7m->trace_config.config_type != INTERNAL) {
+                       if (armv7m->trace_config.config_type != TRACE_CONFIG_TYPE_INTERNAL) {
                                LOG_ERROR("Trace port frequency can't be omitted in external capture mode");
                                return ERROR_COMMAND_SYNTAX_ERROR;
                        }

diff --git a/src/target/armv7m_trace.h b/src/target/armv7m_trace.h
index 02bec96a172624595a36e5a60e1c406aa9666679..c63f36dea40d5d3fce2a74697fbc5908ef61a56c 100644 (file)
--- a/src/target/armv7m_trace.h
+++ b/src/target/armv7m_trace.h
@@ -27,15 +27,15 @@
  */
 
 enum trace_config_type {
-       DISABLED,       /**< tracing is disabled */
-       EXTERNAL,       /**< trace output is captured externally */
-       INTERNAL        /**< trace output is handled by OpenOCD adapter driver */
+       TRACE_CONFIG_TYPE_DISABLED,     /**< tracing is disabled */
+       TRACE_CONFIG_TYPE_EXTERNAL,     /**< trace output is captured externally */
+       TRACE_CONFIG_TYPE_INTERNAL      /**< trace output is handled by OpenOCD adapter driver */
 };
 
 enum tpiu_pin_protocol {
-       SYNC,                   /**< synchronous trace output */
-       ASYNC_MANCHESTER,       /**< asynchronous output with Manchester coding */
-       ASYNC_UART              /**< asynchronous output with NRZ coding */
+       TPIU_PIN_PROTOCOL_SYNC,                 /**< synchronous trace output */
+       TPIU_PIN_PROTOCOL_ASYNC_MANCHESTER,     /**< asynchronous output with Manchester coding */
+       TPIU_PIN_PROTOCOL_ASYNC_UART            /**< asynchronous output with NRZ coding */
 };
 
 enum itm_ts_prescaler {

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index d1afbd569a6261f10b37f3a5fe6ccd24a57c378f..dcb3ddd8264f14f60ec4ef4880ec1d89f20fd66b 100644 (file)
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2080,7 +2080,7 @@ int cortex_m_examine(struct target *target)
                if (retval != ERROR_OK)
                        return retval;
 
-               if (armv7m->trace_config.config_type != DISABLED) {
+               if (armv7m->trace_config.config_type != TRACE_CONFIG_TYPE_DISABLED) {
                        armv7m_trace_tpiu_config(target);
                        armv7m_trace_itm_config(target);
                }