diff options
| author | Tim Newsome <tim@sifive.com> | 2019-04-03 12:38:27 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2019-04-03 12:38:27 -0700 |
| commit | 79f9672615dfe77d415bdd7a404f1e149e31b16d (patch) | |
| tree | 9af22013cb9ef87f97c92a0136d1d88e1b354587 /src/target/armv7m_trace.c | |
| parent | c089e6ae9a37d134e92a3d40c2be13003ea09d61 (diff) | |
| parent | 11a2bfc2bcedfad0ecb1b8d7f68ac7208cd6b8c0 (diff) | |
| download | riscv-openocd-79f9672615dfe77d415bdd7a404f1e149e31b16d.zip riscv-openocd-79f9672615dfe77d415bdd7a404f1e149e31b16d.tar.gz riscv-openocd-79f9672615dfe77d415bdd7a404f1e149e31b16d.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
src/flash/nor/at91sam4.c
src/flash/nor/at91sam4l.c
src/flash/nor/at91samd.c
src/flash/nor/ath79.c
src/flash/nor/atsame5.c
src/flash/nor/cfi.c
src/flash/nor/core.c
src/flash/nor/fespi.c
src/flash/nor/kinetis.c
src/flash/nor/kinetis_ke.c
src/flash/nor/lpc2000.c
src/flash/nor/niietcm4.c
src/flash/nor/nrf5.c
src/flash/nor/numicro.c
src/flash/nor/pic32mx.c
src/flash/nor/stm32h7x.c
src/flash/nor/stm32lx.c
src/flash/nor/stmsmi.c
src/flash/nor/tcl.c
src/flash/nor/tms470.c
src/flash/nor/virtual.c
src/flash/nor/xmc4xxx.c
src/rtos/hwthread.c
src/rtos/rtos.c
src/server/gdb_server.c
src/target/riscv/riscv-011.c
src/target/riscv/riscv-013.c
src/target/riscv/riscv.c
src/target/riscv/riscv.h
Change-Id: I9f0f373d45a9e5845bca83ca52e977f727ea4425
Diffstat (limited to 'src/target/armv7m_trace.c')
| -rw-r--r-- | src/target/armv7m_trace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/target/armv7m_trace.c b/src/target/armv7m_trace.c index 62f0f8e..6170119 100644 --- a/src/target/armv7m_trace.c +++ b/src/target/armv7m_trace.c @@ -116,7 +116,8 @@ int armv7m_trace_tpiu_config(struct target *target) return retval; if (trace_config->config_type == TRACE_CONFIG_TYPE_INTERNAL) - target_register_timer_callback(armv7m_poll_trace, 1, 1, target); + target_register_timer_callback(armv7m_poll_trace, 1, + TARGET_TIMER_TYPE_PERIODIC, target); target_call_event_callbacks(target, TARGET_EVENT_TRACE_CONFIG); |