From bed5fd33e869f7bc447ef4c94f273ebba1d32fc5 Mon Sep 17 00:00:00 2001 From: Lingkai Dong Date: Mon, 10 Aug 2020 17:52:50 +0100 Subject: [PATCH] nfc: turn PN512 driver into a standalone driver library --- .../controllers => drivers/nfc/PN512/include}/PN512Driver.h | 2 +- .../nfc/PN512/include}/PN512SPITransportDriver.h | 0 .../nfc/PN512/include}/PN512TransportDriver.h | 0 connectivity/drivers/nfc/PN512/mbed_lib.json | 3 +++ .../controllers => drivers/nfc/PN512/source}/PN512Driver.cpp | 0 .../nfc/PN512/source}/PN512SPITransportDriver.cpp | 0 .../nfc/PN512/source}/PN512TransportDriver.cpp | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512.c | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512.h | 0 .../nfc/PN512/source/transceiver}/pn512_callback.h | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512_cmd.c | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512_cmd.h | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512_hw.c | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512_hw.h | 0 .../nfc/PN512/source/transceiver}/pn512_internal.h | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512_irq.c | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512_irq.h | 0 .../nfc/PN512/source/transceiver}/pn512_poll.c | 0 .../nfc/PN512/source/transceiver}/pn512_poll.h | 0 .../nfc/PN512/source/transceiver}/pn512_registers.c | 0 .../nfc/PN512/source/transceiver}/pn512_registers.h | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512_rf.c | 0 .../pn512 => drivers/nfc/PN512/source/transceiver}/pn512_rf.h | 0 .../nfc/PN512/source/transceiver}/pn512_timer.c | 0 .../nfc/PN512/source/transceiver}/pn512_timer.h | 0 .../nfc/PN512/source/transceiver}/pn512_transceive.c | 0 .../nfc/PN512/source/transceiver}/pn512_transceive.h | 0 .../nfc/PN512/source/transceiver}/pn512_types.h | 0 28 files changed, 4 insertions(+), 1 deletion(-) rename connectivity/{nfc/controllers => drivers/nfc/PN512/include}/PN512Driver.h (96%) rename connectivity/{nfc/controllers => drivers/nfc/PN512/include}/PN512SPITransportDriver.h (100%) rename connectivity/{nfc/controllers => drivers/nfc/PN512/include}/PN512TransportDriver.h (100%) create mode 100644 connectivity/drivers/nfc/PN512/mbed_lib.json rename connectivity/{nfc/source/controllers => drivers/nfc/PN512/source}/PN512Driver.cpp (100%) rename connectivity/{nfc/source/controllers => drivers/nfc/PN512/source}/PN512SPITransportDriver.cpp (100%) rename connectivity/{nfc/source/controllers => drivers/nfc/PN512/source}/PN512TransportDriver.cpp (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_callback.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_cmd.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_cmd.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_hw.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_hw.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_internal.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_irq.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_irq.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_poll.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_poll.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_registers.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_registers.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_rf.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_rf.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_timer.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_timer.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_transceive.c (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_transceive.h (100%) rename connectivity/{nfc/stack/transceiver/pn512 => drivers/nfc/PN512/source/transceiver}/pn512_types.h (100%) diff --git a/connectivity/nfc/controllers/PN512Driver.h b/connectivity/drivers/nfc/PN512/include/PN512Driver.h similarity index 96% rename from connectivity/nfc/controllers/PN512Driver.h rename to connectivity/drivers/nfc/PN512/include/PN512Driver.h index 91a677889f..be849795fb 100644 --- a/connectivity/nfc/controllers/PN512Driver.h +++ b/connectivity/drivers/nfc/PN512/include/PN512Driver.h @@ -25,7 +25,7 @@ #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 "transceiver/pn512.h" namespace mbed { namespace nfc { diff --git a/connectivity/nfc/controllers/PN512SPITransportDriver.h b/connectivity/drivers/nfc/PN512/include/PN512SPITransportDriver.h similarity index 100% rename from connectivity/nfc/controllers/PN512SPITransportDriver.h rename to connectivity/drivers/nfc/PN512/include/PN512SPITransportDriver.h diff --git a/connectivity/nfc/controllers/PN512TransportDriver.h b/connectivity/drivers/nfc/PN512/include/PN512TransportDriver.h similarity index 100% rename from connectivity/nfc/controllers/PN512TransportDriver.h rename to connectivity/drivers/nfc/PN512/include/PN512TransportDriver.h diff --git a/connectivity/drivers/nfc/PN512/mbed_lib.json b/connectivity/drivers/nfc/PN512/mbed_lib.json new file mode 100644 index 0000000000..a58b5d81b9 --- /dev/null +++ b/connectivity/drivers/nfc/PN512/mbed_lib.json @@ -0,0 +1,3 @@ +{ + "name": "PN512-nfc" +} diff --git a/connectivity/nfc/source/controllers/PN512Driver.cpp b/connectivity/drivers/nfc/PN512/source/PN512Driver.cpp similarity index 100% rename from connectivity/nfc/source/controllers/PN512Driver.cpp rename to connectivity/drivers/nfc/PN512/source/PN512Driver.cpp diff --git a/connectivity/nfc/source/controllers/PN512SPITransportDriver.cpp b/connectivity/drivers/nfc/PN512/source/PN512SPITransportDriver.cpp similarity index 100% rename from connectivity/nfc/source/controllers/PN512SPITransportDriver.cpp rename to connectivity/drivers/nfc/PN512/source/PN512SPITransportDriver.cpp diff --git a/connectivity/nfc/source/controllers/PN512TransportDriver.cpp b/connectivity/drivers/nfc/PN512/source/PN512TransportDriver.cpp similarity index 100% rename from connectivity/nfc/source/controllers/PN512TransportDriver.cpp rename to connectivity/drivers/nfc/PN512/source/PN512TransportDriver.cpp diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_callback.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_callback.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_callback.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_callback.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_cmd.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_cmd.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_cmd.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_cmd.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_cmd.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_cmd.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_cmd.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_cmd.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_hw.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_hw.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_hw.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_hw.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_hw.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_hw.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_hw.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_hw.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_internal.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_internal.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_internal.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_internal.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_irq.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_irq.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_irq.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_irq.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_irq.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_irq.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_irq.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_irq.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_poll.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_poll.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_poll.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_poll.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_poll.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_poll.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_poll.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_poll.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_registers.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_registers.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_registers.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_registers.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_registers.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_registers.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_registers.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_registers.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_rf.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_rf.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_rf.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_rf.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_rf.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_rf.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_rf.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_rf.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_timer.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_timer.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_timer.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_timer.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_timer.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_timer.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_timer.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_timer.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_transceive.c b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_transceive.c similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_transceive.c rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_transceive.c diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_transceive.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_transceive.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_transceive.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_transceive.h diff --git a/connectivity/nfc/stack/transceiver/pn512/pn512_types.h b/connectivity/drivers/nfc/PN512/source/transceiver/pn512_types.h similarity index 100% rename from connectivity/nfc/stack/transceiver/pn512/pn512_types.h rename to connectivity/drivers/nfc/PN512/source/transceiver/pn512_types.h