From cd62e2b54d4c7f6e3d5358efee17eb1ff07aae61 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Mon, 6 Feb 2017 11:19:26 +0900 Subject: [PATCH] delete wifi API and pkg config in tizen. since IoTivity already use Tizen Connectivity Manager API instead of wifi API. it should be removed in this and there. Change-Id: I9a61d7d4d323fe83e988c792284179c099bc2855 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/17079 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- .../csdk/connectivity/build/tizen/packaging/com.oic.ca.spec | 1 - resource/csdk/connectivity/build/tizen/scons/SConscript | 2 +- resource/csdk/connectivity/src/ip_adapter/tizen/SConscript | 2 +- .../csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c | 13 ------------- .../SimpleClientServer/packaging/com.oic.ri.sample.spec | 1 - .../stack/samples/tizen/SimpleClientServer/scons/SConscript | 4 ++-- .../stack/samples/tizen/build/packaging/com.oic.ri.spec | 1 - resource/csdk/stack/samples/tizen/build/scons/SConscript | 2 +- tools/tizen/iotivity.spec | 1 - 9 files changed, 5 insertions(+), 22 deletions(-) diff --git a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec index 6af4481..9269526 100644 --- a/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec +++ b/resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec @@ -33,7 +33,6 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(ttrace) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(capi-network-connection) -BuildRequires: pkgconfig(capi-network-wifi) BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: boost-devel BuildRequires: boost-thread diff --git a/resource/csdk/connectivity/build/tizen/scons/SConscript b/resource/csdk/connectivity/build/tizen/scons/SConscript index e05eb3b..19ee696 100644 --- a/resource/csdk/connectivity/build/tizen/scons/SConscript +++ b/resource/csdk/connectivity/build/tizen/scons/SConscript @@ -20,7 +20,7 @@ else: if env.get('LOGGING'): env.AppendUnique(CPPDEFINES = ['TB_LOG']) -env.ParseConfig("pkg-config --cflags --libs capi-network-wifi capi-network-connection dlog ttrace glib-2.0") +env.ParseConfig("pkg-config --cflags --libs capi-network-connection dlog ttrace glib-2.0") if 'ALL' in transport: env.AppendUnique(CPPDEFINES = ['WIFI_ADAPTER', 'NO_ETHERNET_ADAPTER','EDR_ADAPTER','LE_ADAPTER']) print "CA Transport is ALL" diff --git a/resource/csdk/connectivity/src/ip_adapter/tizen/SConscript b/resource/csdk/connectivity/src/ip_adapter/tizen/SConscript index 560891e..6231d5c 100644 --- a/resource/csdk/connectivity/src/ip_adapter/tizen/SConscript +++ b/resource/csdk/connectivity/src/ip_adapter/tizen/SConscript @@ -5,7 +5,7 @@ Import('env', 'src_dir') import os.path -env.ParseConfig("pkg-config --cflags --libs capi-network-wifi capi-network-connection") +env.ParseConfig("pkg-config --cflags --libs capi-network-connection") src_files = [ 'caipnwmonitor.c' ] diff --git a/resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c b/resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c index 783fe4d..3fb48f6 100644 --- a/resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c +++ b/resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include "caipinterface.h" @@ -198,12 +197,6 @@ CAResult_t CAIPStartNetworkMonitor(CAIPAdapterStateChangeCallback callback, { if (!g_adapterCallbackList) { - // Initialize Wifi service. - if (WIFI_ERROR_NONE != wifi_initialize()) - { - OIC_LOG(ERROR, TAG, "wifi_initialize failed"); - } - // Initialize Connections. connection_error_e ret = connection_create(&connection); if (CONNECTION_ERROR_NONE != ret) @@ -232,12 +225,6 @@ CAResult_t CAIPStopNetworkMonitor(CATransportAdapter_t adapter) CAIPUnSetNetworkMonitorCallback(adapter); if (!g_adapterCallbackList) { - // Deinitialize Wifi service. - if (WIFI_ERROR_NONE != wifi_deinitialize()) - { - OIC_LOG(ERROR, TAG, "wifi_deinitialize failed"); - } - // Reset callback for receiving state changes. if (connection) { diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec index baabbbc..256aa0f 100644 --- a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec +++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec @@ -38,7 +38,6 @@ BuildRequires: boost-thread BuildRequires: boost-system BuildRequires: boost-filesystem BuildRequires: pkgconfig(capi-network-connection) -BuildRequires: pkgconfig(capi-network-wifi) BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: scons BuildRequires: com-oic-ri diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript b/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript index 0b3c271..8da0f97 100644 --- a/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript +++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript @@ -32,7 +32,7 @@ sample_dir = build_dir print "MQ flag is %s" % with_mq -env.AppendUnique(CPPFLAGS = ['-std=c++0x', '-fPIC', '-D__TIZEN__','-DWITH_POSIX', '-Wall', '-DSLP_SDK_LOG', '-g','-D_GNU_SOURCE','-DTIZEN_DEBUG_ENABLE', '-DTB_LOG','`pkg-config', '--cflags', '--libs','dlog', 'com.oic.ri', 'capi-network-wifi', 'capi-network-connection', +env.AppendUnique(CPPFLAGS = ['-std=c++0x', '-fPIC', '-D__TIZEN__','-DWITH_POSIX', '-Wall', '-DSLP_SDK_LOG', '-g','-D_GNU_SOURCE','-DTIZEN_DEBUG_ENABLE', '-DTB_LOG','`pkg-config', '--cflags', '--libs','dlog', 'com.oic.ri', 'capi-network-connection', 'gobject-2.0','glib-2.0`']) if routing == 'GW': @@ -41,7 +41,7 @@ elif routing == 'EP': env.AppendUnique(CPPDEFINES = ['ROUTING_EP']) env.Append(LIBS=[ - 'm', 'pthread', 'rt', 'dl', 'stdc++', 'gobject-2.0', 'gio-2.0', 'glib-2.0', 'capi-network-wifi', 'capi-network-connection', 'dlog', 'capi-network-bluetooth', 'connectivity_abstraction', 'coap', 'octbstack', 'ocsrm', 'c_common' + 'm', 'pthread', 'rt', 'dl', 'stdc++', 'gobject-2.0', 'gio-2.0', 'glib-2.0', 'capi-network-connection', 'dlog', 'capi-network-bluetooth', 'connectivity_abstraction', 'coap', 'octbstack', 'ocsrm', 'c_common' ]) if secured == '1': diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec index e55b271..7dd8c8b 100644 --- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec +++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec @@ -35,7 +35,6 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(ttrace) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(capi-network-connection) -BuildRequires: pkgconfig(capi-network-wifi) BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(sqlite3) diff --git a/resource/csdk/stack/samples/tizen/build/scons/SConscript b/resource/csdk/stack/samples/tizen/build/scons/SConscript index a65c554..93512f1 100644 --- a/resource/csdk/stack/samples/tizen/build/scons/SConscript +++ b/resource/csdk/stack/samples/tizen/build/scons/SConscript @@ -20,7 +20,7 @@ else: if env.get('LOGGING'): env.AppendUnique(CPPDEFINES = ['TB_LOG']) -env.ParseConfig("pkg-config --cflags --libs capi-network-wifi capi-network-connection dlog ttrace glib-2.0") +env.ParseConfig("pkg-config --cflags --libs capi-network-connection dlog ttrace glib-2.0") if 'ALL' in transport: env.AppendUnique(CPPDEFINES = ['WIFI_ADAPTER', 'NO_ETHERNET_ADAPTER','EDR_ADAPTER','LE_ADAPTER']) print "CA Transport is ALL" diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index cb82d62..8c75904 100644 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -99,7 +99,6 @@ BuildRequires: gettext-tools BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(ttrace) BuildRequires: pkgconfig(capi-network-connection) -BuildRequires: pkgconfig(capi-network-wifi) BuildRequires: pkgconfig(capi-network-bluetooth) >= 0.1.52 %else %if 0%{?fedora:1} -- 2.7.4