<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16278">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debug code to measure uart timing using the CAN header<br><br>Change-Id: I5f2c174076b5599dcb56f887330de27f470aeffc<br>---<br>M ccid_common/iso7816_fsm.c<br>M sysmoOCTSIM/hpl/sercom/hpl_sercom.c<br>M sysmoOCTSIM/main.c<br>3 files changed, 37 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c</span><br><span>index 98c32d3..031f6b0 100644</span><br><span>--- a/ccid_common/iso7816_fsm.c</span><br><span>+++ b/ccid_common/iso7816_fsm.c</span><br><span>@@ -1134,6 +1134,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <hal_gpio.h></span><br><span> static void tpdu_s_tx_hdr_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> OSMO_ASSERT(fi->fsm == &tpdu_fsm);</span><br><span>@@ -1173,6 +1174,12 @@</span><br><span> } else if (byte == tpduh->ins) {</span><br><span> if (tfp->is_command) {</span><br><span> /* transmit all remaining bytes */</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+// rx -> tx delay</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ delay_us(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, false);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> card_uart_tx(ip->uart, msgb_l2(tfp->tpdu), msgb_l2len(tfp->tpdu), true);</span><br><span> osmo_fsm_inst_state_chg(fi, TPDU_S_TX_REMAINING, 0, 0);</span><br><span> } else {</span><br><span>diff --git a/sysmoOCTSIM/hpl/sercom/hpl_sercom.c b/sysmoOCTSIM/hpl/sercom/hpl_sercom.c</span><br><span>index f235115..272fb07 100644</span><br><span>--- a/sysmoOCTSIM/hpl/sercom/hpl_sercom.c</span><br><span>+++ b/sysmoOCTSIM/hpl/sercom/hpl_sercom.c</span><br><span>@@ -577,7 +577,7 @@</span><br><span> hri_sercomusart_write_INTEN_ERROR_bit(device->hw, state);</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#include <hal_gpio.h></span><br><span> /**</span><br><span> * \internal Sercom interrupt handler</span><br><span> *</span><br><span>@@ -591,6 +591,12 @@</span><br><span> hri_sercomusart_clear_INTEN_DRE_bit(hw);</span><br><span> device->usart_cb.tx_byte_sent(device);</span><br><span> } else if (hri_sercomusart_get_interrupt_TXC_bit(hw) && hri_sercomusart_get_INTEN_TXC_bit(hw)) {</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+// tx byte last edge <-> txc irq delay</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ delay_us(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, false);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> hri_sercomusart_clear_INTEN_TXC_bit(hw);</span><br><span> device->usart_cb.tx_done_cb(device);</span><br><span> } else if (hri_sercomusart_get_interrupt_RXC_bit(hw)) {</span><br><span>@@ -600,8 +606,20 @@</span><br><span> hri_sercomusart_clear_STATUS_reg(hw, SERCOM_USART_STATUS_MASK);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+// rx byte last edge <-> rxc irq delay</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ delay_us(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, false);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> device->usart_cb.rx_done_cb(device, hri_sercomusart_read_DATA_reg(hw));</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+// rx byte last edge <-> rxc irq end delay</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ delay_us(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, false);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } else if (hri_sercomusart_get_interrupt_ERROR_bit(hw)) {</span><br><span> uint32_t status;</span><br><span> </span><br><span>diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c</span><br><span>index a1b84b7..54616af 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -506,6 +506,17 @@</span><br><span> }</span><br><span> submit_next_out();</span><br><span> CRITICAL_SECTION_LEAVE()</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+ /* CAN_RX */</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_function(PIN_PB12, GPIO_PIN_FUNCTION_OFF);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_direction(PIN_PB12, GPIO_DIRECTION_OUT);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB12, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* CAN_TX */</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_function(PIN_PB13, GPIO_PIN_FUNCTION_OFF);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_direction(PIN_PB13, GPIO_DIRECTION_OUT);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(PIN_PB13, false);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> // command_print_prompt();</span><br><span> while (true) { // main loop</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16278">change 16278</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/osmo-ccid-firmware/+/16278"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5f2c174076b5599dcb56f887330de27f470aeffc </div>
<div style="display:none"> Gerrit-Change-Number: 16278 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>