Imported Upstream version 1.1.0

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / bt_edr_adapter / linux / caedradapter.c

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c b/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c
index a33d708..4863861 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c
@@ -25,35 +25,39 @@
 #include "caedradapter.h"
 #include "logger.h"
 
-#define TAG PCF("CA")
+#define TAG PCF("OIC_CA")
 
 static CANetworkPacketReceivedCallback g_edrReceivedCallback = NULL;
 static ca_thread_pool_t g_threadPoolHandle = NULL;
 
 CAResult_t CAInitializeEDR(CARegisterConnectivityCallback registerCallback,
-        CANetworkPacketReceivedCallback reqRespCallback, CANetworkChangeCallback netCallback,
-        ca_thread_pool_t handle)
+                           CANetworkPacketReceivedCallback reqRespCallback,
+                           CANetworkChangeCallback networkStateChangeCallback,
+                           CAErrorHandleCallback errorCallback, ca_thread_pool_t handle)
 {
+    (void)networkStateChangeCallback;
+    (void)errorCallback;
     OIC_LOG(DEBUG, TAG, "CAInitializeEDR");
 
     g_edrReceivedCallback = reqRespCallback;
     g_threadPoolHandle = handle;
 
     // register handlers
-    CAConnectivityHandler_t handler;
-    memset(&handler, 0, sizeof(CAConnectivityHandler_t));
-
-    handler.startAdapter = CAStartEDR;
-    handler.startListenServer = CAStartEDRListeningServer;
-    handler.startDiscoveryServer = CAStartEDRDiscoveryServer;
-    handler.sendData = CASendEDRUnicastData;
-    handler.sendDataToAll = CASendEDRMulticastData;
-    handler.GetnetInfo = CAGetEDRInterfaceInformation;
-    handler.readData = CAReadEDRData;
-    handler.stopAdapter = CAStopEDR;
-    handler.terminate = CATerminateEDR;
-
-    registerCallback(handler, CA_EDR);
+    CAConnectivityHandler_t handler = {
+        .startAdapter = CAStartEDR,
+        .startListenServer = CAStartEDRListeningServer,
+        .stopListenServer = CAStopEDRListeningServer,
+        .startDiscoveryServer = CAStartEDRDiscoveryServer,
+        .sendData = CASendEDRUnicastData,
+        .sendDataToAll = CASendEDRMulticastData,
+        .GetnetInfo = CAGetEDRInterfaceInformation,
+        .readData = CAReadEDRData,
+        .stopAdapter = CAStopEDR,
+        .terminate = CATerminateEDR,
+        .cType = CA_ADAPTER_RFCOMM_BTEDR
+    };
+
+    registerCallback(handler);
 
     return CA_STATUS_OK;
 }
@@ -72,6 +76,13 @@ CAResult_t CAStartEDRListeningServer()
     return CA_STATUS_OK;
 }
 
+CAResult_t CAStopEDRListeningServer()
+{
+    OIC_LOG(DEBUG, TAG, "CAStopEDRListeningServer");
+
+    return CA_STATUS_OK;
+}
+
 CAResult_t CAStartEDRDiscoveryServer()
 {
     OIC_LOG(DEBUG, TAG, "CAStartEDRDiscoveryServer");
@@ -79,23 +90,31 @@ CAResult_t CAStartEDRDiscoveryServer()
     return CA_STATUS_OK;
 }
 
-int32_t CASendEDRUnicastData(const CARemoteEndpoint_t *endpoint, const void *data,
+int32_t CASendEDRUnicastData(const CAEndpoint_t *endpoint, const void *data,
     uint32_t dataLen)
 {
+    (void)endpoint;
+    (void)data;
+    (void)dataLen;
     OIC_LOG(DEBUG, TAG, "CASendEDRUnicastData");
 
     return -1;
 }
 
-int32_t CASendEDRMulticastData(const void *data, uint32_t dataLen)
+int32_t CASendEDRMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLen)
 {
+    (void)endpoint;
+    (void)data;
+    (void)dataLen;
     OIC_LOG(DEBUG, TAG, "CASendEDRMulticastData");
 
     return -1;
 }
 
-CAResult_t CAGetEDRInterfaceInformation(CALocalConnectivity_t **info, uint32_t *size)
+CAResult_t CAGetEDRInterfaceInformation(CAEndpoint_t **info, uint32_t *size)
 {
+    (void)info;
+    (void)size;
     OIC_LOG(DEBUG, TAG, "CAGetEDRInterfaceInformation");
 
     return CA_STATUS_OK;