<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19473">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">proper card powerup handling<br><br>Now that the timers work as intended other voltages (that lead to<br>timeouts) may be used.<br><br>Change-Id: I6105ce7f827aaec8ac36b940766fe05d47145edb<br>---<br>M ccid_common/ccid_slot_fsm.c<br>M ccid_common/cuart.h<br>M sysmoOCTSIM/cuart_driver_asf4_usart_async.c<br>3 files changed, 36 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/73/19473/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c</span><br><span>index 13d1139..6b5ab6e 100644</span><br><span>--- a/ccid_common/ccid_slot_fsm.c</span><br><span>+++ b/ccid_common/ccid_slot_fsm.c</span><br><span>@@ -77,7 +77,7 @@</span><br><span> if (!present) {</span><br><span> osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_CARD_REMOVAL, NULL);</span><br><span> card_uart_ctrl(ss->cuart, CUART_CTL_RST, true);</span><br><span style="color: hsl(0, 100%, 40%);">- card_uart_ctrl(ss->cuart, CUART_CTL_POWER, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, false);</span><br><span> cs->icc_powered = false;</span><br><span> cs->cmd_busy = false;</span><br><span> }</span><br><span>@@ -87,15 +87,24 @@</span><br><span> const struct ccid_pc_to_rdr_icc_power_on *ipo)</span><br><span> {</span><br><span> struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs);</span><br><span style="color: hsl(120, 100%, 40%);">+ enum ccid_power_select pwrsel = ipo->bPowerSelect;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum card_uart_ctl cctl;</span><br><span> </span><br><span> ss->seq = ipo->hdr.bSeq;</span><br><span> LOGPCS(cs, LOGL_DEBUG, "scheduling power-up\n");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pwrsel) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CCID_PWRSEL_5V0: cctl = CUART_CTL_POWER_5V0; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CCID_PWRSEL_3V0: cctl = CUART_CTL_POWER_3V0; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CCID_PWRSEL_1V8: cctl = CUART_CTL_POWER_1V8; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default: cctl = CUART_CTL_POWER_5V0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (! cs->icc_powered) {</span><br><span> /* FIXME: do this via a FSM? */</span><br><span> card_uart_ctrl(ss->cuart, CUART_CTL_RST, true);</span><br><span> osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_RESET_ACT_IND, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(ss->cuart, cctl, true);</span><br><span> osmo_fsm_inst_dispatch(ss->fi, ISO7816_E_POWER_UP_IND, NULL);</span><br><span> cs->icc_powered = true;</span><br><span> card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK, true);</span><br><span>@@ -166,7 +175,7 @@</span><br><span> </span><br><span> /* perform deactivation */</span><br><span> card_uart_ctrl(ss->cuart, CUART_CTL_RST, true);</span><br><span style="color: hsl(0, 100%, 40%);">- card_uart_ctrl(ss->cuart, CUART_CTL_POWER, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, false);</span><br><span> cs->icc_powered = false;</span><br><span> </span><br><span> </span><br><span>@@ -285,10 +294,10 @@</span><br><span> struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs);</span><br><span> </span><br><span> if (enable) {</span><br><span style="color: hsl(0, 100%, 40%);">- card_uart_ctrl(ss->cuart, CUART_CTL_POWER, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, true);</span><br><span> cs->icc_powered = true;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- card_uart_ctrl(ss->cuart, CUART_CTL_POWER, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(ss->cuart, CUART_CTL_POWER_5V0, false);</span><br><span> cs->icc_powered = false;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h</span><br><span>index 1df0c49..6f8ba70 100644</span><br><span>--- a/ccid_common/cuart.h</span><br><span>+++ b/ccid_common/cuart.h</span><br><span>@@ -25,7 +25,9 @@</span><br><span> CUART_CTL_RX, /* enable/disable receiver */</span><br><span> CUART_CTL_RX_TIMER_HINT, /* tell cuart approximate number of rx bytes */</span><br><span> CUART_CTL_NO_RXTX, /* enable/disable receiver */</span><br><span style="color: hsl(0, 100%, 40%);">- CUART_CTL_POWER, /* enable/disable ICC power */</span><br><span style="color: hsl(120, 100%, 40%);">+ CUART_CTL_POWER_5V0,</span><br><span style="color: hsl(120, 100%, 40%);">+ CUART_CTL_POWER_3V0,</span><br><span style="color: hsl(120, 100%, 40%);">+ CUART_CTL_POWER_1V8,</span><br><span> CUART_CTL_CLOCK, /* enable/disable ICC clock */</span><br><span> CUART_CTL_SET_CLOCK_FREQ, /* set ICC clock frequency (hz)*/</span><br><span> CUART_CTL_RST, /* enable/disable ICC reset */</span><br><span>diff --git a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c</span><br><span>index 0e83385..89cd734 100644</span><br><span>--- a/sysmoOCTSIM/cuart_driver_asf4_usart_async.c</span><br><span>+++ b/sysmoOCTSIM/cuart_driver_asf4_usart_async.c</span><br><span>@@ -373,15 +373,32 @@</span><br><span> settings.rstin = arg ? true : false;</span><br><span> ncn8025_set(cuart->u.asf4.slot_nr, &settings);</span><br><span> usart_async_flush_rx_buffer(cuart->u.asf4.usa_pd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* reset everything, card reset resets pps params */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (arg)</span><br><span style="color: hsl(120, 100%, 40%);">+ slot_set_isorate(cuart, SIM_CLKDIV_8, ISO7816_3_DEFAULT_FD, ISO7816_3_DEFAULT_DD);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case CUART_CTL_POWER:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CUART_CTL_POWER_5V0:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CUART_CTL_POWER_3V0:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CUART_CTL_POWER_1V8:</span><br><span> /* reset everything */</span><br><span> slot_set_isorate(cuart, SIM_CLKDIV_8, ISO7816_3_DEFAULT_FD, ISO7816_3_DEFAULT_DD);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ enum ncn8025_sim_voltage v = CUART_CTL_POWER_5V0;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ctl) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CUART_CTL_POWER_5V0: v = SIM_VOLT_5V0; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CUART_CTL_POWER_3V0: v = SIM_VOLT_3V0; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CUART_CTL_POWER_1V8: v = SIM_VOLT_1V8; break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default: break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ncn8025_get(cuart->u.asf4.slot_nr, &settings);</span><br><span> settings.cmdvcc = arg ? true : false;</span><br><span> settings.led = arg ? true : false;</span><br><span style="color: hsl(0, 100%, 40%);">- settings.vsel = SIM_VOLT_5V0;</span><br><span style="color: hsl(120, 100%, 40%);">+ settings.vsel = v;</span><br><span> ncn8025_set(cuart->u.asf4.slot_nr, &settings);</span><br><span> </span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19473">change 19473</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/+/19473"/><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: I6105ce7f827aaec8ac36b940766fe05d47145edb </div>
<div style="display:none"> Gerrit-Change-Number: 19473 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>