From: Arron Wang <[email protected]>

ConnMan should provide the option to enable/disable rfkill operation.

Change-Id: Ifcd06f322c7064125ea0840f3d01a653e7f32194
Signed-off-by: Zhang zhengguang <[email protected]>
---
 configure.ac |    7 +++++++
 src/main.c   |    6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ca4852e..7259e66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,6 +365,13 @@ if (test "${enable_wifi}" != "no"); then
                                                $PATH:/sbin:/usr/sbin)
 fi
 
+AC_ARG_ENABLE(rfkill, AC_HELP_STRING([--disable-rfkill],
+                       [disable device rfkill operation]), [
+       if (test "${enableval}" = "no"); then
+               CFLAGS="$CFLAGS -DDISABLE_RFKILL"
+       fi
+])
+
 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
                        [don't install configuration and data files]),
                                        [enable_datafiles=${enableval}])
diff --git a/src/main.c b/src/main.c
index e795b52..98c5120 100644
--- a/src/main.c
+++ b/src/main.c
@@ -681,8 +681,10 @@ int main(int argc, char *argv[])
        __connman_dhcpv6_init();
        __connman_wpad_init();
        __connman_wispr_init();
-       __connman_rfkill_init();
 
+#ifndef DISABLE_RFKILL
+       __connman_rfkill_init();
+#endif
        g_free(option_config);
        g_free(option_device);
        g_free(option_plugin);
@@ -693,7 +695,9 @@ int main(int argc, char *argv[])
 
        g_source_remove(signal);
 
+#ifndef DISABLE_RFKILL
        __connman_rfkill_cleanup();
+#endif
        __connman_wispr_cleanup();
        __connman_wpad_cleanup();
        __connman_dhcpv6_cleanup();
-- 
1.7.9.5

_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman

Reply via email to