sim-card
/
simtrace2
mirror of https://gerrit.osmocom.org/simtrace2
10
0
Fork 0
Code Issues Releases Wiki Activity

sniff: rename reset hold/release to assert/deassert 

this change is to match the nomenclature used in cardem

Change-Id: Ide99e731cad26aec949ad14d54f46fa611a0b7f8
This commit is contained in:
Kevin Redon 2018-07-26 15:34:03 +02:00
parent d1c6536154
commit 8e84f8125c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/libcommon/include/simtrace_prot.h
View File

@ -291,8 +291,8 @@ struct st_modem_status {
/* 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)

8
firmware/libcommon/source/sniffer.c
View File

@ -854,9 +854,9 @@ static void Sniffer_reset_isr(const Pin* pPin)
}
/* 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 @@ void Sniffer_run(void)
/* 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);
}

8
host/simtrace2-sniff.c
View File

@ -105,12 +105,12 @@ const struct value_string change_flags[] = {
.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,