X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7m_trace.c;h=6170119d9effc698daca348233bac183e70a48b8;hp=3592bad0f64c2f59f8120b2e5787f80676130b12;hb=b61e454869c988e7fafc1c16982ccfec04415b51;hpb=d28ab08cfafb3ad7ff8dc539644883217e89f8c4

diff --git a/src/target/armv7m_trace.c b/src/target/armv7m_trace.c
index 3592bad0f6..6170119d9e 100644
--- a/src/target/armv7m_trace.c
+++ b/src/target/armv7m_trace.c
@@ -10,6 +10,9 @@
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -59,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);
@@ -80,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);
@@ -112,8 +115,9 @@ int armv7m_trace_tpiu_config(struct target *target)
 	if (retval != ERROR_OK)
 		return retval;
 
-	if (trace_config->config_type == INTERNAL)
-		target_register_timer_callback(armv7m_poll_trace, 1, 1, target);
+	if (trace_config->config_type == TRACE_CONFIG_TYPE_INTERNAL)
+		target_register_timer_callback(armv7m_poll_trace, 1,
+		TARGET_TIMER_TYPE_PERIODIC, target);
 
 	target_call_event_callbacks(target, TARGET_EVENT_TRACE_CONFIG);
 
@@ -170,7 +174,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
@@ -180,13 +184,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");
@@ -201,7 +205,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)
@@ -210,9 +214,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;
 
@@ -234,7 +238,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;
 			}