* [PATCH 1/5] device: Don't use device_get_adapter to access device adapter
@ 2012-10-05 12:54 Szymon Janc
2012-10-05 12:54 ` [PATCH 2/5] device: Don't use device_get_addr_type to access device address type Szymon Janc
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Szymon Janc @ 2012-10-05 12:54 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
Use struct btd_device directly to access adapter member.
---
src/device.c | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/device.c b/src/device.c
index 1c65b68..b2285dd 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1451,15 +1451,15 @@ add_uuids:
static void device_remove_profiles(struct btd_device *device, GSList *uuids)
{
- struct btd_adapter *adapter = device_get_adapter(device);
char srcaddr[18], dstaddr[18];
sdp_list_t *records;
GSList *l, *next;
- ba2str(adapter_get_address(adapter), srcaddr);
+ ba2str(adapter_get_address(device->adapter), srcaddr);
ba2str(&device->bdaddr, dstaddr);
- records = read_records(adapter_get_address(adapter), &device->bdaddr);
+ records = read_records(adapter_get_address(device->adapter),
+ &device->bdaddr);
DBG("Removing profiles for %s", dstaddr);
@@ -1527,12 +1527,11 @@ static int rec_cmp(const void *a, const void *b)
static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
{
struct btd_device *device = req->device;
- struct btd_adapter *adapter = device_get_adapter(device);
sdp_list_t *seq;
char srcaddr[18], dstaddr[18];
uint8_t dst_type;
- ba2str(adapter_get_address(adapter), srcaddr);
+ ba2str(adapter_get_address(device->adapter), srcaddr);
ba2str(&device->bdaddr, dstaddr);
for (seq = recs; seq; seq = seq->next) {
@@ -1933,7 +1932,7 @@ static gboolean attrib_disconnected_cb(GIOChannel *io, GIOCondition cond,
* initiated disconnection.
*/
if (err == ETIMEDOUT || err == ECONNRESET || err == ECONNABORTED)
- adapter_connect_list_add(device_get_adapter(device), device);
+ adapter_connect_list_add(device->adapter, device);
done:
attio_cleanup(device);
@@ -2083,7 +2082,7 @@ static void att_error_cb(const GError *gerr, gpointer user_data)
if (device->auto_connect == FALSE)
return;
- adapter_connect_list_add(device_get_adapter(device), device);
+ adapter_connect_list_add(device->adapter, device);
DBG("Enabling automatic connections");
}
@@ -2367,7 +2366,7 @@ void device_set_temporary(struct btd_device *device, gboolean temporary)
DBG("temporary %d", temporary);
if (temporary)
- adapter_connect_list_remove(device_get_adapter(device), device);
+ adapter_connect_list_remove(device->adapter, device);
device->temporary = temporary;
}
@@ -2384,7 +2383,6 @@ void device_set_bonded(struct btd_device *device, gboolean bonded)
void device_set_auto_connect(struct btd_device *device, gboolean enable)
{
- struct btd_adapter *adapter = device_get_adapter(device);
char addr[18];
if (!device)
@@ -2398,7 +2396,7 @@ void device_set_auto_connect(struct btd_device *device, gboolean enable)
/* Disabling auto connect */
if (enable == FALSE) {
- adapter_connect_list_remove(adapter, device);
+ adapter_connect_list_remove(device->adapter, device);
return;
}
@@ -2411,7 +2409,7 @@ void device_set_auto_connect(struct btd_device *device, gboolean enable)
return;
/* Enabling auto connect */
- adapter_connect_list_add(adapter, device);
+ adapter_connect_list_add(device->adapter, device);
}
static gboolean start_discovery(gpointer user_data)
@@ -2714,8 +2712,7 @@ static void pincode_cb(struct agent *agent, DBusError *err,
{
struct authentication_req *auth = data;
struct btd_device *device = auth->device;
- struct btd_adapter *adapter = device_get_adapter(device);
- struct agent *adapter_agent = adapter_get_agent(adapter);
+ struct agent *adapter_agent = adapter_get_agent(device->adapter);
if (err && (g_str_equal(DBUS_ERROR_UNKNOWN_METHOD, err->name) ||
g_str_equal(DBUS_ERROR_NO_REPLY, err->name))) {
@@ -2746,8 +2743,7 @@ static void confirm_cb(struct agent *agent, DBusError *err, void *data)
{
struct authentication_req *auth = data;
struct btd_device *device = auth->device;
- struct btd_adapter *adapter = device_get_adapter(device);
- struct agent *adapter_agent = adapter_get_agent(adapter);
+ struct agent *adapter_agent = adapter_get_agent(device->adapter);
if (err && (g_str_equal(DBUS_ERROR_UNKNOWN_METHOD, err->name) ||
g_str_equal(DBUS_ERROR_NO_REPLY, err->name))) {
@@ -2780,8 +2776,7 @@ static void passkey_cb(struct agent *agent, DBusError *err,
{
struct authentication_req *auth = data;
struct btd_device *device = auth->device;
- struct btd_adapter *adapter = device_get_adapter(device);
- struct agent *adapter_agent = adapter_get_agent(adapter);
+ struct agent *adapter_agent = adapter_get_agent(device->adapter);
if (err && (g_str_equal(DBUS_ERROR_UNKNOWN_METHOD, err->name) ||
g_str_equal(DBUS_ERROR_NO_REPLY, err->name))) {
@@ -2812,8 +2807,7 @@ static void display_pincode_cb(struct agent *agent, DBusError *err, void *data)
{
struct authentication_req *auth = data;
struct btd_device *device = auth->device;
- struct btd_adapter *adapter = device_get_adapter(device);
- struct agent *adapter_agent = adapter_get_agent(adapter);
+ struct agent *adapter_agent = adapter_get_agent(device->adapter);
if (err && (g_str_equal(DBUS_ERROR_UNKNOWN_METHOD, err->name) ||
g_str_equal(DBUS_ERROR_NO_REPLY, err->name))) {
@@ -3235,7 +3229,7 @@ guint btd_device_add_attio_callback(struct btd_device *device,
device->attios = g_slist_append(device->attios, attio);
- adapter_connect_list_add(device_get_adapter(device), device);
+ adapter_connect_list_add(device->adapter, device);
return attio->id;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/5] device: Don't use device_get_addr_type to access device address type
2012-10-05 12:54 [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Szymon Janc
@ 2012-10-05 12:54 ` Szymon Janc
2012-10-05 12:54 ` [PATCH 3/5] adapter: Don't use adapter_get_address to access adapter address Szymon Janc
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2012-10-05 12:54 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
Use struct btd_device directly to access bdaddr_type member.
---
src/device.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/device.c b/src/device.c
index b2285dd..1615747 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1529,7 +1529,6 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
struct btd_device *device = req->device;
sdp_list_t *seq;
char srcaddr[18], dstaddr[18];
- uint8_t dst_type;
ba2str(adapter_get_address(device->adapter), srcaddr);
ba2str(&device->bdaddr, dstaddr);
@@ -1594,9 +1593,7 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)
continue;
}
- dst_type = device_get_addr_type(device);
-
- store_record(srcaddr, dstaddr, dst_type, rec);
+ store_record(srcaddr, dstaddr, device->bdaddr_type, rec);
/* Copy record */
req->records = sdp_list_append(req->records,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] adapter: Don't use adapter_get_address to access adapter address
2012-10-05 12:54 [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Szymon Janc
2012-10-05 12:54 ` [PATCH 2/5] device: Don't use device_get_addr_type to access device address type Szymon Janc
@ 2012-10-05 12:54 ` Szymon Janc
2012-10-05 12:54 ` [PATCH 4/5] adapter: Don't use adapter_get_path to access adapter path Szymon Janc
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2012-10-05 12:54 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
Use struct btd_adapter directly to access bdaddr member.
---
src/adapter.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 7e695b9..885d232 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1884,7 +1884,7 @@ static void create_stored_device_from_ltks(char *key, char *value,
(GCompareFunc) device_address_cmp))
return;
- ba2str(adapter_get_address(adapter), srcaddr);
+ ba2str(&adapter->bdaddr, srcaddr);
if (g_strcmp0(srcaddr, address) == 0)
return;
@@ -3626,8 +3626,8 @@ ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev,
return ret;
}
- return read_pin_code(adapter_get_address(adapter),
- device_get_address(dev), pin_buf);
+ return read_pin_code(&adapter->bdaddr, device_get_address(dev),
+ pin_buf);
}
void btd_adapter_register_powered_callback(struct btd_adapter *adapter,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] adapter: Don't use adapter_get_path to access adapter path
2012-10-05 12:54 [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Szymon Janc
2012-10-05 12:54 ` [PATCH 2/5] device: Don't use device_get_addr_type to access device address type Szymon Janc
2012-10-05 12:54 ` [PATCH 3/5] adapter: Don't use adapter_get_address to access adapter address Szymon Janc
@ 2012-10-05 12:54 ` Szymon Janc
2012-10-05 12:54 ` [PATCH 5/5] device: Move auth_type_t definition to device.c Szymon Janc
2012-10-05 13:13 ` [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Johan Hedberg
4 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2012-10-05 12:54 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
Use struct btd_adapter directly to access path member.
---
src/adapter.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 885d232..2f8c8a3 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3183,7 +3183,6 @@ done:
void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode)
{
- const gchar *path = adapter_get_path(adapter);
gboolean discoverable, pairable;
DBG("old 0x%02x new 0x%02x", adapter->scan_mode, scan_mode);
@@ -3218,7 +3217,7 @@ void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode)
ADAPTER_INTERFACE, "Pairable",
DBUS_TYPE_BOOLEAN, &pairable);
- emit_property_changed(path,
+ emit_property_changed(adapter->path,
ADAPTER_INTERFACE, "Discoverable",
DBUS_TYPE_BOOLEAN, &discoverable);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/5] device: Move auth_type_t definition to device.c
2012-10-05 12:54 [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Szymon Janc
` (2 preceding siblings ...)
2012-10-05 12:54 ` [PATCH 4/5] adapter: Don't use adapter_get_path to access adapter path Szymon Janc
@ 2012-10-05 12:54 ` Szymon Janc
2012-10-05 13:13 ` [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Johan Hedberg
4 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2012-10-05 12:54 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
Bonding is handled in device.c and auth_type_t is private device data
not used outside of it.
---
src/device.c | 8 ++++++++
src/device.h | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/device.c b/src/device.c
index 1615747..28fc989 100644
--- a/src/device.c
+++ b/src/device.c
@@ -82,6 +82,14 @@ struct bonding_req {
struct btd_device *device;
};
+typedef enum {
+ AUTH_TYPE_PINCODE,
+ AUTH_TYPE_PASSKEY,
+ AUTH_TYPE_CONFIRM,
+ AUTH_TYPE_NOTIFY_PASSKEY,
+ AUTH_TYPE_NOTIFY_PINCODE,
+} auth_type_t;
+
struct authentication_req {
auth_type_t type;
void *cb;
diff --git a/src/device.h b/src/device.h
index 0c16c18..d23f40d 100644
--- a/src/device.h
+++ b/src/device.h
@@ -26,14 +26,6 @@
struct btd_device;
-typedef enum {
- AUTH_TYPE_PINCODE,
- AUTH_TYPE_PASSKEY,
- AUTH_TYPE_CONFIRM,
- AUTH_TYPE_NOTIFY_PASSKEY,
- AUTH_TYPE_NOTIFY_PINCODE,
-} auth_type_t;
-
struct btd_device *device_create(struct btd_adapter *adapter,
const char *address, uint8_t bdaddr_type);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/5] device: Don't use device_get_adapter to access device adapter
2012-10-05 12:54 [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Szymon Janc
` (3 preceding siblings ...)
2012-10-05 12:54 ` [PATCH 5/5] device: Move auth_type_t definition to device.c Szymon Janc
@ 2012-10-05 13:13 ` Johan Hedberg
4 siblings, 0 replies; 6+ messages in thread
From: Johan Hedberg @ 2012-10-05 13:13 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth
Hi Szymon,
On Fri, Oct 05, 2012, Szymon Janc wrote:
> Use struct btd_device directly to access adapter member.
>
> ---
> src/device.c | 34 ++++++++++++++--------------------
> 1 file changed, 14 insertions(+), 20 deletions(-)
All patches in this set have been applied. Thanks.
Johan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-10-05 13:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-05 12:54 [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Szymon Janc
2012-10-05 12:54 ` [PATCH 2/5] device: Don't use device_get_addr_type to access device address type Szymon Janc
2012-10-05 12:54 ` [PATCH 3/5] adapter: Don't use adapter_get_address to access adapter address Szymon Janc
2012-10-05 12:54 ` [PATCH 4/5] adapter: Don't use adapter_get_path to access adapter path Szymon Janc
2012-10-05 12:54 ` [PATCH 5/5] device: Move auth_type_t definition to device.c Szymon Janc
2012-10-05 13:13 ` [PATCH 1/5] device: Don't use device_get_adapter to access device adapter Johan Hedberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).