<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13031">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">update from Atmel Start (just loading + re-exporting the project)<br><br>Change-Id: I59b2442a95871b8052bfdfdac6d77a7207d8b70a<br>---<br>M sysmoOCTSIM/AtmelStart.gpdsc<br>M sysmoOCTSIM/atmel_start_config.atstart<br>M sysmoOCTSIM/hal/include/hpl_spi_m_async.h<br>M sysmoOCTSIM/hal/include/hpl_spi_m_dma.h<br>M sysmoOCTSIM/hal/include/hpl_spi_m_sync.h<br>M sysmoOCTSIM/hal/include/hpl_spi_s_async.h<br>M sysmoOCTSIM/hal/include/hpl_spi_s_sync.h<br>7 files changed, 73 insertions(+), 12 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/31/13031/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/AtmelStart.gpdsc b/sysmoOCTSIM/AtmelStart.gpdsc</span><br><span>index 51851db..6546fb5 100644</span><br><span>--- a/sysmoOCTSIM/AtmelStart.gpdsc</span><br><span>+++ b/sysmoOCTSIM/AtmelStart.gpdsc</span><br><span>@@ -67,11 +67,6 @@</span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_sleep.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_async.h"/></span><br><span style="color: hsl(0, 100%, 40%);">- <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_m_async.h"/></span><br><span style="color: hsl(0, 100%, 40%);">- <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_m_dma.h"/></span><br><span style="color: hsl(0, 100%, 40%);">- <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_m_sync.h"/></span><br><span style="color: hsl(0, 100%, 40%);">- <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_s_async.h"/></span><br><span style="color: hsl(0, 100%, 40%);">- <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_s_sync.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_sync.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_usart.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_usb.h"/></span><br><span>@@ -169,6 +164,11 @@</span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hal_usart_async.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_missing_features.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_reset.h"/></span><br><span style="color: hsl(120, 100%, 40%);">+ <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_m_async.h"/></span><br><span style="color: hsl(120, 100%, 40%);">+ <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_m_dma.h"/></span><br><span style="color: hsl(120, 100%, 40%);">+ <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_m_sync.h"/></span><br><span style="color: hsl(120, 100%, 40%);">+ <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_s_async.h"/></span><br><span style="color: hsl(120, 100%, 40%);">+ <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_spi_s_sync.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_usart_async.h"/></span><br><span> <file category="header" condition="ARMCC, GCC, IAR" name="hal/include/hpl_usart_sync.h"/></span><br><span> <file category="source" condition="ARMCC, GCC, IAR" name="hal/src/hal_usart_async.c"/></span><br><span>diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>index 975423d..58f05f6 100644</span><br><span>--- a/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>+++ b/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>@@ -2,12 +2,12 @@</span><br><span> name: sysmoOCTSIM</span><br><span> versions:</span><br><span> api: '1.0'</span><br><span style="color: hsl(0, 100%, 40%);">- backend: 1.4.93</span><br><span style="color: hsl(0, 100%, 40%);">- commit: 9c29f8365cf76e9937d19b1e765a83bc7a80e4e9</span><br><span style="color: hsl(0, 100%, 40%);">- content: 1.0.1340</span><br><span style="color: hsl(120, 100%, 40%);">+ backend: 1.5.122</span><br><span style="color: hsl(120, 100%, 40%);">+ commit: 820baecf7dd115d94b0d42ee3b0b9d6ba2da7113</span><br><span style="color: hsl(120, 100%, 40%);">+ content: 1.0.1405</span><br><span> content_pack_name: acme-packs-all</span><br><span> format: '2'</span><br><span style="color: hsl(0, 100%, 40%);">- frontend: 1.4.1810</span><br><span style="color: hsl(120, 100%, 40%);">+ frontend: 1.5.1826</span><br><span> board:</span><br><span> identifier: CustomBoard</span><br><span> device: SAME54N19A-AF</span><br><span>@@ -773,6 +773,8 @@</span><br><span> nodes:</span><br><span> - name: CPU</span><br><span> input: CPU</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration: {}</span><br><span> OSC32KCTRL:</span><br><span> user_label: OSC32KCTRL</span><br><span>@@ -981,8 +983,12 @@</span><br><span> nodes:</span><br><span> - name: Core</span><br><span> input: Generic clock generator 2</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> - name: Slow</span><br><span> input: Generic clock generator 3</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> core_gclk_selection: Generic clock generator 2</span><br><span> slow_gclk_selection: Generic clock generator 3</span><br><span>@@ -1024,8 +1030,12 @@</span><br><span> nodes:</span><br><span> - name: Core</span><br><span> input: Generic clock generator 2</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> - name: Slow</span><br><span> input: Generic clock generator 3</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> core_gclk_selection: Generic clock generator 2</span><br><span> slow_gclk_selection: Generic clock generator 3</span><br><span>@@ -1067,8 +1077,12 @@</span><br><span> nodes:</span><br><span> - name: Core</span><br><span> input: Generic clock generator 2</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> - name: Slow</span><br><span> input: Generic clock generator 3</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> core_gclk_selection: Generic clock generator 2</span><br><span> slow_gclk_selection: Generic clock generator 3</span><br><span>@@ -1110,8 +1124,12 @@</span><br><span> nodes:</span><br><span> - name: Core</span><br><span> input: Generic clock generator 2</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> - name: Slow</span><br><span> input: Generic clock generator 3</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> core_gclk_selection: Generic clock generator 2</span><br><span> slow_gclk_selection: Generic clock generator 3</span><br><span>@@ -1153,8 +1171,12 @@</span><br><span> nodes:</span><br><span> - name: Core</span><br><span> input: Generic clock generator 2</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> - name: Slow</span><br><span> input: Generic clock generator 3</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> core_gclk_selection: Generic clock generator 2</span><br><span> slow_gclk_selection: Generic clock generator 3</span><br><span>@@ -1196,8 +1218,12 @@</span><br><span> nodes:</span><br><span> - name: Core</span><br><span> input: Generic clock generator 2</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> - name: Slow</span><br><span> input: Generic clock generator 3</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> core_gclk_selection: Generic clock generator 2</span><br><span> slow_gclk_selection: Generic clock generator 3</span><br><span>@@ -1239,8 +1265,12 @@</span><br><span> nodes:</span><br><span> - name: Core</span><br><span> input: Generic clock generator 2</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> - name: Slow</span><br><span> input: Generic clock generator 3</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> core_gclk_selection: Generic clock generator 2</span><br><span> slow_gclk_selection: Generic clock generator 3</span><br><span>@@ -1284,8 +1314,12 @@</span><br><span> nodes:</span><br><span> - name: Core</span><br><span> input: Generic clock generator 2</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> - name: Slow</span><br><span> input: Generic clock generator 3</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> core_gclk_selection: Generic clock generator 2</span><br><span> slow_gclk_selection: Generic clock generator 3</span><br><span>@@ -1328,6 +1362,8 @@</span><br><span> nodes:</span><br><span> - name: USB</span><br><span> input: Generic clock generator 1</span><br><span style="color: hsl(120, 100%, 40%);">+ external: false</span><br><span style="color: hsl(120, 100%, 40%);">+ external_frequency: 0</span><br><span> configuration:</span><br><span> usb_gclk_selection: Generic clock generator 1</span><br><span> pads:</span><br><span>diff --git a/sysmoOCTSIM/hal/include/hpl_spi_m_async.h b/sysmoOCTSIM/hal/include/hpl_spi_m_async.h</span><br><span>index 69dd435..8d3555e 100644</span><br><span>--- a/sysmoOCTSIM/hal/include/hpl_spi_m_async.h</span><br><span>+++ b/sysmoOCTSIM/hal/include/hpl_spi_m_async.h</span><br><span>@@ -60,6 +60,10 @@</span><br><span> #define _spi_m_async_dev_cb_xfer_t _spi_async_dev_cb_xfer_t</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(120, 100%, 40%);">+ * \name HPL functions</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+//@{</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span> * \brief Initialize SPI for access with interrupts</span><br><span> * It will load default hardware configuration and software struct.</span><br><span> * \param[in, out] dev Pointer to the SPI device instance.</span><br><span>@@ -229,6 +233,7 @@</span><br><span> */</span><br><span> void _spi_m_async_set_irq_state(struct _spi_m_async_dev *const device, const enum _spi_m_async_dev_cb_type type,</span><br><span> const bool state);</span><br><span style="color: hsl(120, 100%, 40%);">+//@}</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span>diff --git a/sysmoOCTSIM/hal/include/hpl_spi_m_dma.h b/sysmoOCTSIM/hal/include/hpl_spi_m_dma.h</span><br><span>index f481fb8..2b48300 100644</span><br><span>--- a/sysmoOCTSIM/hal/include/hpl_spi_m_dma.h</span><br><span>+++ b/sysmoOCTSIM/hal/include/hpl_spi_m_dma.h</span><br><span>@@ -54,6 +54,10 @@</span><br><span> #define _spi_m_dma_dev_cb_type _spi_dma_dev_cb_type</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(120, 100%, 40%);">+ * \name HPL functions</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+//@{</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span> * \brief Initialize SPI for access with interrupts</span><br><span> * It will load default hardware configuration and software struct.</span><br><span> * \param[in, out] dev Pointer to the SPI device instance.</span><br><span>@@ -168,6 +172,7 @@</span><br><span> */</span><br><span> int32_t _spi_m_dma_transfer(struct _spi_m_dma_dev *dev, uint8_t const *txbuf, uint8_t *const rxbuf,</span><br><span> const uint16_t length);</span><br><span style="color: hsl(120, 100%, 40%);">+//@}</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span>diff --git a/sysmoOCTSIM/hal/include/hpl_spi_m_sync.h b/sysmoOCTSIM/hal/include/hpl_spi_m_sync.h</span><br><span>index 01e8fc3..38df15b 100644</span><br><span>--- a/sysmoOCTSIM/hal/include/hpl_spi_m_sync.h</span><br><span>+++ b/sysmoOCTSIM/hal/include/hpl_spi_m_sync.h</span><br><span>@@ -47,10 +47,14 @@</span><br><span> extern "C" {</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/** Uses common SPI async device driver. */</span><br><span style="color: hsl(120, 100%, 40%);">+/** Uses common SPI sync device driver. */</span><br><span> #define _spi_m_sync_dev _spi_sync_dev</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(120, 100%, 40%);">+ * \name HPL functions</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+//@{</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span> * \brief Initialize SPI for access without interrupts</span><br><span> * It will load default hardware configuration and software struct.</span><br><span> * \param[in, out] dev Pointer to the SPI device instance.</span><br><span>@@ -118,7 +122,7 @@</span><br><span> int32_t _spi_m_sync_set_baudrate(struct _spi_m_sync_dev *dev, const uint32_t baud_val);</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Set SPI baudrate</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Set SPI char size</span><br><span> * \param[in, out] dev Pointer to the SPI device instance.</span><br><span> * \param[in] char_size The character size, see \ref spi_char_size.</span><br><span> * \return Operation status.</span><br><span>@@ -152,6 +156,7 @@</span><br><span> * \retval >=0 Number of characters transferred.</span><br><span> */</span><br><span> int32_t _spi_m_sync_trans(struct _spi_m_sync_dev *dev, const struct spi_msg *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+//@}</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span>diff --git a/sysmoOCTSIM/hal/include/hpl_spi_s_async.h b/sysmoOCTSIM/hal/include/hpl_spi_s_async.h</span><br><span>index 2892e2c..5647243 100644</span><br><span>--- a/sysmoOCTSIM/hal/include/hpl_spi_s_async.h</span><br><span>+++ b/sysmoOCTSIM/hal/include/hpl_spi_s_async.h</span><br><span>@@ -59,6 +59,10 @@</span><br><span> #define _spi_s_async_dev_cb_xfer_t _spi_async_dev_cb_xfer_t</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(120, 100%, 40%);">+ * \name HPL functions</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+//@{</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span> * \brief Initialize SPI for access with interrupts</span><br><span> * It will load default hardware configuration and software struct.</span><br><span> * \param[in, out] dev Pointer to the SPI device instance.</span><br><span>@@ -218,6 +222,7 @@</span><br><span> */</span><br><span> void _spi_s_async_set_irq_state(struct _spi_s_async_dev *const device, const enum _spi_async_dev_cb_type type,</span><br><span> const bool state);</span><br><span style="color: hsl(120, 100%, 40%);">+//@}</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span>diff --git a/sysmoOCTSIM/hal/include/hpl_spi_s_sync.h b/sysmoOCTSIM/hal/include/hpl_spi_s_sync.h</span><br><span>index 4fda095..ff4c811 100644</span><br><span>--- a/sysmoOCTSIM/hal/include/hpl_spi_s_sync.h</span><br><span>+++ b/sysmoOCTSIM/hal/include/hpl_spi_s_sync.h</span><br><span>@@ -46,10 +46,14 @@</span><br><span> extern "C" {</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/** Uses common SPI async device driver. */</span><br><span style="color: hsl(120, 100%, 40%);">+/** Uses common SPI sync device driver. */</span><br><span> #define _spi_s_sync_dev _spi_sync_dev</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(120, 100%, 40%);">+ * \name HPL functions</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+//@{</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span> * \brief Initialize SPI for access without interrupts</span><br><span> * It will load default hardware configuration and software struct.</span><br><span> * \param[in, out] dev Pointer to the SPI device instance.</span><br><span>@@ -218,6 +222,7 @@</span><br><span> * \retval false Error not detected</span><br><span> */</span><br><span> bool _spi_s_sync_is_error(struct _spi_s_sync_dev *dev);</span><br><span style="color: hsl(120, 100%, 40%);">+//@}</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13031">change 13031</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/13031"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I59b2442a95871b8052bfdfdac6d77a7207d8b70a </div>
<div style="display:none"> Gerrit-Change-Number: 13031 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>