nrfx 1.3.1 release

NordicSemiconductor · Sep 28, 2018 · d4ebe15 · d4ebe15
1 parent 56e90fa
commit d4ebe15
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project are documented in this file.
 
+## [1.3.1] - 2018-09-28
+### Fixed
+- Corrected the type of nrfx_usbd_ep_status_get() return value.
+- Corrected calls to undefined macros in NFCT and USBD drivers.
+
 ## [1.3.0] - 2018-09-21
 ### Added
 - Added HAL and driver for NFCT.

diff --git a/drivers/include/nrfx_usbd.h b/drivers/include/nrfx_usbd.h
@@ -149,25 +149,27 @@ typedef enum
 } nrfx_usbd_event_type_t;
 
 /**
- * @brief Possible endpoint error codes.
+ * @brief Endpoint status codes.
  *
- * Error codes that may be returned with @ref NRFX_USBD_EVT_EPTRANSFER.
+ * Status codes that may be returned by @ref nrfx_usbd_ep_status_get or, except for
+ * @ref NRFX_USBD_EP_BUSY, reported together with @ref NRFX_USBD_EVT_EPTRANSFER.
  */
 typedef enum
 {
-    NRFX_USBD_EP_OK,       /**< No error */
+    NRFX_USBD_EP_OK,       /**< No error occured. */
     NRFX_USBD_EP_WAITING,  /**< Data received, no buffer prepared already - waiting for configured transfer. */
     NRFX_USBD_EP_OVERLOAD, /**< Received number of bytes cannot fit given buffer.
-                           *   This error would also be returned when next_transfer function has been defined
-                           *   but currently received data cannot fit completely in current buffer.
-                           *   No data split from single endpoint transmission is supported.
-                           *
-                           *   When this error is reported - data is left inside endpoint buffer.
-                           *   Clear endpoint or prepare new buffer and read it.
-                           */
+                            *   This error would also be returned when next_transfer function has been defined
+                            *   but currently received data cannot fit completely in current buffer.
+                            *   No data split from single endpoint transmission is supported.
+                            *
+                            *   When this error is reported - data is left inside endpoint buffer.
+                            *   Clear endpoint or prepare new buffer and read it.
+                            */
     NRFX_USBD_EP_ABORTED,  /**< EP0 transfer can be aborted when new setup comes.
-                           *   Any other transfer can be aborted by USB reset or driver stopping.
-                           */
+                            *   Any other transfer can be aborted by USB reset or driver stopping.
+                            */
+    NRFX_USBD_EP_BUSY,     /**< A transfer is in progress. */
 } nrfx_usbd_ep_status_t;
 
 /**
@@ -702,12 +704,11 @@ void * nrfx_usbd_feeder_buffer_get(void);
  * @param[in]  ep     Endpoint number.
  * @param[out] p_size Information about the current/last transfer size.
  *
- * @retval NRFX_SUCCESS         Transfer already finished.
- * @retval NRFX_ERROR_BUSY      Ongoing transfer.
- * @retval NRFX_ERROR_DATA_SIZE Too much of data received that cannot fit into buffer and cannot be splited into chunks.
- *                             This may happen if buffer size is not a multiplication of endpoint buffer size.
+ * @return Endpoint status.
+ *
+ * @sa nrfx_usbd_ep_status_t
  */
-nrfx_err_t nrfx_usbd_ep_status_get(nrfx_usbd_ep_t ep, size_t * p_size);
+nrfx_usbd_ep_status_t nrfx_usbd_ep_status_get(nrfx_usbd_ep_t ep, size_t * p_size);
 
 /**
  * @brief Get number of received bytes.

diff --git a/drivers/src/nrfx_usbd.c b/drivers/src/nrfx_usbd.c
@@ -2231,14 +2231,14 @@ void * nrfx_usbd_feeder_buffer_get(void)
     return m_tx_buffer;
 }
 
-nrfx_err_t nrfx_usbd_ep_status_get(nrfx_usbd_ep_t ep, size_t * p_size)
+nrfx_usbd_ep_status_t nrfx_usbd_ep_status_get(nrfx_usbd_ep_t ep, size_t * p_size)
 {
-    nrfx_err_t ret;
+    nrfx_usbd_ep_status_t ret;
 
     usbd_ep_state_t const * p_state = ep_state_access(ep);
     NRFX_CRITICAL_SECTION_ENTER();
     *p_size = p_state->transfer_cnt;
-    ret = (p_state->handler.consumer == NULL) ? p_state->status : NRFX_ERROR_BUSY;
+    ret = (p_state->handler.consumer == NULL) ? p_state->status : NRFX_USBD_EP_BUSY;
     NRFX_CRITICAL_SECTION_EXIT();
     return ret;
 }

diff --git a/soc/nrfx_atomic.c b/soc/nrfx_atomic.c
@@ -31,11 +31,7 @@
 #include "nrfx_atomic.h"
 
 #ifndef NRFX_ATOMIC_USE_BUILT_IN
-#if (defined(__GNUC__) && defined(WIN32))
-    #define NRFX_ATOMIC_USE_BUILT_IN 1
-#else
     #define NRFX_ATOMIC_USE_BUILT_IN 0
-#endif
 #endif // NRFX_ATOMIC_USE_BUILT_IN
 
 #if ((__CORTEX_M >= 0x03U) || (__CORTEX_SC >= 300U))