Change in osmo-ccid-firmware[master]: update from Atmel Start (just loading + re-exporting the project)

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Kévin Redon gerrit-no-reply at lists.osmocom.org
Tue Feb 26 18:13:25 UTC 2019


Kévin Redon has submitted this change and it was merged. ( https://gerrit.osmocom.org/13031 )

Change subject: update from Atmel Start (just loading + re-exporting the project)
......................................................................

update from Atmel Start (just loading + re-exporting the project)

Change-Id: I59b2442a95871b8052bfdfdac6d77a7207d8b70a
---
M sysmoOCTSIM/AtmelStart.gpdsc
M sysmoOCTSIM/atmel_start_config.atstart
M sysmoOCTSIM/hal/include/hpl_spi_m_async.h
M sysmoOCTSIM/hal/include/hpl_spi_m_dma.h
M sysmoOCTSIM/hal/include/hpl_spi_m_sync.h
M sysmoOCTSIM/hal/include/hpl_spi_s_async.h
M sysmoOCTSIM/hal/include/hpl_spi_s_sync.h
7 files changed, 73 insertions(+), 12 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Kévin Redon: Looks good to me, approved



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

-- 
To view, visit https://gerrit.osmocom.org/13031
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I59b2442a95871b8052bfdfdac6d77a7207d8b70a
Gerrit-Change-Number: 13031
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Kévin Redon <kredon at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190226/357c62b4/attachment.htm>


More information about the gerrit-log mailing list