zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bscan_tunnel
Marc Schink 2016-12-10 12:48:44 +01:00 committed by Paul Fertser
parent abc270c883
commit 55abb63752
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jtag/core.c
View File

@ -1843,7 +1843,7 @@ void adapter_deassert_reset(void)
LOG_ERROR("transport is not selected"); 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) uint32_t port_size, unsigned int *trace_freq)
{ {
if (jtag->config_trace) if (jtag->config_trace)

2
src/jtag/drivers/jlink.c
View File

@ -1263,7 +1263,7 @@ static bool check_trace_freq(struct jaylink_swo_speed speed,
return false; 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) uint32_t port_size, unsigned int *trace_freq)
{ {
int ret; int ret;

2
src/jtag/drivers/stlink_usb.c
View File

@ -2194,7 +2194,7 @@ error_open:
return ERROR_FAIL; 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) uint32_t port_size, unsigned int *trace_freq)
{ {
struct stlink_usb_handle_s *h = handle; struct stlink_usb_handle_s *h = handle;

2
src/jtag/hla/hla_interface.c
View File

@ -191,7 +191,7 @@ int hl_interface_override_target(const char **targetname)
return ERROR_FAIL; 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) uint32_t port_size, unsigned int *trace_freq)
{ {
if (hl_if.layout->api->config_trace) if (hl_if.layout->api->config_trace)

2
src/jtag/hla/hla_layout.h
View File

@ -91,7 +91,7 @@ struct hl_layout_api_s {
* its maximum supported rate there * its maximum supported rate there
* @returns ERROR_OK on success, an error code on failure. * @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); uint32_t port_size, unsigned int *trace_freq);
/** /**
* Poll for new trace data * Poll for new trace data

4
src/jtag/interface.h
View File

@ -309,7 +309,7 @@ struct jtag_interface {
* its maximum supported rate there * its maximum supported rate there
* @returns ERROR_OK on success, an error code on failure. * @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); 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_assert_reset(void);
void adapter_deassert_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); uint32_t port_size, unsigned int *trace_freq);
int adapter_poll_trace(uint8_t *buf, size_t *size); int adapter_poll_trace(uint8_t *buf, size_t *size);

4
src/target/armv7m_trace.h
View File

@ -32,7 +32,7 @@ enum trace_config_type {
INTERNAL /**< trace output is handled by OpenOCD adapter driver */ INTERNAL /**< trace output is handled by OpenOCD adapter driver */
}; };
enum tpio_pin_protocol { enum tpiu_pin_protocol {
SYNC, /**< synchronous trace output */ SYNC, /**< synchronous trace output */
ASYNC_MANCHESTER, /**< asynchronous output with Manchester coding */ ASYNC_MANCHESTER, /**< asynchronous output with Manchester coding */
ASYNC_UART /**< asynchronous output with NRZ coding */ ASYNC_UART /**< asynchronous output with NRZ coding */
@ -50,7 +50,7 @@ struct armv7m_trace_config {
enum trace_config_type config_type; enum trace_config_type config_type;
/** Currently active trace output mode */ /** Currently active trace output mode */
enum tpio_pin_protocol pin_protocol; enum tpiu_pin_protocol pin_protocol;
/** TPIU formatter enable/disable (in async mode) */ /** TPIU formatter enable/disable (in async mode) */
bool formatter; bool formatter;
/** Synchronous output port width */ /** Synchronous output port width */