<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16289">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">change uart ctl define names<br><br>Change-Id: I656e9e32c67d6e7b70a53f8f113583f25619e00f<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, 6 insertions(+), 6 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/89/16289/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 fef1515..3a591d7 100644</span><br><span>--- a/ccid_common/ccid_slot_fsm.c</span><br><span>+++ b/ccid_common/ccid_slot_fsm.c</span><br><span>@@ -195,8 +195,8 @@</span><br><span>              * - after ATR while card is idle</span><br><span>             * - after PPS while card is idle</span><br><span>             */</span><br><span style="color: hsl(0, 100%, 40%);">-             card_uart_ctrl(ss->cuart, CUART_CTL_CLOCK_FREQ, fmax);</span><br><span style="color: hsl(0, 100%, 40%);">-               card_uart_ctrl(ss->cuart, CUART_CTL_FD, F/D);</span><br><span style="color: hsl(120, 100%, 40%);">+              card_uart_ctrl(ss->cuart, CUART_CTL_SET_CLOCK_FREQ, fmax);</span><br><span style="color: hsl(120, 100%, 40%);">+         card_uart_ctrl(ss->cuart, CUART_CTL_SET_FD, F/D);</span><br><span>                 card_uart_ctrl(ss->cuart, CUART_CTL_WTIME, cs->proposed_pars.t0.waiting_integer);</span><br><span> </span><br><span>          cs->pars = cs->proposed_pars;</span><br><span>diff --git a/ccid_common/cuart.h b/ccid_common/cuart.h</span><br><span>index 32a8daa..c72b51c 100644</span><br><span>--- a/ccid_common/cuart.h</span><br><span>+++ b/ccid_common/cuart.h</span><br><span>@@ -26,10 +26,10 @@</span><br><span>   CUART_CTL_NO_RXTX,              /* enable/disable receiver */</span><br><span>        CUART_CTL_POWER,        /* enable/disable ICC power */</span><br><span>       CUART_CTL_CLOCK,        /* enable/disable ICC clock */</span><br><span style="color: hsl(0, 100%, 40%);">-  CUART_CTL_CLOCK_FREQ, /* set ICC clock frequency (hz)*/</span><br><span style="color: hsl(120, 100%, 40%);">+       CUART_CTL_SET_CLOCK_FREQ, /* set ICC clock frequency (hz)*/</span><br><span>  CUART_CTL_RST,          /* enable/disable ICC reset */</span><br><span>       CUART_CTL_WTIME,        /* set the waiting time (in etu) */</span><br><span style="color: hsl(0, 100%, 40%);">-     CUART_CTL_FD,</span><br><span style="color: hsl(120, 100%, 40%);">+ CUART_CTL_SET_FD,</span><br><span> };</span><br><span> </span><br><span> struct card_uart;</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 a0b3821..db3dc79 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>@@ -384,7 +384,7 @@</span><br><span>      case CUART_CTL_CLOCK:</span><br><span>                /* no clock stop support */</span><br><span>          break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case CUART_CTL_CLOCK_FREQ:</span><br><span style="color: hsl(120, 100%, 40%);">+    case CUART_CTL_SET_CLOCK_FREQ:</span><br><span>               ncn8025_get(cuart->u.asf4.slot_nr, &settings);</span><br><span> </span><br><span>            /* 2,5/5/10/20 supported by dividers */</span><br><span>@@ -398,7 +398,7 @@</span><br><span>                settings.clkdiv = clkdiv;</span><br><span>            ncn8025_set(cuart->u.asf4.slot_nr, &settings);</span><br><span>                break;</span><br><span style="color: hsl(0, 100%, 40%);">-  case CUART_CTL_FD:</span><br><span style="color: hsl(120, 100%, 40%);">+    case CUART_CTL_SET_FD:</span><br><span>               ncn8025_get(cuart->u.asf4.slot_nr, &settings);</span><br><span>                uint8_t divider = ncn8025_div_val[settings.clkdiv];</span><br><span>          uint32_t baudrate = (20e6/divider)/arg;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16289">change 16289</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/+/16289"/><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: I656e9e32c67d6e7b70a53f8f113583f25619e00f </div>
<div style="display:none"> Gerrit-Change-Number: 16289 </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>