diff options
| author | Seonah Moon <seonah1.moon@samsung.com> | 2015-04-23 10:20:43 +0900 |
|---|---|---|
| committer | Seonah Moon <seonah1.moon@samsung.com> | 2015-04-23 10:25:40 +0900 |
| commit | 9e7ccc53900e9fe24bfcf56c22a4c6be7b002dc5 (patch) | |
| tree | c69cdfd7bc8d38d28b9036e184a384f755347939 | |
| parent | 0e96b37eecbfff07ae4729a149aeab57a15b301b (diff) | |
| download | connman-9e7ccc53900e9fe24bfcf56c22a4c6be7b002dc5.tar.gz connman-9e7ccc53900e9fe24bfcf56c22a4c6be7b002dc5.tar.bz2 connman-9e7ccc53900e9fe24bfcf56c22a4c6be7b002dc5.zip | |
Add TIZEN_EXT patch to ignore rfkill blocksubmit/tizen/20150423.014141accepted/tizen/wearable/20150423.084720accepted/tizen/tv/20150423.084606accepted/tizen/mobile/20150423.084813accepted/tizen/common/20150423.074131
Change-Id: I624a38019f853988eabe65fb8552710d5dd7aeb7
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | packaging/connman.spec | 1 | ||||
| -rw-r--r-- | resources/var/lib/connman/settings | 1 | ||||
| -rw-r--r-- | src/rfkill.c | 10 |
4 files changed, 17 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index dee2dcbf..55e983bd 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,12 @@ AC_ARG_ENABLE(hh2serial-gps, AM_CONDITIONAL(HH2SERIAL_GPS, test "${enable_hh2serial_gps}" != "no") AM_CONDITIONAL(HH2SERIAL_GPS_BUILTIN, test "${enable_hh2serial_gps}" = "builtin") +AC_ARG_ENABLE(tizen-ext, + AC_HELP_STRING([--enable-tizen-ext], [enable TIZEN extensions]), + [if (test "${enableval}" = "yes"); then + CFLAGS="$CFLAGS -DTIZEN_EXT" + fi]) + AC_ARG_ENABLE(telephony, AC_HELP_STRING([--enable-telephony], [enable Telephony support]), [enable_telephony=${enableval}], [enable_telephony="yes"]) diff --git a/packaging/connman.spec b/packaging/connman.spec index 830977e6..7747d9bc 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -94,6 +94,7 @@ chmod +x bootstrap --enable-threads \ --enable-client \ --enable-pacrunner \ + --enable-tizen-ext \ --enable-wifi=builtin \ %if %{with connman_openconnect} --enable-openconnect \ diff --git a/resources/var/lib/connman/settings b/resources/var/lib/connman/settings index ba476b5d..36f38f5f 100644 --- a/resources/var/lib/connman/settings +++ b/resources/var/lib/connman/settings @@ -1,4 +1,3 @@ - [global] OfflineMode=false diff --git a/src/rfkill.c b/src/rfkill.c index 960cfea7..bbb4dd72 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; +#endif DBG("type %d block %d", type, block); +#if defined TIZEN_EXT + DBG("try to set rfkill block %d, but it's not permitted", 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) |