lib: st25r3911b_nfca: Fix events handling

The NFC Reader ST25R3911B library returns processing errors in case when Rx complete event is received together with FIFO watering event. This issue is fixed by this commit. NCSDK-22908 Signed-off-by: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
nrfconnect · Aug 3, 2023 · f70f407 · f70f407
1 parent d02e160
commit f70f407
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/doc/nrf/releases_and_maturity/known_issues.rst b/doc/nrf/releases_and_maturity/known_issues.rst
@@ -2217,6 +2217,11 @@ CIA-351: Connectivity issues with :ref:`lib_azure_iot_hub`
 Other libraries
 ===============
 
+.. rst-class:: v2-4-1 v2-4-0 v2-3-0 v2-2-0 v2-1-4 v2-1-3 v2-1-2 v2-1-1 v2-1-0 v2-0-2 v2-0-1 v2-0-0 v1-9-2 v1-9-1 v1-9-0 v1-8-0 v1-7-1 v1-7-0 v1-6-1 v1-6-0 v1-5-2 v1-5-1 v1-5-0 v1-4-2 v1-4-1 v1-4-0 v1-3-2 v1-3-1 v1-3-0 v1-2-1 v1-2-0 v1-1-1 v1-0-0 v0-4-0
+
+NCSDK-22908: The :ref:`st25r3911b_nfc_readme` library returns a processing error
+ The library returns a processing error in case the Rx complete event is received together with the FIFO water level event.
+
 .. rst-class:: v2-1-4 v2-1-3 v2-1-2 v2-1-1 v2-1-0 v2-0-2 v2-0-1 v2-0-0
 
 NCSDK-18398: Build fails if shell is enabled

diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
@@ -610,6 +610,9 @@ Other libraries
     * :c:func:`hw_unique_key_derive_key` function to always return an error code from the library-defined codes.
     * The defined error code names with prefix HW_UNIQUE_KEY_ERR_*.
 
+* :ref:`st25r3911b_nfc_readme` library:
+
+  * Fixed an issue where the :c:func:`st25r3911b_nfca_process` function returns an error in case the Rx complete event is received together with FIFO water level event.
 
 Common Application Framework (CAF)
 ----------------------------------

diff --git a/lib/st25r3911b/st25r3911b_nfca.c b/lib/st25r3911b/st25r3911b_nfca.c
@@ -615,7 +615,7 @@ static int rx_fifo_water(void)
 
 static int on_fifo_water_lvl(uint32_t state)
 {
-	int err;
+	int err = 0;
 
 	switch (state) {
 
@@ -627,6 +627,12 @@ static int on_fifo_water_lvl(uint32_t state)
 		err = rx_fifo_water();
 		break;
 
+	case RX_STATE_COMPLETE:
+		/* FIFO water level occurs together with Rx complete.
+		 * FIFO data will be read during processing Rx complete event
+		 */
+		break;
+
 	default:
 		err = -EPERM;
 		break;