nrfx 1.8.5 release

NordicSemiconductor · Dec 9, 2020 · bc1fb91 · bc1fb91
1 parent 233d3af
commit bc1fb91
Show file tree

Hide file tree

Showing 16 changed files with 186 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project are documented in this file.
 
+## [1.8.5] - 2020-07-09
+### Added
+- Implemented workaround for anomaly 211 in the USBD driver.
+
+### Changed
+- Updated MDK to version 8.32.3.
+
 ## [1.8.4] - 2020-04-27
 - Fixed an issue in the NFCT driver where the FIELDDETECTED event would be ignored and the FIELDLOST event would be processed twice. The driver now properly handles FIELDDETECTED and FIELDLOST events.
 

diff --git a/drivers/src/nrfx_usbd.c b/drivers/src/nrfx_usbd.c
@@ -83,6 +83,11 @@
 #define NRFX_USBD_DMAREQ_PROCESS_DEBUG 1
 #endif
 
+#ifndef NRFX_USBD_USE_WORKAROUND_FOR_ANOMALY_211
+/* Anomaly 211 - Device remains in SUSPEND too long when host resumes
+   bus activity (sending SOF packets) without a RESUME condition. */
+#define NRFX_USBD_USE_WORKAROUND_FOR_ANOMALY_211 0
+#endif
 
 /**
  * @defgroup nrfx_usbd_int USB Device driver internal part
@@ -1578,7 +1583,11 @@ void nrfx_usbd_enable(void)
     /* Prepare for READY event receiving */
     nrf_usbd_eventcause_clear(NRF_USBD_EVENTCAUSE_READY_MASK);
 
+#if NRFX_USBD_USE_WORKAROUND_FOR_ANOMALY_211
+    if (nrfx_usbd_errata_187() || nrfx_usbd_errata_211())
+#else
     if (nrfx_usbd_errata_187())
+#endif
     {
         NRFX_CRITICAL_SECTION_ENTER();
         if (*((volatile uint32_t *)(0x4006EC00)) == 0x00000000)
@@ -1662,7 +1671,11 @@ void nrfx_usbd_enable(void)
 
     m_drv_state = NRFX_DRV_STATE_POWERED_ON;
 
+#if NRFX_USBD_USE_WORKAROUND_FOR_ANOMALY_211
+    if (nrfx_usbd_errata_187() && !nrfx_usbd_errata_211())
+#else
     if (nrfx_usbd_errata_187())
+#endif
     {
         NRFX_CRITICAL_SECTION_ENTER();
         if (*((volatile uint32_t *)(0x4006EC00)) == 0x00000000)
@@ -1691,6 +1704,24 @@ void nrfx_usbd_disable(void)
     nrf_usbd_disable();
     usbd_dma_pending_clear();
     m_drv_state = NRFX_DRV_STATE_INITIALIZED;
+
+#if NRFX_USBD_USE_WORKAROUND_FOR_ANOMALY_211
+    if (nrfx_usbd_errata_211())
+    {
+        NRFX_CRITICAL_SECTION_ENTER();
+        if (*((volatile uint32_t *)(0x4006EC00)) == 0x00000000)
+        {
+            *((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+            *((volatile uint32_t *)(0x4006ED14)) = 0x00000000;
+            *((volatile uint32_t *)(0x4006EC00)) = 0x00009375;
+        }
+        else
+        {
+            *((volatile uint32_t *)(0x4006ED14)) = 0x00000000;
+        }
+        NRFX_CRITICAL_SECTION_EXIT();
+    }
+#endif
 }
 
 void nrfx_usbd_start(bool enable_sof)

diff --git a/drivers/src/nrfx_usbd_errata.h b/drivers/src/nrfx_usbd_errata.h
@@ -69,4 +69,10 @@ static inline bool nrfx_usbd_errata_199(void)
     return NRFX_USBD_ERRATA_ENABLE && nrf52_errata_199();
 }
 
+/* Errata: Device remains in SUSPEND too long. */
+static inline bool nrfx_usbd_errata_211(void)
+{
+    return NRFX_USBD_ERRATA_ENABLE && nrf52_errata_211();
+}
+
 #endif // NRFX_USBD_ERRATA_H__
diff --git a/mdk/nrf.h b/mdk/nrf.h
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* MDK version */
 #define MDK_MAJOR_VERSION   8 
 #define MDK_MINOR_VERSION   32 
-#define MDK_MICRO_VERSION   1 
+#define MDK_MICRO_VERSION   3 
 
 /* Define NRF51_SERIES for common use in nRF51 series devices. Only if not previously defined. */
 #if defined (NRF51) ||\

diff --git a/mdk/nrf51.h b/mdk/nrf51.h
@@ -30,10 +30,10 @@
  * @file     nrf51.h
  * @brief    CMSIS HeaderFile
  * @version  522
- * @date     04. March 2020
- * @note     Generated by SVDConv V3.3.25 on Wednesday, 04.03.2020 14:56:51
+ * @date     09. July 2020
+ * @note     Generated by SVDConv V3.3.25 on Thursday, 09.07.2020 13:19:28
  *           from File 'nrf51.svd',
- *           last modified on Wednesday, 04.03.2020 13:56:43
+ *           last modified on Thursday, 09.07.2020 11:19:20
  */
 
 

diff --git a/mdk/nrf52.h b/mdk/nrf52.h
@@ -30,10 +30,10 @@
  * @file     nrf52.h
  * @brief    CMSIS HeaderFile
  * @version  1
- * @date     04. March 2020
- * @note     Generated by SVDConv V3.3.25 on Wednesday, 04.03.2020 14:56:52
+ * @date     09. July 2020
+ * @note     Generated by SVDConv V3.3.25 on Thursday, 09.07.2020 13:19:29
  *           from File 'nrf52.svd',
- *           last modified on Wednesday, 04.03.2020 13:56:43
+ *           last modified on Thursday, 09.07.2020 11:19:20
  */
 
 

diff --git a/mdk/nrf52805.h b/mdk/nrf52805.h
@@ -30,10 +30,10 @@
  * @file     nrf52805.h
  * @brief    CMSIS HeaderFile
  * @version  1
- * @date     04. March 2020
- * @note     Generated by SVDConv V3.3.25 on Wednesday, 04.03.2020 14:56:51
+ * @date     09. July 2020
+ * @note     Generated by SVDConv V3.3.25 on Thursday, 09.07.2020 13:19:28
  *           from File 'nrf52805.svd',
- *           last modified on Wednesday, 04.03.2020 13:56:43
+ *           last modified on Thursday, 09.07.2020 11:19:20
  */
 
 

diff --git a/mdk/nrf52810.h b/mdk/nrf52810.h
@@ -30,10 +30,10 @@
  * @file     nrf52810.h
  * @brief    CMSIS HeaderFile
  * @version  1
- * @date     04. March 2020
- * @note     Generated by SVDConv V3.3.25 on Wednesday, 04.03.2020 14:56:51
+ * @date     09. July 2020
+ * @note     Generated by SVDConv V3.3.25 on Thursday, 09.07.2020 13:19:28
  *           from File 'nrf52810.svd',
- *           last modified on Wednesday, 04.03.2020 13:56:43
+ *           last modified on Thursday, 09.07.2020 11:19:20
  */
 
 

diff --git a/mdk/nrf52811.h b/mdk/nrf52811.h
@@ -30,10 +30,10 @@
  * @file     nrf52811.h
  * @brief    CMSIS HeaderFile
  * @version  1
- * @date     04. March 2020
- * @note     Generated by SVDConv V3.3.25 on Wednesday, 04.03.2020 14:56:51
+ * @date     09. July 2020
+ * @note     Generated by SVDConv V3.3.25 on Thursday, 09.07.2020 13:19:29
  *           from File 'nrf52811.svd',
- *           last modified on Wednesday, 04.03.2020 13:56:44
+ *           last modified on Thursday, 09.07.2020 11:19:21
  */
 
 

diff --git a/mdk/nrf52820.h b/mdk/nrf52820.h
@@ -30,10 +30,10 @@
  * @file     nrf52820.h
  * @brief    CMSIS HeaderFile
  * @version  1
- * @date     04. March 2020
- * @note     Generated by SVDConv V3.3.25 on Wednesday, 04.03.2020 14:56:51
+ * @date     09. July 2020
+ * @note     Generated by SVDConv V3.3.25 on Thursday, 09.07.2020 13:19:29
  *           from File 'nrf52820.svd',
- *           last modified on Wednesday, 04.03.2020 13:56:44
+ *           last modified on Thursday, 09.07.2020 11:19:21
  */
 
 

diff --git a/mdk/nrf52833.h b/mdk/nrf52833.h
@@ -30,10 +30,10 @@
  * @file     nrf52833.h
  * @brief    CMSIS HeaderFile
  * @version  1
- * @date     04. March 2020
- * @note     Generated by SVDConv V3.3.25 on Wednesday, 04.03.2020 14:56:52
+ * @date     09. July 2020
+ * @note     Generated by SVDConv V3.3.25 on Thursday, 09.07.2020 13:19:29
  *           from File 'nrf52833.svd',
- *           last modified on Wednesday, 04.03.2020 13:56:44
+ *           last modified on Thursday, 09.07.2020 11:19:21
  */
 
 

diff --git a/mdk/nrf52840.h b/mdk/nrf52840.h
@@ -30,10 +30,10 @@
  * @file     nrf52840.h
  * @brief    CMSIS HeaderFile
  * @version  1
- * @date     04. March 2020
- * @note     Generated by SVDConv V3.3.25 on Wednesday, 04.03.2020 14:56:52
+ * @date     09. July 2020
+ * @note     Generated by SVDConv V3.3.25 on Thursday, 09.07.2020 13:19:30
  *           from File 'nrf52840.svd',
- *           last modified on Wednesday, 04.03.2020 13:56:44
+ *           last modified on Thursday, 09.07.2020 11:19:21
  */