Imported Upstream version 0.9.2

[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 3a31a81..408c164 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c
@@ -27,107 +27,96 @@
 
 #define TAG PCF("CA")
 
-static CANetworkPacketReceivedCallback gEDRReceivedCallback = NULL;
+static CANetworkPacketReceivedCallback g_edrReceivedCallback = NULL;
+static ca_thread_pool_t g_threadPoolHandle = NULL;
 
 CAResult_t CAInitializeEDR(CARegisterConnectivityCallback registerCallback,
-        CANetworkPacketReceivedCallback reqRespCallback, CANetworkChangeCallback netCallback)
+                           CANetworkPacketReceivedCallback reqRespCallback,
+                           CANetworkChangeCallback networkStateChangeCallback,
+                           CAErrorHandleCallback errorCallback, ca_thread_pool_t handle)
 {
-    OIC_LOG_V(DEBUG, TAG, "CAInitializeEDR");
+    OIC_LOG(DEBUG, TAG, "CAInitializeEDR");
 
-    gEDRReceivedCallback = reqRespCallback;
+    g_edrReceivedCallback = reqRespCallback;
+    g_threadPoolHandle = handle;
 
     // register handlers
-    CAConnectivityHandler_t handler;
-    memset(&handler, 0, sizeof(CAConnectivityHandler_t));
+    CAConnectivityHandler_t handler = {};
 
     handler.startAdapter = CAStartEDR;
     handler.startListenServer = CAStartEDRListeningServer;
-    handler.startDiscoverServer = CAStartEDRDiscoveryServer;
+    handler.startDiscoveryServer = CAStartEDRDiscoveryServer;
     handler.sendData = CASendEDRUnicastData;
     handler.sendDataToAll = CASendEDRMulticastData;
-    handler.startNotifyServer = CAStartEDRNotifyServer;
-    handler.sendNotification = CASendEDRNotification;
     handler.GetnetInfo = CAGetEDRInterfaceInformation;
     handler.readData = CAReadEDRData;
     handler.stopAdapter = CAStopEDR;
     handler.terminate = CATerminateEDR;
 
-    registerCallback(handler, CA_EDR);
+    registerCallback(handler, CA_ADAPTER_RFCOMM_BTEDR);
 
     return CA_STATUS_OK;
 }
 
 CAResult_t CAStartEDR()
 {
-    OIC_LOG_V(DEBUG, TAG, "CAStartEDR");
+    OIC_LOG(DEBUG, TAG, "CAStartEDR");
 
     return CA_STATUS_OK;
 }
 
 CAResult_t CAStartEDRListeningServer()
 {
-    OIC_LOG_V(DEBUG, TAG, "CAStartEDRListeningServer");
+    OIC_LOG(DEBUG, TAG, "CAStartEDRListeningServer");
 
     return CA_STATUS_OK;
 }
 
 CAResult_t CAStartEDRDiscoveryServer()
 {
-    OIC_LOG_V(DEBUG, TAG, "CAStartEDRDiscoveryServer");
+    OIC_LOG(DEBUG, TAG, "CAStartEDRDiscoveryServer");
 
     return CA_STATUS_OK;
 }
 
-uint32_t CASendEDRUnicastData(const CARemoteEndpoint_t* endpoint, void* data, uint32_t dataLen)
+int32_t CASendEDRUnicastData(const CAEndpoint_t *endpoint, const void *data,
+    uint32_t dataLen)
 {
-    OIC_LOG_V(DEBUG, TAG, "CASendEDRUnicastData");
+    OIC_LOG(DEBUG, TAG, "CASendEDRUnicastData");
 
-    return 0;
+    return -1;
 }
 
-uint32_t CASendEDRMulticastData(void* data, uint32_t dataLen)
+int32_t CASendEDRMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t dataLen)
 {
-    OIC_LOG_V(DEBUG, TAG, "CASendEDRMulticastData");
+    OIC_LOG(DEBUG, TAG, "CASendEDRMulticastData");
 
-    return 0;
+    return -1;
 }
 
-CAResult_t CAStartEDRNotifyServer()
+CAResult_t CAGetEDRInterfaceInformation(CAEndpoint_t **info, uint32_t *size)
 {
-    OIC_LOG_V(DEBUG, TAG, "CAStartEDRNotifyServer");
-
-    return CA_STATUS_OK;
-}
-
-uint32_t CASendEDRNotification(const CARemoteEndpoint_t* endpoint, void* data, uint32_t dataLen)
-{
-    OIC_LOG_V(DEBUG, TAG, "CASendEDRNotification");
-
-    return 0;
-}
-
-CAResult_t CAGetEDRInterfaceInformation(CALocalConnectivityt_t** info, uint32_t* size)
-{
-    OIC_LOG_V(DEBUG, TAG, "CAGetEDRInterfaceInformation");
+    OIC_LOG(DEBUG, TAG, "CAGetEDRInterfaceInformation");
 
     return CA_STATUS_OK;
 }
 
 CAResult_t CAReadEDRData()
 {
-    OIC_LOG_V(DEBUG, TAG, "Read EDR Data");
+    OIC_LOG(DEBUG, TAG, "Read EDR Data");
 
     return CA_STATUS_OK;
 }
 
 CAResult_t CAStopEDR()
 {
-    OIC_LOG_V(DEBUG, TAG, "CAStopEDR");
+    OIC_LOG(DEBUG, TAG, "CAStopEDR");
 
     return CA_STATUS_OK;
 }
 
 void CATerminateEDR()
 {
-    OIC_LOG_V(DEBUG, TAG, "CATerminateEDR");
+    OIC_LOG(DEBUG, TAG, "CATerminateEDR");
 }
+