<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16637">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: Reformat value_string to pass our validation scripts<br><br>This is a purely cosmetic change in terms of coding style, but it<br>fixes an [invalid] detection for unterminated value_string arrays<br>by our verify_value_string_arrays_are_terminated.py script:<br><br>Change-Id: I2f2370a673074f6bf5380106b6254b4aa1e8a792<br>ERROR: file contains unterminated value_string 'struct value_string iso7816_3_card_state_names[]': './deps/simtrace2/firmware/libcommon/source/card_emu.c'<br>ERROR: file contains unterminated value_string 'struct value_string tpdu_state_names[]': './deps/simtrace2/firmware/libcommon/source/card_emu.c'<br>---<br>M firmware/libcommon/source/card_emu.c<br>M firmware/libcommon/source/sniffer.c<br>2 files changed, 22 insertions(+), 88 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/37/16637/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c</span><br><span>index 7a541e5..cad24b8 100644</span><br><span>--- a/firmware/libcommon/source/card_emu.c</span><br><span>+++ b/firmware/libcommon/source/card_emu.c</span><br><span>@@ -58,42 +58,15 @@</span><br><span> };</span><br><span> </span><br><span> const struct value_string iso7816_3_card_state_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = ISO_S_WAIT_POWER,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_POWER",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = ISO_S_WAIT_CLK,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_CLK",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = ISO_S_WAIT_RST,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_RST",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = ISO_S_WAIT_ATR,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_ATR",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = ISO_S_IN_ATR,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "IN_ATR",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = ISO_S_IN_PTS,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "IN_PTS",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = ISO_S_WAIT_TPDU,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_TPDU",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = ISO_S_IN_TPDU,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "IN_TPDU",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(120, 100%, 40%);">+ { ISO_S_WAIT_POWER, "WAIT_POWER" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { ISO_S_WAIT_CLK, "WAIT_CLK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { ISO_S_WAIT_RST, "WAIT_RST" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { ISO_S_WAIT_ATR, "WAIT_ATR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { ISO_S_IN_ATR, "IN_ATR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { ISO_S_IN_PTS, "IN_PTS" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { ISO_S_WAIT_TPDU, "WAIT_TPDU" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { ISO_S_IN_TPDU, "IN_TPDU" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span> };</span><br><span> </span><br><span> </span><br><span>@@ -150,42 +123,15 @@</span><br><span> };</span><br><span> </span><br><span> const struct value_string tpdu_state_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = TPDU_S_WAIT_CLA,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_CLA",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = TPDU_S_WAIT_INS,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_INS",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = TPDU_S_WAIT_P1,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_P1",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = TPDU_S_WAIT_P2,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_P2",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = TPDU_S_WAIT_P3,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_P3",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = TPDU_S_WAIT_PB,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_PB",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = TPDU_S_WAIT_RX,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_RX",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = TPDU_S_WAIT_TX,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "WAIT_TX",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TPDU_S_WAIT_CLA, "WAIT_CLA" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TPDU_S_WAIT_INS, "WAIT_INS" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TPDU_S_WAIT_P1, "WAIT_P1" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TPDU_S_WAIT_P2, "WAIT_P2" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TPDU_S_WAIT_P3, "WAIT_P3" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TPDU_S_WAIT_PB, "WAIT_PB" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TPDU_S_WAIT_RX, "WAIT_RX" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TPDU_S_WAIT_TX, "WAIT_TX" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span> };</span><br><span> </span><br><span> /* TPDU field byte index */</span><br><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index 82c4b3f..08770e2 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -303,22 +303,10 @@</span><br><span> }</span><br><span> </span><br><span> const struct value_string data_flags[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "incomplete",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = SNIFF_DATA_FLAG_ERROR_MALFORMED,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "malformed",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = SNIFF_DATA_FLAG_ERROR_CHECKSUM,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = "checksum error",</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- .value = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- .str = NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SNIFF_DATA_FLAG_ERROR_INCOMPLETE, "incomplete" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SNIFF_DATA_FLAG_ERROR_MALFORMED, "malformed" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SNIFF_DATA_FLAG_ERROR_CHECKSUM, "checksum error" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span> };</span><br><span> </span><br><span> static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16637">change 16637</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/c/simtrace2/+/16637"/><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-Change-Id: I2f2370a673074f6bf5380106b6254b4aa1e8a792 </div>
<div style="display:none"> Gerrit-Change-Number: 16637 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>