<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9919">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: put spaces around operations<br><br>Change-Id: If5ba5f8d16680e8403944274336ea595017063db<br>---<br>M firmware/libcommon/source/sniffer.c<br>1 file changed, 72 insertions(+), 72 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/19/9919/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index 5ab60bb..81a6712 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -208,10 +208,10 @@</span><br><span> static uint8_t wt_wi = 10; /* Waiting time Integer (WI), used to calculate the Waiting Time (WT) */</span><br><span> static uint8_t wt_d = 1; /* baud rate adjustment integer (the actual value, not the table index) */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (0!=wi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0 != wi) {</span><br><span> wt_wi = wi;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (0!=d) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0 != d) {</span><br><span> wt_d = d;</span><br><span> }</span><br><span> wt = wt_wi*960UL*wt_d;</span><br><span>@@ -257,7 +257,7 @@</span><br><span> static void change_state(enum iso7816_3_sniff_state iso_state_new)</span><br><span> {</span><br><span> /* sanity check */</span><br><span style="color: hsl(0, 100%, 40%);">- if (iso_state_new==iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (iso_state_new == iso_state) {</span><br><span> TRACE_WARNING("Already in ISO 7816 state %u\n\r", iso_state);</span><br><span> return;</span><br><span> }</span><br><span>@@ -303,11 +303,11 @@</span><br><span> static void usb_send_atr(bool complete)</span><br><span> {</span><br><span> /* Check state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_IN_ATR!=iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_IN_ATR != iso_state) {</span><br><span> TRACE_WARNING("Can't print ATR in ISO 7816-3 state %u\n\r", iso_state);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (atr_i>=ARRAY_SIZE(atr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (atr_i >= ARRAY_SIZE(atr)) {</span><br><span> TRACE_ERROR("ATR buffer overflow\n\r");</span><br><span> return;</span><br><span> }</span><br><span>@@ -346,11 +346,11 @@</span><br><span> static uint8_t i = 0; /* interface byte subgroup number */</span><br><span> </span><br><span> /* sanity check */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_IN_ATR!=iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_IN_ATR != iso_state) {</span><br><span> TRACE_ERROR("Processing ATR data in wrong ISO 7816-3 state %u\n\r", iso_state);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (atr_i>=ARRAY_SIZE(atr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (atr_i >= ARRAY_SIZE(atr)) {</span><br><span> TRACE_ERROR("ATR data overflow\n\r");</span><br><span> return;</span><br><span> }</span><br><span>@@ -377,37 +377,37 @@</span><br><span> break;</span><br><span> case ATR_S_WAIT_T0: /* see ISO/IEC 7816-3:2006 section 8.2.2 */</span><br><span> case ATR_S_WAIT_TD: /* see ISO/IEC 7816-3:2006 section 8.2.3 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ATR_S_WAIT_T0==atr_state) {</span><br><span style="color: hsl(0, 100%, 40%);">- atr_hist_len = (byte&0x0f); /* save the number of historical bytes */</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ATR_S_WAIT_TD==atr_state) {</span><br><span style="color: hsl(0, 100%, 40%);">- t_protocol_support |= (1<<(byte&0x0f)); /* remember supported protocol to know if TCK will be present */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ATR_S_WAIT_T0 == atr_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ atr_hist_len = (byte & 0x0f); /* save the number of historical bytes */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ATR_S_WAIT_TD == atr_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ t_protocol_support |= (1<<(byte & 0x0f)); /* remember supported protocol to know if TCK will be present */</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- y = (byte&0xf0); /* remember upcoming interface bytes */</span><br><span style="color: hsl(120, 100%, 40%);">+ y = (byte & 0xf0); /* remember upcoming interface bytes */</span><br><span> i++; /* next interface byte sub-group is coming */</span><br><span style="color: hsl(0, 100%, 40%);">- if (y&0x10) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (y & 0x10) {</span><br><span> atr_state = ATR_S_WAIT_TA; /* wait for interface byte TA */</span><br><span> break;</span><br><span> }</span><br><span> case ATR_S_WAIT_TA: /* see ISO/IEC 7816-3:2006 section 8.2.3 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (y&0x20) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (y & 0x20) {</span><br><span> atr_state = ATR_S_WAIT_TB; /* wait for interface byte TB */</span><br><span> break;</span><br><span> }</span><br><span> case ATR_S_WAIT_TB: /* see ISO/IEC 7816-3:2006 section 8.2.3 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (y&0x40) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (y & 0x40) {</span><br><span> atr_state = ATR_S_WAIT_TC; /* wait for interface byte TC */</span><br><span> break;</span><br><span> }</span><br><span> case ATR_S_WAIT_TC: /* see ISO/IEC 7816-3:2006 section 8.2.3 */</span><br><span> /* retrieve WI encoded in TC2*/</span><br><span> if (ATR_S_WAIT_TC==atr_state && 2==i) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (0==byte) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0 == byte) {</span><br><span> update_wt(10, 0);</span><br><span> } else {</span><br><span> update_wt(byte, 0);</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (y&0x80) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (y & 0x80) {</span><br><span> atr_state = ATR_S_WAIT_TD; /* wait for interface byte TD */</span><br><span> break;</span><br><span> } else if (atr_hist_len) {</span><br><span>@@ -418,8 +418,8 @@</span><br><span> if (atr_hist_len) {</span><br><span> atr_hist_len--;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (0==atr_hist_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (t_protocol_support>1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0 == atr_hist_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (t_protocol_support > 1) {</span><br><span> atr_state = ATR_S_WAIT_TCK; /* wait for check bytes */</span><br><span> break;</span><br><span> }</span><br><span>@@ -445,9 +445,9 @@</span><br><span> uint8_t *pps_cur; /* current PPS (request or response) */</span><br><span> </span><br><span> /* Sanity check */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_IN_PPS_REQ==iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_IN_PPS_REQ == iso_state) {</span><br><span> pps_cur = pps_req;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ISO7816_S_IN_PPS_RSP==iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ISO7816_S_IN_PPS_RSP == iso_state) {</span><br><span> pps_cur = pps_rsp;</span><br><span> } else {</span><br><span> TRACE_ERROR("Can't print PPS in ISO 7816-3 state %u\n\r", iso_state);</span><br><span>@@ -457,22 +457,22 @@</span><br><span> /* Get only relevant data */</span><br><span> uint8_t pps[6];</span><br><span> uint8_t pps_i = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_state>PPS_S_WAIT_PPSS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_state > PPS_S_WAIT_PPSS) {</span><br><span> pps[pps_i++] = pps_cur[0];</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_state>PPS_S_WAIT_PPS0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_state > PPS_S_WAIT_PPS0) {</span><br><span> pps[pps_i++] = pps_cur[1];</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_state>PPS_S_WAIT_PPS1 && pps_cur[1]&0x10) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_state > PPS_S_WAIT_PPS1 && pps_cur[1] & 0x10) {</span><br><span> pps[pps_i++] = pps_cur[2];</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_state>PPS_S_WAIT_PPS2 && pps_cur[1]&0x20) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_state > PPS_S_WAIT_PPS2 && pps_cur[1] & 0x20) {</span><br><span> pps[pps_i++] = pps_cur[3];</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_state>PPS_S_WAIT_PPS3 && pps_cur[1]&0x40) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_state > PPS_S_WAIT_PPS3 && pps_cur[1] & 0x40) {</span><br><span> pps[pps_i++] = pps_cur[4];</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_state>PPS_S_WAIT_PCK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_state > PPS_S_WAIT_PCK) {</span><br><span> pps[pps_i++] = pps_cur[5];</span><br><span> }</span><br><span> </span><br><span>@@ -520,9 +520,9 @@</span><br><span> uint8_t *pps_cur; /* current PPS (request or response) */</span><br><span> </span><br><span> /* sanity check */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_IN_PPS_REQ==iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_IN_PPS_REQ == iso_state) {</span><br><span> pps_cur = pps_req;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ISO7816_S_IN_PPS_RSP==iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ISO7816_S_IN_PPS_RSP == iso_state) {</span><br><span> pps_cur = pps_rsp;</span><br><span> } else {</span><br><span> TRACE_ERROR("Processing PPS data in wrong ISO 7816-3 state %u\n\r", iso_state);</span><br><span>@@ -542,19 +542,19 @@</span><br><span> break;</span><br><span> case PPS_S_WAIT_PPS0: /*!< format byte */</span><br><span> pps_cur[1] = byte;</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_cur[1]&0x10) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_cur[1] & 0x10) {</span><br><span> pps_state = PPS_S_WAIT_PPS1; /* go to next state */</span><br><span> break;</span><br><span> }</span><br><span> case PPS_S_WAIT_PPS1: /*!< first parameter byte */</span><br><span> pps_cur[2] = byte; /* not always right but doesn't affect the process */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_cur[1]&0x20) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_cur[1] & 0x20) {</span><br><span> pps_state = PPS_S_WAIT_PPS2; /* go to next state */</span><br><span> break;</span><br><span> }</span><br><span> case PPS_S_WAIT_PPS2: /*!< second parameter byte */</span><br><span> pps_cur[3] = byte; /* not always right but doesn't affect the process */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_cur[1]&0x40) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_cur[1] & 0x40) {</span><br><span> pps_state = PPS_S_WAIT_PPS3; /* go to next state */</span><br><span> break;</span><br><span> }</span><br><span>@@ -568,30 +568,30 @@</span><br><span> uint8_t check = 0; </span><br><span> check ^= pps_cur[0];</span><br><span> check ^= pps_cur[1];</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_cur[1]&0x10) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_cur[1] & 0x10) {</span><br><span> check ^= pps_cur[2];</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_cur[1]&0x20) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_cur[1] & 0x20) {</span><br><span> check ^= pps_cur[3];</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_cur[1]&0x40) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_cur[1] & 0x40) {</span><br><span> check ^= pps_cur[4];</span><br><span> }</span><br><span> check ^= pps_cur[5];</span><br><span> pps_state = PPS_S_WAIT_END;</span><br><span> usb_send_pps(true); /* send PPS to host software using USB */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_IN_PPS_REQ==iso_state) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (0==check) { /* checksum is valid */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_IN_PPS_REQ == iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0 == check) { /* checksum is valid */</span><br><span> change_state(ISO7816_S_WAIT_PPS_RSP); /* go to next state */</span><br><span> } else { /* checksum is invalid */</span><br><span> change_state(ISO7816_S_WAIT_TPDU); /* go to next state */</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ISO7816_S_IN_PPS_RSP==iso_state) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (0==check) { /* checksum is valid */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ISO7816_S_IN_PPS_RSP == iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0 == check) { /* checksum is valid */</span><br><span> uint8_t fn, dn;</span><br><span style="color: hsl(0, 100%, 40%);">- if (pps_cur[1]&0x10) {</span><br><span style="color: hsl(0, 100%, 40%);">- fn = (pps_cur[2]>>4);</span><br><span style="color: hsl(0, 100%, 40%);">- dn = (pps_cur[2]&0x0f);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pps_cur[1] & 0x10) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fn = (pps_cur[2] >> 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ dn = (pps_cur[2] & 0x0f);</span><br><span> } else {</span><br><span> fn = 1;</span><br><span> dn = 1;</span><br><span>@@ -622,7 +622,7 @@</span><br><span> static void usb_send_tpdu(bool complete)</span><br><span> {</span><br><span> /* Check state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_IN_TPDU!=iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_IN_TPDU != iso_state) {</span><br><span> TRACE_WARNING("Can't print TPDU in ISO 7816-3 state %u\n\r", iso_state);</span><br><span> return;</span><br><span> }</span><br><span>@@ -654,11 +654,11 @@</span><br><span> static void process_byte_tpdu(uint8_t byte)</span><br><span> {</span><br><span> /* sanity check */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_IN_TPDU!=iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_IN_TPDU != iso_state) {</span><br><span> TRACE_ERROR("Processing TPDU data in wrong ISO 7816-3 state %u\n\r", iso_state);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (tpdu_packet_i>=ARRAY_SIZE(tpdu_packet)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tpdu_packet_i >= ARRAY_SIZE(tpdu_packet)) {</span><br><span> TRACE_ERROR("TPDU data overflow\n\r");</span><br><span> return;</span><br><span> }</span><br><span>@@ -666,7 +666,7 @@</span><br><span> /* handle TPDU byte depending on current state */</span><br><span> switch (tpdu_state) {</span><br><span> case TPDU_S_CLA:</span><br><span style="color: hsl(0, 100%, 40%);">- if (0xff==byte) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0xff == byte) {</span><br><span> TRACE_WARNING("0xff is not a valid class byte\n\r");</span><br><span> change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span> return;</span><br><span>@@ -676,7 +676,7 @@</span><br><span> tpdu_state = TPDU_S_INS;</span><br><span> break;</span><br><span> case TPDU_S_INS:</span><br><span style="color: hsl(0, 100%, 40%);">- if ((0x60==(byte&0xf0)) || (0x90==(byte&0xf0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) {</span><br><span> TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);</span><br><span> change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span> return;</span><br><span>@@ -701,17 +701,17 @@</span><br><span> tpdu_state = TPDU_S_PROCEDURE;</span><br><span> break;</span><br><span> case TPDU_S_PROCEDURE:</span><br><span style="color: hsl(0, 100%, 40%);">- if (0x60==byte) { /* wait for next procedure byte */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0x60 == byte) { /* wait for next procedure byte */</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (tpdu_packet[1]==byte) { /* get all remaining data bytes */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (tpdu_packet[1] == byte) { /* get all remaining data bytes */</span><br><span> tpdu_state = TPDU_S_DATA_REMAINING;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if ((~tpdu_packet[1])==byte) { /* get single data byte */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if ((~tpdu_packet[1]) == byte) { /* get single data byte */</span><br><span> tpdu_state = TPDU_S_DATA_SINGLE;</span><br><span> break;</span><br><span> }</span><br><span> case TPDU_S_SW1:</span><br><span style="color: hsl(0, 100%, 40%);">- if ((0x60==(byte&0xf0)) || (0x90==(byte&0xf0))) { /* this procedure byte is SW1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) { /* this procedure byte is SW1 */</span><br><span> tpdu_packet[tpdu_packet_i++] = byte;</span><br><span> tpdu_state = TPDU_S_SW2;</span><br><span> } else {</span><br><span>@@ -728,16 +728,16 @@</span><br><span> case TPDU_S_DATA_SINGLE:</span><br><span> case TPDU_S_DATA_REMAINING:</span><br><span> tpdu_packet[tpdu_packet_i++] = byte;</span><br><span style="color: hsl(0, 100%, 40%);">- if (0==tpdu_packet[4]) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (5+256<=tpdu_packet_i) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0 == tpdu_packet[4]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (5+256 <= tpdu_packet_i) {</span><br><span> tpdu_state = TPDU_S_PROCEDURE;</span><br><span> }</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- if (5+tpdu_packet[4]<=tpdu_packet_i) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (5+tpdu_packet[4] <= tpdu_packet_i) {</span><br><span> tpdu_state = TPDU_S_PROCEDURE;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (TPDU_S_DATA_SINGLE==tpdu_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TPDU_S_DATA_SINGLE == tpdu_state) {</span><br><span> tpdu_state = TPDU_S_PROCEDURE;</span><br><span> }</span><br><span> break;</span><br><span>@@ -780,15 +780,15 @@</span><br><span> </span><br><span> /* Verify it WT timeout occurred, to detect unresponsive card */</span><br><span> if (csr & US_CSR_TIMEOUT) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (wt_remaining<=(sniff_usart.base->US_RTOR&0xffff)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (wt_remaining <= (sniff_usart.base->US_RTOR & 0xffff)) {</span><br><span> /* Just set the flag and let the main loop handle it */</span><br><span> change_flags |= SNIFF_CHANGE_FLAG_TIMEOUT_WT;</span><br><span> /* Reset timeout value */</span><br><span> wt_remaining = wt;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- wt_remaining -= (sniff_usart.base->US_RTOR&0xffff); /* be sure to subtract the actual timeout since the new might not have been set and reloaded yet */</span><br><span style="color: hsl(120, 100%, 40%);">+ wt_remaining -= (sniff_usart.base->US_RTOR & 0xffff); /* be sure to subtract the actual timeout since the new might not have been set and reloaded yet */</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (wt_remaining>0xffff) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (wt_remaining > 0xffff) {</span><br><span> sniff_usart.base->US_RTOR = 0xffff;</span><br><span> } else {</span><br><span> sniff_usart.base->US_RTOR = wt_remaining;</span><br><span>@@ -807,17 +807,17 @@</span><br><span> static void Sniffer_reset_isr(const Pin* pPin)</span><br><span> {</span><br><span> /* Ensure an edge on the reset pin cause the interrupt */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pPin->id!=pin_rst.id || 0==(pPin->mask&pin_rst.mask)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pPin->id != pin_rst.id || 0 == (pPin->mask & pin_rst.mask)) {</span><br><span> TRACE_ERROR("Pin other than reset caused a interrupt\n\r");</span><br><span> return;</span><br><span> }</span><br><span> /* Update the ISO state according to the reset change */</span><br><span> if (PIO_Get(&pin_rst)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_WAIT_ATR!=iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_WAIT_ATR != iso_state) {</span><br><span> change_state(ISO7816_S_WAIT_ATR);</span><br><span> }</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_RESET!=iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_RESET != iso_state) {</span><br><span> change_state(ISO7816_S_RESET);</span><br><span> }</span><br><span> }</span><br><span>@@ -829,14 +829,14 @@</span><br><span> </span><br><span> void Sniffer_usart1_irq(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ID_USART1==sniff_usart.id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ID_USART1 == sniff_usart.id) {</span><br><span> Sniffer_usart_isr();</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> void Sniffer_usart0_irq(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ID_USART0==sniff_usart.id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ID_USART0 == sniff_usart.id) {</span><br><span> Sniffer_usart_isr();</span><br><span> }</span><br><span> }</span><br><span>@@ -894,14 +894,14 @@</span><br><span> /* Enable interrupt to indicate when data has been received or timeout occurred */</span><br><span> USART_EnableIt(sniff_usart.base, US_IER_RXRDY | US_IER_TIMEOUT);</span><br><span> /* Set USB priority lower than USART to not miss sniffing data (both at 0 per default) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (NVIC_GetPriority(IRQ_USART_SIM)>=NVIC_GetPriority(UDP_IRQn)) {</span><br><span style="color: hsl(0, 100%, 40%);">- NVIC_SetPriority(UDP_IRQn, NVIC_GetPriority(IRQ_USART_SIM)+2);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (NVIC_GetPriority(IRQ_USART_SIM) >= NVIC_GetPriority(UDP_IRQn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ NVIC_SetPriority(UDP_IRQn, NVIC_GetPriority(IRQ_USART_SIM) + 2);</span><br><span> }</span><br><span> /* Enable interrupt requests for the USART peripheral */</span><br><span> NVIC_EnableIRQ(IRQ_USART_SIM);</span><br><span> </span><br><span> /* Reset state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_RESET!=iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_RESET != iso_state) {</span><br><span> change_state(ISO7816_S_RESET);</span><br><span> }</span><br><span> }</span><br><span>@@ -912,11 +912,11 @@</span><br><span> static void usb_send_change(uint32_t flags)</span><br><span> {</span><br><span> /* Check flags */</span><br><span style="color: hsl(0, 100%, 40%);">- if(0==flags) { /* no changes */</span><br><span style="color: hsl(120, 100%, 40%);">+ if(0 == flags) { /* no changes */</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags&SNIFF_CHANGE_FLAG_TIMEOUT_WT) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT) {</span><br><span> printf("waiting time (WT) timeout\n\r");</span><br><span> }</span><br><span> </span><br><span>@@ -963,8 +963,8 @@</span><br><span> break;</span><br><span> case ISO7816_S_WAIT_TPDU: /* After the ATR we expect TPDU or PPS data */</span><br><span> case ISO7816_S_WAIT_PPS_RSP:</span><br><span style="color: hsl(0, 100%, 40%);">- if (byte == 0xff) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_WAIT_PPS_RSP==iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0xff == byte) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_WAIT_PPS_RSP == iso_state) {</span><br><span> change_state(ISO7816_S_IN_PPS_RSP); /* Go to PPS state */</span><br><span> } else {</span><br><span> change_state(ISO7816_S_IN_PPS_REQ); /* Go to PPS state */</span><br><span>@@ -973,7 +973,7 @@</span><br><span> break;</span><br><span> }</span><br><span> case ISO7816_S_IN_TPDU: /* More TPDU data incoming */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ISO7816_S_WAIT_TPDU==iso_state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ISO7816_S_WAIT_TPDU == iso_state) {</span><br><span> change_state(ISO7816_S_IN_TPDU);</span><br><span> }</span><br><span> process_byte_tpdu(byte);</span><br><span>@@ -989,7 +989,7 @@</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_TIMEOUT_WT) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (change_flags & SNIFF_CHANGE_FLAG_TIMEOUT_WT) {</span><br><span> /* Use timeout to detect interrupted data transmission */</span><br><span> switch (iso_state) {</span><br><span> case ISO7816_S_IN_ATR:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9919">change 9919</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/9919"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If5ba5f8d16680e8403944274336ea595017063db </div>
<div style="display:none"> Gerrit-Change-Number: 9919 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>