changed discovery provider name. ble -> wifi_direct

Change-Id: I0828f23766ed768083d677c266204b1e91be326d
Signed-off-by: kmook <kmook.choi@samsung.com>

diff --git a/daemon/discovery_mgr_impl.cpp b/daemon/discovery_mgr_impl.cpp
index a3f8cab..a587c6d 100755 (executable)
--- a/daemon/discovery_mgr_impl.cpp
+++ b/daemon/discovery_mgr_impl.cpp
@@ -16,7 +16,7 @@
 
 #include "discovery_mgr_impl.h"
 #include "discovery_provider/smartview_discovery_provider.h"
-#include "discovery_provider/ble_discovery_provider.h"
+#include "discovery_provider/wifi_direct_discovery_provider.h"
 #include "discovery_provider/iotcon_discovery_provider.h"
 #include "access_control/privilege.h"
 
@@ -44,7 +44,7 @@ int conv::discovery_manager_impl::init()
 {
        _D("Discovery_Manager Init!!..");
        register_provider(new(std::nothrow) conv::smartview_discovery_provider());
-       register_provider(new(std::nothrow) conv::ble_discovery_provider());
+       register_provider(new(std::nothrow) conv::wifi_direct_discovery_provider());
        register_provider(new(std::nothrow) conv::iotcon_discovery_provider());
 
        request_map.clear();

diff --git a/daemon/discovery_provider/ble_discovery_provider.cpp b/daemon/discovery_provider/wifi_direct_discovery_provider.cpp
similarity index 92%
rename from daemon/discovery_provider/ble_discovery_provider.cpp
rename to daemon/discovery_provider/wifi_direct_discovery_provider.cpp
index c32f655..11301eb 100755 (executable)
--- a/daemon/discovery_provider/ble_discovery_provider.cpp
+++ b/daemon/discovery_provider/wifi_direct_discovery_provider.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ble_discovery_provider.h"
+#include "wifi_direct_discovery_provider.h"
 #include "../discovery_mgr_impl.h"
 
 #include <net_connection.h>
@@ -27,11 +27,11 @@
 
 using namespace std;
 
-conv::ble_discovery_provider::ble_discovery_provider()
+conv::wifi_direct_discovery_provider::wifi_direct_discovery_provider()
 {
 }
 
-conv::ble_discovery_provider::~ble_discovery_provider()
+conv::wifi_direct_discovery_provider::~wifi_direct_discovery_provider()
 {
 }
 
@@ -63,7 +63,7 @@ bool _cb_discovered_peers_impl(wifi_direct_discovered_peer_info_s* peer, void* u
 #endif
 
 #if 0 // TODO: make and notice if it's device support d2d
-       conv::ble_discovery_provider* disc_provider = (conv::ble_discovery_provider*)user_data;
+       conv::wifi_direct_discovery_provider* disc_provider = (conv::wifi_direct_discovery_provider*)user_data;
        conv::service *conv_service = new(std::nothrow) conv::service;
 
        conv_service->setName(peer->device_name);
@@ -303,31 +303,31 @@ int start_wfd_discovery(void)
 
        return result;
 }
-int conv::ble_discovery_provider::init()
+int conv::wifi_direct_discovery_provider::init()
 {
        //init_wfd_client((void*)this);
-       _D("ble_discovery_provider init done");
+       _D("wifi_direct_discovery_provider init done");
 
        return CONV_ERROR_NONE;
 }
 
-int conv::ble_discovery_provider::release()
+int conv::wifi_direct_discovery_provider::release()
 {
        return CONV_ERROR_NONE;
 }
 
-int conv::ble_discovery_provider::start()
+int conv::wifi_direct_discovery_provider::start()
 {
        //return start_wfd_discovery();
        return CONV_ERROR_NONE;
 }
 
-int conv::ble_discovery_provider::stop()
+int conv::wifi_direct_discovery_provider::stop()
 {
        return CONV_ERROR_NONE;
 }
 
-int conv::ble_discovery_provider::checkExistence(conv::service* conv_service)
+int conv::wifi_direct_discovery_provider::checkExistence(conv::service* conv_service)
 {
        // print conv_service Info..
        _D("Check Existence : %s", conv_service->getName().c_str());
@@ -345,7 +345,7 @@ int conv::ble_discovery_provider::checkExistence(conv::service* conv_service)
        }
 }
 
-int conv::ble_discovery_provider::notice_discovered(conv::service* conv_service)
+int conv::wifi_direct_discovery_provider::notice_discovered(conv::service* conv_service)
 {
        _D("Notice Discovered called with service[%x]", conv_service);
 

diff --git a/daemon/discovery_provider/ble_discovery_provider.h b/daemon/discovery_provider/wifi_direct_discovery_provider.h
similarity index 81%
rename from daemon/discovery_provider/ble_discovery_provider.h
rename to daemon/discovery_provider/wifi_direct_discovery_provider.h
index c1b751a..48b40a0 100755 (executable)
--- a/daemon/discovery_provider/ble_discovery_provider.h
+++ b/daemon/discovery_provider/wifi_direct_discovery_provider.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __BLE_DISCOVERY_PROVIDER_H__
-#define __BLE_DISCOVERY_PROVIDER_H__
+#ifndef __WIFI_DIRECT_DISCOVERY_PROVIDER_H__
+#define __WIFI_DIRECT_DISCOVERY_PROVIDER_H__
 
 #include <iotcon.h>
 #include <glib.h>
@@ -27,10 +27,10 @@
 #include "smartview/service.h"
 
 namespace conv {
-       class ble_discovery_provider : public discovery_provider_base  {
+       class wifi_direct_discovery_provider : public discovery_provider_base  {
                public:
-                       ble_discovery_provider();
-                       ~ble_discovery_provider();
+                       wifi_direct_discovery_provider();
+                       ~wifi_direct_discovery_provider();
 
                        int init();
                        int release();