<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10205">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sniff: rename reset hold/release to assert/deassert<br><br>this change is to match the nomenclature used in cardem<br><br>Change-Id: Ide99e731cad26aec949ad14d54f46fa611a0b7f8<br>---<br>M firmware/libcommon/include/simtrace_prot.h<br>M firmware/libcommon/source/sniffer.c<br>M host/simtrace2-sniff.c<br>3 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/include/simtrace_prot.h b/firmware/libcommon/include/simtrace_prot.h</span><br><span>index 58e51be..878bc34 100644</span><br><span>--- a/firmware/libcommon/include/simtrace_prot.h</span><br><span>+++ b/firmware/libcommon/include/simtrace_prot.h</span><br><span>@@ -291,8 +291,8 @@</span><br><span> /* SIMTRACE_MSGT_SNIFF_CHANGE flags */</span><br><span> #define SNIFF_CHANGE_FLAG_CARD_INSERT (1<<0)</span><br><span> #define SNIFF_CHANGE_FLAG_CARD_EJECT (1<<1)</span><br><span style="color: hsl(0, 100%, 40%);">-#define SNIFF_CHANGE_FLAG_RESET_HOLD (1<<2)</span><br><span style="color: hsl(0, 100%, 40%);">-#define SNIFF_CHANGE_FLAG_RESET_RELEASE (1<<3)</span><br><span style="color: hsl(120, 100%, 40%);">+#define SNIFF_CHANGE_FLAG_RESET_ASSERT (1<<2)</span><br><span style="color: hsl(120, 100%, 40%);">+#define SNIFF_CHANGE_FLAG_RESET_DEASSERT (1<<3)</span><br><span> #define SNIFF_CHANGE_FLAG_TIMEOUT_WT (1<<4)</span><br><span> /* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU flags */</span><br><span> #define SNIFF_DATA_FLAG_ERROR_INCOMPLETE (1<<5)</span><br><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index f99c25a..e800216 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -854,9 +854,9 @@</span><br><span> }</span><br><span> /* Update the ISO state according to the reset change (reset is active low) */</span><br><span> if (PIO_Get(&pin_rst)) {</span><br><span style="color: hsl(0, 100%, 40%);">- change_flags |= SNIFF_CHANGE_FLAG_RESET_RELEASE; /* set flag and let main loop send it */</span><br><span style="color: hsl(120, 100%, 40%);">+ change_flags |= SNIFF_CHANGE_FLAG_RESET_DEASSERT; /* set flag and let main loop send it */</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- change_flags |= SNIFF_CHANGE_FLAG_RESET_HOLD; /* set flag and let main loop send it */</span><br><span style="color: hsl(120, 100%, 40%);">+ change_flags |= SNIFF_CHANGE_FLAG_RESET_ASSERT; /* set flag and let main loop send it */</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -1030,12 +1030,12 @@</span><br><span> </span><br><span> /* Handle flags */</span><br><span> if (change_flags) { /* WARNING this is not synced with the data buffer handling */</span><br><span style="color: hsl(0, 100%, 40%);">- if (change_flags & SNIFF_CHANGE_FLAG_RESET_HOLD) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (change_flags & SNIFF_CHANGE_FLAG_RESET_ASSERT) {</span><br><span> if (ISO7816_S_RESET != iso_state) {</span><br><span> change_state(ISO7816_S_RESET);</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (change_flags & SNIFF_CHANGE_FLAG_RESET_RELEASE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (change_flags & SNIFF_CHANGE_FLAG_RESET_DEASSERT) {</span><br><span> if (ISO7816_S_WAIT_ATR != iso_state) {</span><br><span> change_state(ISO7816_S_WAIT_ATR);</span><br><span> }</span><br><span>diff --git a/host/simtrace2-sniff.c b/host/simtrace2-sniff.c</span><br><span>index 6d5766f..aeacc6b 100644</span><br><span>--- a/host/simtrace2-sniff.c</span><br><span>+++ b/host/simtrace2-sniff.c</span><br><span>@@ -105,12 +105,12 @@</span><br><span> .str = "card ejected",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = SNIFF_CHANGE_FLAG_RESET_HOLD,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "reset hold",</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = SNIFF_CHANGE_FLAG_RESET_ASSERT,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "reset asserted",</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = SNIFF_CHANGE_FLAG_RESET_RELEASE,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "reset release",</span><br><span style="color: hsl(120, 100%, 40%);">+ .value = SNIFF_CHANGE_FLAG_RESET_DEASSERT,</span><br><span style="color: hsl(120, 100%, 40%);">+ .str = "reset de-asserted",</span><br><span> },</span><br><span> {</span><br><span> .value = SNIFF_CHANGE_FLAG_TIMEOUT_WT,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10205">change 10205</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10205"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ide99e731cad26aec949ad14d54f46fa611a0b7f8 </div>
<div style="display:none"> Gerrit-Change-Number: 10205 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>