Merge pull request #13414 from LDong-Arm/refactor_nfc

Refactor NFC directory structure

connectivity/drivers/nfc/PN512/include/nfc/controllers/PN512Driver.h

@@ -22,10 +22,10 @@
 #include "nfc/NFCControllerDriver.h"
 #include "PN512TransportDriver.h"
 
-#include "nfc/acore/acore/ac_buffer.h"
-#include "nfc/acore/acore/ac_buffer_reader.h"
-#include "nfc/acore/acore/ac_buffer_builder.h"
-#include "nfc/stack/transceiver/pn512/pn512.h"
+#include "acore/acore/ac_buffer.h"
+#include "acore/acore/ac_buffer_reader.h"
+#include "acore/acore/ac_buffer_builder.h"
+#include "transceiver/pn512.h"
 
 namespace mbed {
 namespace nfc {

connectivity/drivers/nfc/PN512/mbed_lib.json

@@ -0,0 +1,3 @@
+{
+    "name": "PN512-nfc"
+}

connectivity/drivers/nfc/PN512/source/PN512Driver.cpp

@@ -16,7 +16,7 @@
 
 #include "PN512Driver.h"
 
-#include "nfc/stack/platform/nfc_debug.h"
+#include "stack/platform/nfc_debug.h"
 
 using namespace mbed;
 using namespace mbed::nfc;

connectivity/nfc/include/nfc/NFCNDEFCapable.h

@@ -23,10 +23,10 @@
 
 #include "NFCDefinitions.h"
 
-#include "nfc/stack/ndef/ndef.h"
-#include "nfc/acore/acore/ac_buffer.h"
-#include "nfc/acore/acore/ac_buffer_reader.h"
-#include "nfc/acore/acore/ac_buffer_builder.h"
+#include "stack/ndef/ndef.h"
+#include "acore/acore/ac_buffer.h"
+#include "acore/acore/ac_buffer_reader.h"
+#include "acore/acore/ac_buffer_builder.h"
 
 namespace mbed {
 namespace nfc {

connectivity/nfc/include/nfc/Type4RemoteInitiator.h

@@ -23,10 +23,10 @@
 #include "NFCNDEFCapable.h"
 #include "NFCRemoteInitiator.h"
 
-#include "nfc/acore/acore/ac_buffer.h"
-#include "nfc/acore/acore/ac_buffer_reader.h"
-#include "nfc/acore/acore/ac_buffer_builder.h"
-#include "nfc/stack/tech/type4/type4_target.h"
+#include "acore/acore/ac_buffer.h"
+#include "acore/acore/ac_buffer_reader.h"
+#include "acore/acore/ac_buffer_builder.h"
+#include "stack/tech/type4/type4_target.h"
 
 #include "platform/Span.h"