target/armv7m_trace: Fix typo in enum

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

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 5d9b8101eb4e8170dce190c5f102a83d0d5ef35c..f90ae99baa3c7f3bc9477dec351c0e7b9410c2a9 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -1843,7 +1843,7 @@ void adapter_deassert_reset(void)
                LOG_ERROR("transport is not selected");
 }
 
-int adapter_config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
+int adapter_config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
                         uint32_t port_size, unsigned int *trace_freq)
 {
        if (jtag->config_trace)

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 132ef06e98f7fb3ed717292ce002b75c58ec2c65..c078102a0a97c1b06071393727f05824c39972af 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1263,7 +1263,7 @@ static bool check_trace_freq(struct jaylink_swo_speed speed,
        return false;
 }
 
-static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
+static int config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
                uint32_t port_size, unsigned int *trace_freq)
 {
        int ret;

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 99f96b9c9c9c521678d2835e1a8cd79f866d5f81..01f94713102edc29c68ed13467e00b3bc771c5d8 100644 (file)
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -2194,7 +2194,7 @@ error_open:
        return ERROR_FAIL;
 }
 
-int stlink_config_trace(void *handle, bool enabled, enum tpio_pin_protocol pin_protocol,
+int stlink_config_trace(void *handle, bool enabled, enum tpiu_pin_protocol pin_protocol,
                        uint32_t port_size, unsigned int *trace_freq)
 {
        struct stlink_usb_handle_s *h = handle;

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index cb9ef3969021f382b8c621dc19a64b4d7c53ffa5..2abed210d5b86a2ca70b0d2491a4f46f1dddc88b 100644 (file)
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -191,7 +191,7 @@ int hl_interface_override_target(const char **targetname)
        return ERROR_FAIL;
 }
 
-int hl_interface_config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
+int hl_interface_config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
                              uint32_t port_size, unsigned int *trace_freq)
 {
        if (hl_if.layout->api->config_trace)

diff --git a/src/jtag/hla/hla_layout.h b/src/jtag/hla/hla_layout.h
index 40c1321badb2761da28dfad9dc0f364c6dbb1071..9f41b59a42bc90efc5dca8e8ed88b7c8a79dd4e8 100644 (file)
--- a/src/jtag/hla/hla_layout.h
+++ b/src/jtag/hla/hla_layout.h
@@ -91,7 +91,7 @@ struct hl_layout_api_s {
         * its maximum supported rate there
         * @returns ERROR_OK on success, an error code on failure.
         */
-       int (*config_trace)(void *handle, bool enabled, enum tpio_pin_protocol pin_protocol,
+       int (*config_trace)(void *handle, bool enabled, enum tpiu_pin_protocol pin_protocol,
                            uint32_t port_size, unsigned int *trace_freq);
        /**
         * Poll for new trace data

diff --git a/src/jtag/interface.h b/src/jtag/interface.h
index cdfc676eec8993607c5c44336cde4b0b623a7a8f..e6fa0caef04b78fb553b31295bb434a19371fd67 100644 (file)
--- a/src/jtag/interface.h
+++ b/src/jtag/interface.h
@@ -309,7 +309,7 @@ struct jtag_interface {
         * its maximum supported rate there
         * @returns ERROR_OK on success, an error code on failure.
         */
-       int (*config_trace)(bool enabled, enum tpio_pin_protocol pin_protocol,
+       int (*config_trace)(bool enabled, enum tpiu_pin_protocol pin_protocol,
                            uint32_t port_size, unsigned int *trace_freq);
 
        /**
@@ -328,7 +328,7 @@ extern const char * const jtag_only[];
 
 void adapter_assert_reset(void);
 void adapter_deassert_reset(void);
-int adapter_config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
+int adapter_config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
                         uint32_t port_size, unsigned int *trace_freq);
 int adapter_poll_trace(uint8_t *buf, size_t *size);
 

diff --git a/src/target/armv7m_trace.h b/src/target/armv7m_trace.h
index 4f9939464f6c909e0de92488044acc3b262ec9e4..02bec96a172624595a36e5a60e1c406aa9666679 100644 (file)
--- a/src/target/armv7m_trace.h
+++ b/src/target/armv7m_trace.h
@@ -32,7 +32,7 @@ enum trace_config_type {
        INTERNAL        /**< trace output is handled by OpenOCD adapter driver */
 };
 
-enum tpio_pin_protocol {
+enum tpiu_pin_protocol {
        SYNC,                   /**< synchronous trace output */
        ASYNC_MANCHESTER,       /**< asynchronous output with Manchester coding */
        ASYNC_UART              /**< asynchronous output with NRZ coding */
@@ -50,7 +50,7 @@ struct armv7m_trace_config {
        enum trace_config_type config_type;
 
        /** Currently active trace output mode */
-       enum tpio_pin_protocol pin_protocol;
+       enum tpiu_pin_protocol pin_protocol;
        /** TPIU formatter enable/disable (in async mode) */
        bool formatter;
        /** Synchronous output port width */