Revert "Merge branch 'ofwdev' into 420"

This reverts commit 430a9be02a, reversing
changes made to e2faf2e0e7.

lib/ST25RFAL002/include/rfal_rf.h

@@ -1496,15 +1496,6 @@ ReturnCode rfalTransceiveBlockingTxRx(
     uint32_t flags,
     uint32_t fwt);
 
-ReturnCode rfalTransceiveBitsBlockingTxRx(
-    uint8_t* txBuf,
-    uint16_t txBufLen,
-    uint8_t* rxBuf,
-    uint16_t rxBufLen,
-    uint16_t* actLen,
-    uint32_t flags,
-    uint32_t fwt);
-
 ReturnCode rfalTransceiveBitsBlockingTx(
     uint8_t* txBuf,
     uint16_t txBufLen,

lib/ST25RFAL002/source/st25r3916/rfal_rfst25r3916.c

@@ -1607,23 +1607,6 @@ ReturnCode rfalTransceiveBlockingTxRx(
     return ret;
 }
 
-ReturnCode rfalTransceiveBitsBlockingTxRx(
-    uint8_t* txBuf,
-    uint16_t txBufLen,
-    uint8_t* rxBuf,
-    uint16_t rxBufLen,
-    uint16_t* actLen,
-    uint32_t flags,
-    uint32_t fwt) {
-    ReturnCode ret;
-
-    EXIT_ON_ERR(
-        ret, rfalTransceiveBitsBlockingTx(txBuf, txBufLen, rxBuf, rxBufLen, actLen, flags, fwt));
-    ret = rfalTransceiveBlockingRx();
-
-    return ret;
-}
-
 /*******************************************************************************/
 static ReturnCode rfalRunTransceiveWorker(void) {
     if(gRFAL.state == RFAL_STATE_TXRX) {

lib/nfc/SConscript

@@ -4,9 +4,6 @@ env.Append(
     CPPPATH=[
         "#/lib/nfc",
     ],
-    SDK_HEADERS=[
-        File("#/lib/nfc/nfc_device.h"),
-    ],
 )
 
 libenv = env.Clone(FW_LIB_NAME="nfc")

lib/nfc/nfc_device.h

@@ -13,10 +13,6 @@
 #include <lib/nfc/protocols/mifare_classic.h>
 #include <lib/nfc/protocols/mifare_desfire.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define NFC_DEV_NAME_MAX_LEN 22
 #define NFC_READER_DATA_MAX_SIZE 64
 #define NFC_DICT_KEY_BATCH_SIZE 50
@@ -109,7 +105,3 @@ bool nfc_device_delete(NfcDevice* dev, bool use_load_path);
 bool nfc_device_restore(NfcDevice* dev, bool use_load_path);
 
 void nfc_device_set_loading_callback(NfcDevice* dev, NfcLoadingCallback callback, void* context);
-
-#ifdef __cplusplus
-}
-#endif