aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schink <swo-dev@marcschink.de>2017-10-03 12:32:17 +0200
committerMarc Schink <swo-dev@marcschink.de>2017-10-03 12:59:24 +0200
commit46060352a91b69439876900b02e6d533ddaa8b22 (patch)
treed82cf5ca97a4807332a3dd33c43fbac8b0bc82d1
parent3bf686d82f69e3fc885d3d8fcca4bb37ca0371bf (diff)
Rename packet filter names for consistency
-rw-r--r--man/swodec.117
-rw-r--r--src/main.c12
2 files changed, 15 insertions, 14 deletions
diff --git a/man/swodec.1 b/man/swodec.1
index d9e39c4..866dddb 100644
--- a/man/swodec.1
+++ b/man/swodec.1
@@ -86,25 +86,26 @@ Hardware source. This is for hardware source packets which could not be decoded
as Data Watchpoint and Trace (DWT) packets.
.TP
.B dwt
-Data Watchpoint and Trace (DWT). This is a shortcut for \fBevcnt\fP,
-\fBexc\fP, \fBpc\fP, \fBdtpc\fP, \fBdtaddr\fP and \fBdtval\fP.
+Data Watchpoint and Trace (DWT). This is a shortcut for \fBevtcnt\fP,
+\fBexctrc\fP, \fBpcsample\fP, \fBpcvalue\fP, \fBaddroffset\fP and
+\fBdatavalue\fP.
.TP
-.B evcnt
+.B evtcnt
Event counter
.TP
-.B exc
+.B exctrc
Exception trace
.TP
-.B pc
+.B pcsample
Periodic PC sample
.TP
-.B dtpc
+.B pcvalue
Data trace PC value
.TP
-.B dtaddr
+.B addroffset
Data trace address offset
.TP
-.B dtval
+.B datavalue
Data trace data value
.TP
.B unknown
diff --git a/src/main.c b/src/main.c
index b24c8a7..e54c98f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -129,17 +129,17 @@ static gboolean parse_filter_option(const gchar *option_name,
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_PC_VALUE);
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_ADDR_OFFSET);
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_DATA_VALUE);
- } else if (!g_ascii_strcasecmp(tokens[i], "evcnt")) {
+ } else if (!g_ascii_strcasecmp(tokens[i], "evtcnt")) {
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_EVTCNT);
- } else if (!g_ascii_strcasecmp(tokens[i], "exc")) {
+ } else if (!g_ascii_strcasecmp(tokens[i], "exctrc")) {
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_EXCTRC);
- } else if (!g_ascii_strcasecmp(tokens[i], "pc")) {
+ } else if (!g_ascii_strcasecmp(tokens[i], "pcsample")) {
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_PC_SAMPLE);
- } else if (!g_ascii_strcasecmp(tokens[i], "dtpc")) {
+ } else if (!g_ascii_strcasecmp(tokens[i], "pcvalue")) {
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_PC_VALUE);
- } else if (!g_ascii_strcasecmp(tokens[i], "dtaddr")) {
+ } else if (!g_ascii_strcasecmp(tokens[i], "addroffset")) {
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_ADDR_OFFSET);
- } else if (!g_ascii_strcasecmp(tokens[i], "dtval")) {
+ } else if (!g_ascii_strcasecmp(tokens[i], "datavalue")) {
tmp |= (1 << LIBSWO_PACKET_TYPE_DWT_DATA_VALUE);
} else {
g_critical("Invalid packet type: %s.", tokens[i]);