EFM32: update emlib src and inc

Author: amq

targets/TARGET_Silicon_Labs/TARGET_EFM32/emlib/inc/em_acmp.h

@@ -1,33 +1,31 @@
 /***************************************************************************//**
- * @file em_aes.h
+ * @file
  * @brief Advanced encryption standard (AES) accelerator peripheral API.
- * @version 5.3.3
  *******************************************************************************
  * # License
- * <b>Copyright 2016 Silicon Laboratories, Inc. http://www.silabs.com</b>
+ * <b>Copyright 2018 Silicon Laboratories Inc. www.silabs.com</b>
  *******************************************************************************
  *
+ * SPDX-License-Identifier: Zlib
+ *
+ * The licensor of this software is Silicon Laboratories Inc.
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
  * Permission is granted to anyone to use this software for any purpose,
  * including commercial applications, and to alter it and redistribute it
  * freely, subject to the following restrictions:
  *
  * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software.
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
  * 2. Altered source versions must be plainly marked as such, and must not be
  *    misrepresented as being the original software.
  * 3. This notice may not be removed or altered from any source distribution.
  *
- * DISCLAIMER OF WARRANTY/LIMITATION OF REMEDIES: Silicon Labs has no
- * obligation to support this Software. Silicon Labs is providing the
- * Software "AS IS", with no express or implied warranties of any kind,
- * including, but not limited to, any implied warranties of merchantability
- * or fitness for any particular purpose or warranties against infringement
- * of any proprietary rights of a third party.
- *
- * Silicon Labs will not be liable for any consequential, incidental, or
- * special damages, or any other relief, or for any claim by any third party,
- * arising from your use of this Software.
- *
  ******************************************************************************/
 
 #ifndef EM_AES_H
@@ -62,26 +60,26 @@ extern "C" {
  *
  *   The following input/output notations should be noted:
  *
- *   @li Input/output data (plaintext, ciphertext, key etc) are treated as
- *     byte arrays, starting with most significant byte. Ie, 32 bytes of
+ *   @li Input/output data (plaintext, ciphertext, key, and so on) are treated as
+ *     byte arrays, starting with the most significant byte, i.e., 32 bytes of
  *     plaintext (B0...B31) is located in memory in the same order, with B0 at
  *     the lower address and B31 at the higher address.
  *
- *   @li Byte arrays must always be a multiple of AES block size, ie a multiple
+ *   @li Byte arrays must always be a multiple of AES block size, i.e., a multiple
  *     of 16. Padding, if required, is done at the end of the byte array.
  *
  *   @li Byte arrays should be word (32 bit) aligned for performance
- *     considerations, since the array is accessed with 32 bit access type.
- *     The Cortex-M supports unaligned accesses, but with a performance penalty.
+ *     considerations, since the array is accessed with a 32 bit access type.
+ *     Cortex-M supports unaligned accesses with a performance penalty.
  *
- *   @li It is possible to specify the same output buffer as input buffer
- *     as long as they point to the same address. In that case the provided input
- *     buffer is replaced with the encrypted/decrypted output. Notice that the
+ *   @li It is possible to specify the same output buffer as an input buffer
+ *     as long as they point to the same address. In that case, the provided input
+ *     buffer is replaced with the encrypted/decrypted output. Notice that
  *     buffers must be exactly overlapping. If partly overlapping, the
- *     behaviour is undefined.
+ *     behavior is undefined.
  *
- *   It is up to the user to use a cipher mode according to its requirements
- *   in order to not break security. Please refer to specific cipher mode
+ *   Use a cipher mode according to its requirements to avoid
+ *   breaking security. See a specific cipher mode
  *   theory for details.
  *
  *   References:
@@ -91,7 +89,7 @@ extern "C" {
  *      NIST Special Publication 800-38A, 2001 Edition,
  *      http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
  *
- *  E.g. the following example shows how to perform an AES-128 CBC encryption:
+ *  The following example shows how to perform an AES-128 CBC encryption:
  *
  *  Enable clocks:
  *  @include em_aes_clock_enable.c
@@ -108,10 +106,10 @@ extern "C" {
 
 /**
  * @brief
- *   AES counter modification function pointer.
+ *   An AES counter modification function pointer.
  * @details
  *   Parameters:
- *   @li ctr - Ptr to byte array (16 bytes) holding counter to be modified.
+ *   @li ctr - Ptr to byte array (16 bytes) holding a counter to be modified.
  */
 typedef void (*AES_CtrFuncPtr_TypeDef)(uint8_t *ctr);
 
@@ -194,7 +192,7 @@ void AES_ECB256(uint8_t *out,
  *   Clear one or more pending AES interrupts.
  *
  * @param[in] flags
- *   Pending AES interrupt source to clear. Use a bitwise logic OR combination of
+ *   A pending AES interrupt source to clear. Use a bitwise logic OR combination of
  *   valid interrupt flags for the AES module (AES_IF_nnn).
  ******************************************************************************/
 __STATIC_INLINE void AES_IntClear(uint32_t flags)
@@ -207,7 +205,7 @@ __STATIC_INLINE void AES_IntClear(uint32_t flags)
  *   Disable one or more AES interrupts.
  *
  * @param[in] flags
- *   AES interrupt sources to disable. Use a bitwise logic OR combination of
+ *   An AES interrupt sources to disable. Use a bitwise logic OR combination of
  *   valid interrupt flags for the AES module (AES_IF_nnn).
  ******************************************************************************/
 __STATIC_INLINE void AES_IntDisable(uint32_t flags)
@@ -220,9 +218,9 @@ __STATIC_INLINE void AES_IntDisable(uint32_t flags)
  *   Enable one or more AES interrupts.
  *
  * @note
- *   Depending on the use, a pending interrupt may already be set prior to
+ *   Depending on use, a pending interrupt may already be set prior to
  *   enabling the interrupt. Consider using AES_IntClear() prior to enabling
- *   if such a pending interrupt should be ignored.
+ *   if a pending interrupt should be ignored.
  *
  * @param[in] flags
  *   AES interrupt sources to enable. Use a bitwise logic OR combination of
@@ -238,7 +236,7 @@ __STATIC_INLINE void AES_IntEnable(uint32_t flags)
  *   Get pending AES interrupt flags.
  *
  * @note
- *   The event bits are not cleared by the use of this function.
+ *   This function does not clear event bits.
  *
  * @return
  *   AES interrupt sources pending. A bitwise logic OR combination of valid
@@ -255,10 +253,10 @@ __STATIC_INLINE uint32_t AES_IntGet(void)
  *   Useful for handling more interrupt sources in the same interrupt handler.
  *
  * @note
- *   Interrupt flags are not cleared by the use of this function.
+ *   This function does not clear interrupt flags.
  *
  * @return
- *   Pending and enabled AES interrupt sources
+ *   Pending and enabled AES interrupt sources.
  *   The return value is the bitwise AND of
  *   - the enabled interrupt sources in AES_IEN and
  *   - the pending interrupt flags AES_IF
@@ -273,10 +271,10 @@ __STATIC_INLINE uint32_t AES_IntGetEnabled(void)
 
 /***************************************************************************//**
  * @brief
- *   Set one or more pending AES interrupts from SW.
+ *   Set one or more pending AES interrupts from software.
  *
  * @param[in] flags
- *   AES interrupt sources to set to pending. Use a bitwise logic OR combination
+ *   AES interrupt sources to set as pending. Use a bitwise logic OR combination
  *   of valid interrupt flags for the AES module (AES_IF_nnn).
  ******************************************************************************/
 __STATIC_INLINE void AES_IntSet(uint32_t flags)

targets/TARGET_Silicon_Labs/TARGET_EFM32/emlib/inc/em_adc.h

@@ -1,33 +1,31 @@
 /***************************************************************************//**
- * @file em_assert.h
+ * @file
  * @brief Emlib peripheral API "assert" implementation.
- * @version 5.3.3
  *******************************************************************************
  * # License
- * <b>Copyright 2016 Silicon Laboratories, Inc. http://www.silabs.com</b>
+ * <b>Copyright 2018 Silicon Laboratories Inc. www.silabs.com</b>
  *******************************************************************************
  *
+ * SPDX-License-Identifier: Zlib
+ *
+ * The licensor of this software is Silicon Laboratories Inc.
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
  * Permission is granted to anyone to use this software for any purpose,
  * including commercial applications, and to alter it and redistribute it
  * freely, subject to the following restrictions:
  *
  * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software.
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
  * 2. Altered source versions must be plainly marked as such, and must not be
  *    misrepresented as being the original software.
  * 3. This notice may not be removed or altered from any source distribution.
  *
- * DISCLAIMER OF WARRANTY/LIMITATION OF REMEDIES: Silicon Labs has no
- * obligation to support this Software. Silicon Labs is providing the
- * Software "AS IS", with no express or implied warranties of any kind,
- * including, but not limited to, any implied warranties of merchantability
- * or fitness for any particular purpose or warranties against infringement
- * of any proprietary rights of a third party.
- *
- * Silicon Labs will not be liable for any consequential, incidental, or
- * special damages, or any other relief, or for any claim by any third party,
- * arising from your use of this Software.
- *
  ******************************************************************************/
 
 #ifndef EM_ASSERT_H
@@ -55,26 +53,26 @@ extern "C" {
  * @addtogroup ASSERT
  * @brief Error checking module.
  * @details
- * By default, EMLIB library assert usage is not included in order to reduce
+ * By default, EMLIB library assert usage is not included to reduce
  * footprint and processing overhead. Further, EMLIB assert usage is decoupled
- * from ISO C assert handling (NDEBUG usage), to allow a user to use ISO C
+ * from ISO C assert handling (NDEBUG usage) to allow using ISO C
  * assert without including EMLIB assert statements.
  *
  * Below are available defines for controlling EMLIB assert inclusion. The defines
- * are typically defined for a project to be used by the preprocessor.
+ * are typically for a project to be used by the preprocessor.
  *
  * @li If @ref DEBUG_EFM is defined, the internal EMLIB library assert handling will
  * be used. This is implemented as a simple while(true) loop. @ref DEBUG_EFM is not
  * defined by default.
  *
- * @li If DEBUG_EFM_USER is defined instead, the user must provide their own
+ * @li If DEBUG_EFM_USER is defined, the user must provide custom
  * implementation of the assertEFM() function.
  *
- * @li If both @ref DEBUG_EFM and DEBUG_EFM_USER are undefined then all EFM_ASSERT()
- * statements are no operation.
+ * @li If both @ref DEBUG_EFM and DEBUG_EFM_USER are undefined, all EFM_ASSERT()
+ * statements are not operational.
  *
  * @note
- * The internal EMLIB assert is documented here because @ref DEBUG_EFM is defined in
+ * The internal EMLIB assert is documented because @ref DEBUG_EFM is defined in
  * the doxygen configuration.
  * @{
  ******************************************************************************/
@@ -85,7 +83,7 @@ void assertEFM(const char *file, int line);
 
 #else
 
-/** Default assertion is no operation */
+/** Default assertion is not operational */
 #define EFM_ASSERT(expr)    ((void)(expr))
 
 #endif /* defined(DEBUG_EFM) || defined(DEBUG_EFM_USER) */