#include "canfcinterface.h"
#include "caqueueingthread.h"
#include "caadapterutils.h"
-#include "camutex.h"
+#include "octhread.h"
#include "uarraylist.h"
#include "caremotehandler.h"
#include "logger.h"
static CANetworkPacketReceivedCallback g_packetReceivedCallback = NULL;
/**
- * Network Changed Callback to CA
+ * Adapter Changed Callback to CA
*/
-static CANetworkChangeCallback g_connectionStateCallback = NULL;
+static CAAdapterChangeCallback g_adapterStateCallback = NULL;
/**
* error Callback to CA adapter
*/
static CAErrorHandleCallback g_errorCallback = NULL;
-static void CANFCPacketReceivedCB(const CASecureEndpoint_t *endpoint, const void *data,
- uint32_t dataLength);
+static CAResult_t CANFCPacketReceivedCB(const CASecureEndpoint_t *endpoint,
+ const void *data, uint32_t dataLength);
#ifndef SINGLE_THREAD
static CAResult_t CANFCInitializeQueueHandles();
(void)status;
}
-void CANFCPacketReceivedCB(const CASecureEndpoint_t *sep, const void *data, uint32_t dataLength)
+CAResult_t CANFCPacketReceivedCB(const CASecureEndpoint_t *sep, const void *data,
+ uint32_t dataLength)
{
OIC_LOG(DEBUG, TAG, "IN");
- VERIFY_NON_NULL_VOID(sep, TAG, "endpoint is NULL");
- VERIFY_NON_NULL_VOID(data, TAG, "data is NULL");
+ VERIFY_NON_NULL(sep, TAG, "endpoint is NULL");
+ VERIFY_NON_NULL(data, TAG, "data is NULL");
if (0 == dataLength)
{
OIC_LOG(ERROR, TAG, "Invalid call, data length is 0");
- return;
+ return CA_STATUS_FAILED;
}
OIC_LOG_V(DEBUG, TAG, "Address: %s, port:%d", sep->endpoint.addr, sep->endpoint.port);
}
OIC_LOG(DEBUG, TAG, "OUT");
+
+ return CA_STATUS_OK;
}
void CANFCErrorHandler(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength,
CAResult_t CAInitializeNFC(CARegisterConnectivityCallback registerCallback,
CANetworkPacketReceivedCallback packetReceivedCallback,
- CANetworkChangeCallback connectionStateCallback,
+ CAAdapterChangeCallback netCallback,
CAErrorHandleCallback errorCallback, ca_thread_pool_t handle)
{
OIC_LOG(DEBUG, TAG, "IN");
VERIFY_NON_NULL(registerCallback, TAG, "registerCallback");
VERIFY_NON_NULL(packetReceivedCallback, TAG, "packetReceivedCallback");
- VERIFY_NON_NULL(connectionStateCallback, TAG, "connectionStateCallback");
+ VERIFY_NON_NULL(netCallback, TAG, "netCallback");
VERIFY_NON_NULL(handle, TAG, "thread pool handle");
- g_connectionStateCallback = connectionStateCallback;
+ g_adapterStateCallback = netCallback;
g_packetReceivedCallback = packetReceivedCallback;
g_errorCallback = errorCallback;
}
-int32_t CASendNFCUnicastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength)
+int32_t CASendNFCUnicastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength,
+ CADataType_t dataType)
{
+ (void)dataType;
return CAQueueNFCData(endpoint, data, dataLength);
}
-int32_t CASendNFCMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength)
+int32_t CASendNFCMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength,
+ CADataType_t dataType)
{
+ (void)dataType;
return CAQueueNFCData(endpoint, data, dataLength);
}