projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
connectivity
/
src
/
nfc_adapter
/
canfcadapter.c
diff --git
a/resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
b/resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
index
eddee4d
..
7f77e69
100644
(file)
--- a/
resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
+++ b/
resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
@@
-19,7
+19,7
@@
#include "canfcinterface.h"
#include "caqueueingthread.h"
#include "caadapterutils.h"
#include "canfcinterface.h"
#include "caqueueingthread.h"
#include "caadapterutils.h"
-#include "
camutex
.h"
+#include "
octhread
.h"
#include "uarraylist.h"
#include "caremotehandler.h"
#include "logger.h"
#include "uarraylist.h"
#include "caremotehandler.h"
#include "logger.h"
@@
-67,8
+67,8
@@
static CAAdapterChangeCallback g_adapterStateCallback = NULL;
*/
static CAErrorHandleCallback g_errorCallback = NULL;
*/
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();
#ifndef SINGLE_THREAD
static CAResult_t CANFCInitializeQueueHandles();
@@
-137,17
+137,18
@@
void CANFCConnectionStateCB(const char *nfcAddress, CANetworkStatus_t status)
(void)status;
}
(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");
{
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");
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_V(DEBUG, TAG, "Address: %s, port:%d", sep->endpoint.addr, sep->endpoint.port);
@@
-158,6
+159,8
@@
void CANFCPacketReceivedCB(const CASecureEndpoint_t *sep, const void *data, uint
}
OIC_LOG(DEBUG, TAG, "OUT");
}
OIC_LOG(DEBUG, TAG, "OUT");
+
+ return CA_STATUS_OK;
}
void CANFCErrorHandler(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength,
}
void CANFCErrorHandler(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLength,
@@
-300,13
+303,17
@@
static int32_t CAQueueNFCData(const CAEndpoint_t *endpoint, const void *data,
}
}
-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);
}
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);
}
return CAQueueNFCData(endpoint, data, dataLength);
}