[nrf toup][nrfconnect] Adapt NFC Commissioning manager to unpowered mode

- Added define switch for powered and unpowered NFC Commissioning
modes
- Added Kconfigs to switch between these two modes.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

config/nrfconnect/chip-module/Kconfig

@@ -54,8 +54,20 @@ config CHIP_NFC_ONBOARDING_PAYLOAD
 
 # See config/common/cmake/Kconfig for full definition
 config CHIP_NFC_BASED_COMMISSIONING
-	depends on HAS_HW_NRF_NFCT
 	depends on !CHIP_NFC_ONBOARDING_PAYLOAD
+	help
+	  Enables Matter NFC-based commissioning. Use CHIP_NFC_COMMISSIONING_MODE to select
+	  powered (on-chip NFCT) or unpowered (external ST25DA-C) operation.
+
+if CHIP_NFC_BASED_COMMISSIONING
+
+choice CHIP_NFC_COMMISSIONING_MODE
+	prompt "NFC commissioning mode"
+	default CHIP_NFC_COMMISSIONING_MODE_POWERED
+
+config CHIP_NFC_COMMISSIONING_MODE_POWERED
+	bool "Powered (on-chip NFCT, live NTL session)"
+	depends on HAS_HW_NRF_NFCT
 	imply NFC_T4T_NRFXLIB
 	imply NFC_THREAD_CALLBACK
 	imply NFC_OWN_THREAD
@@ -71,6 +83,17 @@ config CHIP_NFC_BASED_COMMISSIONING
 	  Application file alongside the Matter NTL application, both within the same raw
 	  ISO-DEP (Type 4A) session.
 
+config CHIP_NFC_COMMISSIONING_MODE_UNPOWERED
+	bool "Unpowered (external ST25DA-C via I2C)"
+	help
+	  Commissioner writes commissioning data to an external ST25DA-C tag. The
+	  application reads the stored TLV over I2C (e.g. nfc commission shell) and
+	  completes Thread join and Matter fabric provisioning via nfctag.cpp.
+
+endchoice
+
+endif # CHIP_NFC_BASED_COMMISSIONING
+
 config CHIP_NFC_BASED_COMMISSIONING_APDU_DEBUG
 	bool "NFC based commissioning APDU hex logging"
 	depends on CHIP_NFC_BASED_COMMISSIONING

src/platform/nrfconnect/NFCCommissioningManagerImpl.cpp

@@ -34,8 +34,10 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
 #include <nfc/ndef/uri_msg.h>
 #include <nfc/ndef/uri_rec.h>
+#endif
 
 #include <algorithm>
 #include <cstring>
@@ -48,6 +50,7 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
 namespace {
 
 // Matter Application Identifier (NTL, spec 4.21)
@@ -149,14 +152,17 @@ class SessionLock
 };
 
 } // namespace
+#endif // CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
 
 Global<NFCCommissioningManagerImpl> NFCCommissioningManagerImpl::sInstance;
 
 CHIP_ERROR NFCCommissioningManagerImpl::_Init()
 {
     ChipLogDetail(DeviceLayer, "Initializing NFC Commissioning Manager");
 
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
     ResetSession();
+#endif
     ReturnErrorOnFailure(PlatformMgr().AddEventHandler(OnPlatformEvent, reinterpret_cast<intptr_t>(this)));
 
     return CHIP_NO_ERROR;
@@ -170,17 +176,21 @@ void NFCCommissioningManagerImpl::OnPlatformEvent(const ChipDeviceEvent * event,
     {
     case DeviceEventType::kServerReady:
     case DeviceEventType::kDnssdInitialized:
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
         self->StartNfcCommissioning();
+#endif
         break;
     case DeviceEventType::kCommissioningComplete:
         self->HandleCommissioningComplete();
         break;
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
     case DeviceEventType::kFailSafeTimerExpired:
         self->HandleFailSafeTimerExpired();
         break;
     case DeviceEventType::kSecureSessionEstablished:
         self->HandleSecureSessionEstablished(event);
         break;
+#endif
     default:
         break;
     }
@@ -195,6 +205,9 @@ void NFCCommissioningManagerImpl::ScheduledStartNfcCommissioning(intptr_t arg)
 
 void NFCCommissioningManagerImpl::StartNfcCommissioning()
 {
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_UNPOWERED
+    return;
+#else
     VerifyOrReturn(!mRawIsoDepStarted);
 
     if (Server::GetInstance().GetFabricTable().FabricCount() != 0)
@@ -208,16 +221,20 @@ void NFCCommissioningManagerImpl::StartNfcCommissioning()
     {
         ChipLogError(DeviceLayer, "Failed to start NFC tag emulation for commissioning");
     }
+#endif // CONFIG_CHIP_NFC_COMMISSIONING_MODE_UNPOWERED
 }
 
 void NFCCommissioningManagerImpl::HandleCommissioningComplete()
 {
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
     mBlockMatterAidSelection       = false;
     mNfcEmulationPausedForFailSafe = false;
+#endif
     ChipLogProgress(DeviceLayer, "Commissioning complete: stopping NFC commissioning");
     NFCCommissioningMgr().Shutdown();
 }
 
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
 void NFCCommissioningManagerImpl::HandleFailSafeTimerExpired()
 {
     VerifyOrReturn(mBlockMatterAidSelection || mNfcEmulationPausedForFailSafe);
@@ -255,9 +272,14 @@ void NFCCommissioningManagerImpl::HandleSecureSessionEstablished(const ChipDevic
     ChipLogProgress(DeviceLayer,
                     "NFC PASE session established: blocking NFC commissioning until fail-safe completes or commissioning succeeds");
 }
+#endif // CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
 
 CHIP_ERROR NFCCommissioningManagerImpl::ConfigureOnboardingPayload()
 {
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_UNPOWERED
+    ChipLogDetail(DeviceLayer, "Unpowered NFC commissioning: skipping on-chip tag setup");
+    return CHIP_NO_ERROR;
+#else
     PayloadContents payload;
     payload.version = 0;
     payload.rendezvousInformation.SetValue(RendezvousInformationFlags(RendezvousInformationFlag::kNFC));
@@ -283,8 +305,11 @@ CHIP_ERROR NFCCommissioningManagerImpl::ConfigureOnboardingPayload()
     TEMPORARY_RETURN_IGNORED PlatformMgr().ScheduleWork(ScheduledStartNfcCommissioning, reinterpret_cast<intptr_t>(this));
 
     return CHIP_NO_ERROR;
+#endif // CONFIG_CHIP_NFC_COMMISSIONING_MODE_UNPOWERED
 }
 
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
+
 void NFCCommissioningManagerImpl::StartRawIsoDepTagEmulation()
 {
     VerifyOrReturn(!mRawIsoDepStarted);
@@ -332,14 +357,6 @@ bool NFCCommissioningManagerImpl::IsSessionIdle() const
         mApduFragmentCount == 0 && !mAwaitingApplicationResponse && mOutgoingMessage.IsNull();
 }
 
-void NFCCommissioningManagerImpl::_Shutdown()
-{
-    ChipLogDetail(DeviceLayer, "Shutting down NFC Commissioning Manager");
-    PlatformMgr().RemoveEventHandler(OnPlatformEvent, reinterpret_cast<intptr_t>(this));
-    StopRawIsoDepTagEmulation();
-    ResetSession(/* notifyAborted = */ true);
-}
-
 void NFCCommissioningManagerImpl::ResetSession(bool notifyAborted)
 {
     SessionLock lock;
@@ -1095,6 +1112,38 @@ void NFCCommissioningManagerImpl::DeliverIncomingMessage()
     mAwaitingApplicationResponse = true;
 }
 
+#else // CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
+
+void NFCCommissioningManagerImpl::SetNFCBase(Transport::NFCBase * nfcBase)
+{
+    (void) nfcBase;
+}
+
+bool NFCCommissioningManagerImpl::CanSendToPeer(const Transport::PeerAddress & address)
+{
+    (void) address;
+    return false;
+}
+
+CHIP_ERROR NFCCommissioningManagerImpl::SendToNfcTag(const Transport::PeerAddress & address, System::PacketBufferHandle && msgBuf)
+{
+    (void) address;
+    (void) msgBuf;
+    return CHIP_ERROR_INCORRECT_STATE;
+}
+
+#endif // CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
+
+void NFCCommissioningManagerImpl::_Shutdown()
+{
+    ChipLogDetail(DeviceLayer, "Shutting down NFC Commissioning Manager");
+    PlatformMgr().RemoveEventHandler(OnPlatformEvent, reinterpret_cast<intptr_t>(this));
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
+    StopRawIsoDepTagEmulation();
+    ResetSession(/* notifyAborted = */ true);
+#endif
+}
+
 } // namespace Internal
 } // namespace DeviceLayer
 } // namespace chip

src/platform/nrfconnect/NFCCommissioningManagerImpl.h

@@ -28,12 +28,16 @@
 
 #include <platform/internal/NFCCommissioningManager.h>
 
-#include <transport/raw/NfcApplicationDelegate.h>
-
 #include <lib/core/Global.h>
 #include <system/SystemPacketBuffer.h>
 
+#include <transport/raw/NfcApplicationDelegate.h>
+
+#include "autoconf.h"
+
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
 #include <nfc_t4t_lib.h>
+#endif
 
 #include <cstdint>
 
@@ -56,21 +60,26 @@ class NFCCommissioningManagerImpl final : public NFCCommissioningManager, privat
 public:
     NFCCommissioningManagerImpl() {}
 
-    // ===== Members that implement virtual methods on NfcApplicationDelegate.
-
     void SetNFCBase(Transport::NFCBase * nfcBase) override;
     bool CanSendToPeer(const Transport::PeerAddress & address) override;
     CHIP_ERROR SendToNfcTag(const Transport::PeerAddress & address, System::PacketBufferHandle && msgBuf) override;
+
     bool HasOnboardingPayload() const
     {
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
         return mHasOnboardingPayload && mRawIsoDepStarted && !mBlockMatterAidSelection && !mNfcEmulationPausedForFailSafe;
+#else
+        return false;
+#endif
     }
     CHIP_ERROR ConfigureOnboardingPayload();
 
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
     // Maximum size of the NDEF message (URI record) served by the NDEF Tag Application's NDEF
     // file, and total size of that file (message plus its 2-byte NLEN length header).
     static constexpr size_t kNdefMessageCapacity = 128;
     static constexpr size_t kNdefFileBufferSize  = kNdefMessageCapacity + 2;
+#endif
 
 private:
     // ===== Members that implement the NFCCommissioningManager internal interface.
@@ -103,26 +112,19 @@ class NFCCommissioningManagerImpl final : public NFCCommissioningManager, privat
     /** Blocks new Matter AID selection once an NFC PASE session is established. */
     void HandleSecureSessionEstablished(const ChipDeviceEvent * event);
 
-    // Grant header-local singleton accessors access to sInstance.
-    friend NFCCommissioningManager & NFCCommissioningMgr();
-    friend NFCCommissioningManagerImpl & NFCCommissioningMgrImpl();
-
-    static Global<NFCCommissioningManagerImpl> sInstance;
-
+#ifdef CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
     static constexpr size_t kMaxApduSize         = 261;
     static constexpr uint8_t kNtlProtocolVersion = 0x01;
 
     // Applications selectable within our single raw ISO-DEP session (see file header).
-    enum class SelectedApplication
-    {
+    enum class SelectedApplication{
         kNone,
         kMatter,
         kNdef,
     };
 
     // Elementary files selectable under the NDEF Tag Application, once selected.
-    enum class SelectedFile
-    {
+    enum class SelectedFile{
         kNone,
         kCapabilityContainer,
         kNdefFile,
@@ -347,6 +349,12 @@ class NFCCommissioningManagerImpl final : public NFCCommissioningManager, privat
     // Set when tag emulation is stopped during fail-safe rollback. While set, all NFC
     // callbacks are ignored to avoid corrupting the NFC platform ring buffer on re-tap.
     bool mNfcEmulationPausedForFailSafe = false;
+#endif // CONFIG_CHIP_NFC_COMMISSIONING_MODE_POWERED
+
+    static Global<NFCCommissioningManagerImpl> sInstance;
+
+    friend NFCCommissioningManager & NFCCommissioningMgr();
+    friend NFCCommissioningManagerImpl & NFCCommissioningMgrImpl();
 };
 
 /**