summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@tieto.com>2012-10-10 15:19:57 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-10-10 15:38:54 +0200
commit8cb1d15853cdd797ab5e283f306bddaf11f4bb16 (patch)
tree0359cfdee966bd70877a620e792bfd8329885cbe
parent9db6a5bf571b491ad776cb2c910a1591e4eeaaab (diff)
core: Pass confirm name as bool value
confirm_name is a boolean value and can be pass as such instead of uint8_t.
-rw-r--r--src/adapter.c2
-rw-r--r--src/adapter.h3
-rw-r--r--src/event.c2
-rw-r--r--src/event.h2
-rw-r--r--src/mgmt.c2
5 files changed, 6 insertions, 5 deletions
diff --git a/src/adapter.c b/src/adapter.c
index ad8ee06e..368eedb5 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3145,7 +3145,7 @@ static gboolean connect_pending_cb(gpointer user_data)
void adapter_update_found_devices(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
- uint8_t confirm_name, gboolean legacy,
+ bool confirm_name, gboolean legacy,
uint8_t *data, uint8_t data_len)
{
struct remote_dev_info *dev;
diff --git a/src/adapter.h b/src/adapter.h
index b5bff10e..6c29f2f9 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -28,6 +28,7 @@
#include <bluetooth/hci_lib.h>
#include <dbus/dbus.h>
#include <glib.h>
+#include <stdbool.h>
#define ADAPTER_INTERFACE "org.bluez.Adapter"
@@ -128,7 +129,7 @@ struct remote_dev_info *adapter_search_found_devices(struct btd_adapter *adapter
void adapter_update_found_devices(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
- uint8_t confirm_name, gboolean legacy,
+ bool confirm_name, gboolean legacy,
uint8_t *data, uint8_t data_len);
void adapter_emit_device_found(struct btd_adapter *adapter,
struct remote_dev_info *dev);
diff --git a/src/event.c b/src/event.c
index 83b6e90b..4f4fc93f 100644
--- a/src/event.c
+++ b/src/event.c
@@ -243,7 +243,7 @@ static void update_lastused(bdaddr_t *sba, bdaddr_t *dba, uint8_t dba_type)
}
void btd_event_device_found(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
- int8_t rssi, uint8_t confirm_name,
+ int8_t rssi, bool confirm_name,
gboolean legacy, uint8_t *data,
uint8_t data_len)
{
diff --git a/src/event.h b/src/event.h
index a9afa1e5..eca44097 100644
--- a/src/event.h
+++ b/src/event.h
@@ -24,7 +24,7 @@
int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure);
void btd_event_device_found(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
- int8_t rssi, uint8_t confirm_name,
+ int8_t rssi, bool confirm_name,
gboolean legacy, uint8_t *data,
uint8_t data_len);
void btd_event_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name);
diff --git a/src/mgmt.c b/src/mgmt.c
index 9353c7dc..921c5650 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -1634,7 +1634,7 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
uint32_t flags;
uint16_t eir_len;
uint8_t *eir;
- gboolean confirm_name;
+ bool confirm_name;
gboolean legacy;
if (len < sizeof(*ev)) {