Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/10205 )
Change subject: sniff: rename reset hold/release to assert/deassert
......................................................................
sniff: rename reset hold/release to assert/deassert
this change is to match the nomenclature used in cardem
Change-Id: Ide99e731cad26aec949ad14d54f46fa611a0b7f8
---
M firmware/libcommon/include/simtrace_prot.h
M firmware/libcommon/source/sniffer.c
M host/simtrace2-sniff.c
3 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/firmware/libcommon/include/simtrace_prot.h
b/firmware/libcommon/include/simtrace_prot.h
index 58e51be..878bc34 100644
--- a/firmware/libcommon/include/simtrace_prot.h
+++ b/firmware/libcommon/include/simtrace_prot.h
@@ -291,8 +291,8 @@
/* SIMTRACE_MSGT_SNIFF_CHANGE flags */
#define SNIFF_CHANGE_FLAG_CARD_INSERT (1<<0)
#define SNIFF_CHANGE_FLAG_CARD_EJECT (1<<1)
-#define SNIFF_CHANGE_FLAG_RESET_HOLD (1<<2)
-#define SNIFF_CHANGE_FLAG_RESET_RELEASE (1<<3)
+#define SNIFF_CHANGE_FLAG_RESET_ASSERT (1<<2)
+#define SNIFF_CHANGE_FLAG_RESET_DEASSERT (1<<3)
#define SNIFF_CHANGE_FLAG_TIMEOUT_WT (1<<4)
/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU
flags */
#define SNIFF_DATA_FLAG_ERROR_INCOMPLETE (1<<5)
diff --git a/firmware/libcommon/source/sniffer.c
b/firmware/libcommon/source/sniffer.c
index f99c25a..e800216 100644
--- a/firmware/libcommon/source/sniffer.c
+++ b/firmware/libcommon/source/sniffer.c
@@ -854,9 +854,9 @@
}
/* Update the ISO state according to the reset change (reset is active
low) */
if (PIO_Get(&pin_rst)) {
- change_flags |= SNIFF_CHANGE_FLAG_RESET_RELEASE; /* set flag
and let main loop send it */
+ change_flags |= SNIFF_CHANGE_FLAG_RESET_DEASSERT; /* set flag
and let main loop send it */
} else {
- change_flags |= SNIFF_CHANGE_FLAG_RESET_HOLD; /* set flag and
let main loop send it */
+ change_flags |= SNIFF_CHANGE_FLAG_RESET_ASSERT; /* set flag and
let main loop send it */
}
}
@@ -1030,12 +1030,12 @@
/* Handle flags */
if (change_flags) { /* WARNING this is not synced with the data buffer
handling */
- if (change_flags & SNIFF_CHANGE_FLAG_RESET_HOLD) {
+ if (change_flags & SNIFF_CHANGE_FLAG_RESET_ASSERT) {
if (ISO7816_S_RESET != iso_state) {
change_state(ISO7816_S_RESET);
}
}
- if (change_flags & SNIFF_CHANGE_FLAG_RESET_RELEASE) {
+ if (change_flags & SNIFF_CHANGE_FLAG_RESET_DEASSERT) {
if (ISO7816_S_WAIT_ATR != iso_state) {
change_state(ISO7816_S_WAIT_ATR);
}
diff --git a/host/simtrace2-sniff.c b/host/simtrace2-sniff.c
index 6d5766f..aeacc6b 100644
--- a/host/simtrace2-sniff.c
+++ b/host/simtrace2-sniff.c
@@ -105,12 +105,12 @@
.str = "card ejected",
},
{
- .value = SNIFF_CHANGE_FLAG_RESET_HOLD,
- .str = "reset hold",
+ .value = SNIFF_CHANGE_FLAG_RESET_ASSERT,
+ .str = "reset asserted",
},
{
- .value = SNIFF_CHANGE_FLAG_RESET_RELEASE,
- .str = "reset release",
+ .value = SNIFF_CHANGE_FLAG_RESET_DEASSERT,
+ .str = "reset de-asserted",
},
{
.value = SNIFF_CHANGE_FLAG_TIMEOUT_WT,
--
To view, visit https://gerrit.osmocom.org/10205
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide99e731cad26aec949ad14d54f46fa611a0b7f8
Gerrit-Change-Number: 10205
Gerrit-PatchSet: 1
Gerrit-Owner: Kévin Redon <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder
