summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortaesub.kim <taesub.kim@samsung.com>2015-06-25 07:00:22 (GMT)
committerSeonah Moon <seonah1.moon@samsung.com>2015-07-08 06:56:34 (GMT)
commit569ccaa4728078c11bf7a4970a63bfd4ad840709 (patch)
tree92c674f874f9ebc8f93ccfd766a9b9ef09191c6d /src
parent5e922c0ab85ce1f61686093f227da5e23e54ce95 (diff)
downloadconnman-569ccaa4728078c11bf7a4970a63bfd4ad840709.zip
connman-569ccaa4728078c11bf7a4970a63bfd4ad840709.tar.gz
connman-569ccaa4728078c11bf7a4970a63bfd4ad840709.tar.bz2
Disable rfkill block featurerefs/changes/40/43340/1
Change-Id: I279ad9d0e623872f4dcf37a6c3c9cd012842e448 Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/rfkill.c12
-rw-r--r--src/technology.c10
2 files changed, 17 insertions, 5 deletions
diff --git a/src/rfkill.c b/src/rfkill.c
index 960cfea..43be17e 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -73,6 +73,7 @@ static enum connman_service_type convert_type(uint8_t type)
return CONNMAN_SERVICE_TYPE_UNKNOWN;
}
+#if !defined TIZEN_EXT
static enum rfkill_type convert_service_type(enum connman_service_type type)
{
switch (type) {
@@ -95,6 +96,7 @@ static enum rfkill_type convert_service_type(enum connman_service_type type)
return NUM_RFKILL_TYPES;
}
+#endif
static GIOStatus rfkill_process(GIOChannel *chan)
{
@@ -157,13 +159,20 @@ static GIOChannel *channel = NULL;
int __connman_rfkill_block(enum connman_service_type type, bool block)
{
+#if !defined TIZEN_EXT
uint8_t rfkill_type;
struct rfkill_event event;
ssize_t len;
- int fd, err;
+ int fd, err = 0;
+#endif
DBG("type %d block %d", type, block);
+#if defined TIZEN_EXT
+ DBG("try to set rfkill block %d, but it's not pormitted", block);
+
+ return 0;
+#else
rfkill_type = convert_service_type(type);
if (rfkill_type == NUM_RFKILL_TYPES)
return -EINVAL;
@@ -187,6 +196,7 @@ int __connman_rfkill_block(enum connman_service_type type, bool block)
close(fd);
return err;
+#endif
}
int __connman_rfkill_init(void)
diff --git a/src/technology.c b/src/technology.c
index 70732f6..15bb395 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -1549,12 +1549,13 @@ int __connman_technology_enabled(enum connman_service_type type)
DBG("technology %p type %s rfkill %d enabled %d", technology,
get_name(type), technology->rfkill_driven,
technology->enabled);
-
+#if !defined TIZEN_EXT
if (technology->rfkill_driven) {
if (technology->tethering_persistent)
enable_tethering(technology);
return 0;
}
+#endif
return technology_enabled(technology);
}
@@ -1567,10 +1568,10 @@ int __connman_technology_disabled(enum connman_service_type type)
technology = technology_find(type);
if (!technology)
return -ENXIO;
-
+#if !defined TIZEN_EXT
if (technology->rfkill_driven)
return 0;
-
+#endif
for (list = technology->device_list; list; list = list->next) {
struct connman_device *device = list->data;
@@ -1756,11 +1757,12 @@ done:
technology->rfkill_driven = true;
+#if !defined TIZEN_EXT
/* If hardblocked, there is no need to handle softblocked state */
if (technology_apply_rfkill_change(technology,
softblock, hardblock, true))
return 0;
-
+#endif
if (global_offlinemode)
return 0;