From 2d1286883e26d7b483d917ee2f0456762b27e2bb Mon Sep 17 00:00:00 2001 From: Alok Barsode Date: Thu, 7 Aug 2008 14:31:49 +0530 Subject: Adding adapter_set_mode and adapter_get_mode. Signed-off-by: Alok Barsode --- src/adapter.c | 13 +++++++++++++ src/adapter.h | 2 ++ src/dbus-hci.c | 8 ++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index d0ae3190..0657b838 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2709,3 +2709,16 @@ uint8_t adapter_get_scan_mode(struct adapter *adapter) { return adapter->scan_mode; } + +void adapter_set_mode(struct adapter *adapter, uint8_t mode) +{ + if (!adapter) + return; + + adapter->mode = mode; +} + +uint8_t adapter_get_mode(struct adapter *adapter) +{ + return adapter->mode; +} diff --git a/src/adapter.h b/src/adapter.h index b8de61db..19a1a9a8 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -179,3 +179,5 @@ void adapter_set_discov_timeout(struct adapter *adapter, guint interval); void adapter_remove_discov_timeout(struct adapter *adapter); void adapter_set_scan_mode(struct adapter *adapter, uint8_t scan_mode); uint8_t adapter_get_scan_mode(struct adapter *adapter); +void adapter_set_mode(struct adapter *adapter, uint8_t mode); +uint8_t adapter_get_mode(struct adapter *adapter); diff --git a/src/dbus-hci.c b/src/dbus-hci.c index 7697f38d..9b96af7c 100644 --- a/src/dbus-hci.c +++ b/src/dbus-hci.c @@ -271,21 +271,21 @@ static void adapter_mode_changed(struct adapter *adapter, uint8_t scan_mode) switch (scan_mode) { case SCAN_DISABLED: mode = "off"; - adapter->mode = MODE_OFF; + adapter_set_mode(adapter, MODE_OFF); break; case SCAN_PAGE: mode = "connectable"; - adapter->mode = MODE_CONNECTABLE; + adapter_set_mode(adapter, MODE_CONNECTABLE); break; case (SCAN_PAGE | SCAN_INQUIRY): if (adapter->discov_timeout != 0) adapter_set_discov_timeout(adapter, adapter->discov_timeout * 1000); - if (adapter->mode == MODE_LIMITED) { + if (adapter_get_mode(adapter) == MODE_LIMITED) { mode = "limited"; } else { - adapter->mode = MODE_DISCOVERABLE; + adapter_set_mode(adapter, MODE_DISCOVERABLE); mode = "discoverable"; } break; -- cgit