* [PATCH 1/2] Pass confirm name as bool value
@ 2012-10-10 13:19 Szymon Janc
2012-10-10 13:19 ` [PATCH 2/2] event: Use bool instead gboolean for legacy parameter Szymon Janc
2012-10-10 15:00 ` [PATCH 1/2] Pass confirm name as bool value Johan Hedberg
0 siblings, 2 replies; 3+ messages in thread
From: Szymon Janc @ 2012-10-10 13:19 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
confirm_name is a boolean value and can be pass as such instead of
uint8_t.
---
src/adapter.c | 2 +-
src/adapter.h | 3 ++-
src/event.c | 2 +-
src/event.h | 2 +-
src/mgmt.c | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index ad8ee06..368eedb 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 b5bff10..6c29f2f 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 83b6e90..4f4fc93 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 a9afa1e..eca4409 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 9353c7d..921c565 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)) {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] event: Use bool instead gboolean for legacy parameter
2012-10-10 13:19 [PATCH 1/2] Pass confirm name as bool value Szymon Janc
@ 2012-10-10 13:19 ` Szymon Janc
2012-10-10 15:00 ` [PATCH 1/2] Pass confirm name as bool value Johan Hedberg
1 sibling, 0 replies; 3+ messages in thread
From: Szymon Janc @ 2012-10-10 13:19 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
This will avoid mixing bool and gboolean in btd_event_device_found
definition. Whole execution chain for legacy parameter is also
converted to bool type.
---
src/adapter.c | 4 ++--
src/adapter.h | 4 ++--
src/event.c | 2 +-
src/event.h | 2 +-
src/mgmt.c | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 368eedb..1b1aadb 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3032,7 +3032,7 @@ void adapter_emit_device_found(struct btd_adapter *adapter,
static struct remote_dev_info *found_device_new(const bdaddr_t *bdaddr,
uint8_t bdaddr_type, const char *name,
const char *alias, uint32_t class,
- gboolean legacy, int flags)
+ bool legacy, int flags)
{
struct remote_dev_info *dev;
@@ -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,
- bool confirm_name, gboolean legacy,
+ bool confirm_name, bool legacy,
uint8_t *data, uint8_t data_len)
{
struct remote_dev_info *dev;
diff --git a/src/adapter.h b/src/adapter.h
index 6c29f2f..d36c717 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -83,7 +83,7 @@ struct remote_dev_info {
uint32_t class;
char *name;
char *alias;
- gboolean legacy;
+ bool legacy;
char **uuids;
size_t uuid_count;
GSList *services;
@@ -129,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,
- bool confirm_name, gboolean legacy,
+ bool confirm_name, bool 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 4f4fc93..5d0fd40 100644
--- a/src/event.c
+++ b/src/event.c
@@ -244,7 +244,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, bool confirm_name,
- gboolean legacy, uint8_t *data,
+ bool legacy, uint8_t *data,
uint8_t data_len)
{
struct btd_adapter *adapter;
diff --git a/src/event.h b/src/event.h
index eca4409..1aa8704 100644
--- a/src/event.h
+++ b/src/event.h
@@ -25,7 +25,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, bool confirm_name,
- gboolean legacy, uint8_t *data,
+ bool legacy, uint8_t *data,
uint8_t data_len);
void btd_event_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name);
void btd_event_conn_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
diff --git a/src/mgmt.c b/src/mgmt.c
index 921c565..2a66be2 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -1635,7 +1635,7 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
uint16_t eir_len;
uint8_t *eir;
bool confirm_name;
- gboolean legacy;
+ bool legacy;
if (len < sizeof(*ev)) {
error("mgmt_device_found too short (%zu bytes)", len);
@@ -1668,7 +1668,7 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
index, addr, ev->rssi, flags, eir_len);
confirm_name = (flags & MGMT_DEV_FOUND_CONFIRM_NAME);
- legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING) ? TRUE : FALSE;
+ legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING);
btd_event_device_found(&info->bdaddr, &ev->addr.bdaddr,
ev->addr.type,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] Pass confirm name as bool value
2012-10-10 13:19 [PATCH 1/2] Pass confirm name as bool value Szymon Janc
2012-10-10 13:19 ` [PATCH 2/2] event: Use bool instead gboolean for legacy parameter Szymon Janc
@ 2012-10-10 15:00 ` Johan Hedberg
1 sibling, 0 replies; 3+ messages in thread
From: Johan Hedberg @ 2012-10-10 15:00 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth
Hi Szymon,
On Wed, Oct 10, 2012, Szymon Janc wrote:
> confirm_name is a boolean value and can be pass as such instead of
> uint8_t.
>
> ---
> src/adapter.c | 2 +-
> src/adapter.h | 3 ++-
> src/event.c | 2 +-
> src/event.h | 2 +-
> src/mgmt.c | 2 +-
> 5 files changed, 6 insertions(+), 5 deletions(-)
Both patches have been applied. Thanks.
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-10 15:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-10 13:19 [PATCH 1/2] Pass confirm name as bool value Szymon Janc
2012-10-10 13:19 ` [PATCH 2/2] event: Use bool instead gboolean for legacy parameter Szymon Janc
2012-10-10 15:00 ` [PATCH 1/2] Pass confirm name as bool value Johan Hedberg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.