<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14392">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ASF: update E54 SERCOM library<br><br>E54 ASFv4 change from backend 1.5.122<br>update local files to stay in sync<br><br>Change-Id: Iabeb2b94d51743a0347ea81fef8fa6236d8b12c0<br>---<br>M sysmoOCTSIM/hri/hri_sercom_e54.h<br>1 file changed, 19 insertions(+), 19 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/92/14392/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/hri/hri_sercom_e54.h b/sysmoOCTSIM/hri/hri_sercom_e54.h</span><br><span>index f5a52b0..fed00ff 100644</span><br><span>--- a/sysmoOCTSIM/hri/hri_sercom_e54.h</span><br><span>+++ b/sysmoOCTSIM/hri/hri_sercom_e54.h</span><br><span>@@ -3,7 +3,7 @@</span><br><span>  *</span><br><span>  * \brief SAM SERCOM</span><br><span>  *</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright (c) 2016-2018 Microchip Technology Inc. and its subsidiaries.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (c) 2016-2019 Microchip Technology Inc. and its subsidiaries.</span><br><span>  *</span><br><span>  * \asf_license_start</span><br><span>  *</span><br><span>@@ -3682,7 +3682,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_SMEN;</span><br><span style="color: hsl(0, 100%, 40%);">-    hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3702,7 +3702,7 @@</span><br><span>    tmp &= ~SERCOM_I2CM_CTRLB_SMEN;</span><br><span>  tmp |= value << SERCOM_I2CM_CTRLB_SMEN_Pos;</span><br><span>    ((Sercom *)hw)->I2CM.CTRLB.reg = tmp;</span><br><span style="color: hsl(0, 100%, 40%);">-        hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3710,7 +3710,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_SMEN;</span><br><span style="color: hsl(0, 100%, 40%);">-       hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3718,7 +3718,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_SMEN;</span><br><span style="color: hsl(0, 100%, 40%);">-    hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3726,7 +3726,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_QCEN;</span><br><span style="color: hsl(0, 100%, 40%);">-    hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3746,7 +3746,7 @@</span><br><span>    tmp &= ~SERCOM_I2CM_CTRLB_QCEN;</span><br><span>  tmp |= value << SERCOM_I2CM_CTRLB_QCEN_Pos;</span><br><span>    ((Sercom *)hw)->I2CM.CTRLB.reg = tmp;</span><br><span style="color: hsl(0, 100%, 40%);">-        hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3754,7 +3754,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_QCEN;</span><br><span style="color: hsl(0, 100%, 40%);">-       hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3762,7 +3762,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_QCEN;</span><br><span style="color: hsl(0, 100%, 40%);">-    hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3770,7 +3770,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_ACKACT;</span><br><span style="color: hsl(0, 100%, 40%);">-  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3790,7 +3790,7 @@</span><br><span>    tmp &= ~SERCOM_I2CM_CTRLB_ACKACT;</span><br><span>        tmp |= value << SERCOM_I2CM_CTRLB_ACKACT_Pos;</span><br><span>  ((Sercom *)hw)->I2CM.CTRLB.reg = tmp;</span><br><span style="color: hsl(0, 100%, 40%);">-        hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3798,7 +3798,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_ACKACT;</span><br><span style="color: hsl(0, 100%, 40%);">-     hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3806,7 +3806,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_ACKACT;</span><br><span style="color: hsl(0, 100%, 40%);">-  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3867,7 +3867,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg |= mask;</span><br><span style="color: hsl(0, 100%, 40%);">-      hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3875,7 +3875,7 @@</span><br><span>                                                                       hri_sercomi2cm_ctrlb_reg_t mask)</span><br><span> {</span><br><span>     uint32_t tmp;</span><br><span style="color: hsl(0, 100%, 40%);">-   hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        tmp = ((Sercom *)hw)->I2CM.CTRLB.reg;</span><br><span>     tmp &= mask;</span><br><span>     return tmp;</span><br><span>@@ -3885,7 +3885,7 @@</span><br><span> {</span><br><span>     SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg = data;</span><br><span style="color: hsl(0, 100%, 40%);">-       hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3893,7 +3893,7 @@</span><br><span> {</span><br><span>       SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg &= ~mask;</span><br><span style="color: hsl(0, 100%, 40%);">- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span>@@ -3901,13 +3901,13 @@</span><br><span> {</span><br><span>     SERCOM_CRITICAL_SECTION_ENTER();</span><br><span>     ((Sercom *)hw)->I2CM.CTRLB.reg ^= mask;</span><br><span style="color: hsl(0, 100%, 40%);">-      hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        SERCOM_CRITICAL_SECTION_LEAVE();</span><br><span> }</span><br><span> </span><br><span> static inline hri_sercomi2cm_ctrlb_reg_t hri_sercomi2cm_read_CTRLB_reg(const void *const hw)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);</span><br><span style="color: hsl(120, 100%, 40%);">+  hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);</span><br><span>        return ((Sercom *)hw)->I2CM.CTRLB.reg;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14392">change 14392</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/+/14392"/><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: Iabeb2b94d51743a0347ea81fef8fa6236d8b12c0 </div>
<div style="display:none"> Gerrit-Change-Number: 14392 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>