summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/adapter.c20
-rw-r--r--src/dbus-hci.c20
-rw-r--r--src/dbus-hci.h2
3 files changed, 20 insertions, 22 deletions
diff --git a/src/adapter.c b/src/adapter.c
index 0c85fe52..53a06101 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -167,6 +167,26 @@ static DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn,
err > 0 ? strerror(err) : "Connection attempt failed");
}
+static int found_device_cmp(const struct remote_dev_info *d1,
+ const struct remote_dev_info *d2)
+{
+ int ret;
+
+ if (bacmp(&d2->bdaddr, BDADDR_ANY)) {
+ ret = bacmp(&d1->bdaddr, &d2->bdaddr);
+ if (ret)
+ return ret;
+ }
+
+ if (d2->name_status != NAME_ANY) {
+ ret = (d1->name_status - d2->name_status);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
static int auth_req_cmp(const void *p1, const void *p2)
{
const struct pending_auth_info *pb1 = p1;
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index f0129005..465a1072 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -90,26 +90,6 @@ void bonding_request_free(struct bonding_request_info *bonding)
g_free(bonding);
}
-int found_device_cmp(const struct remote_dev_info *d1,
- const struct remote_dev_info *d2)
-{
- int ret;
-
- if (bacmp(&d2->bdaddr, BDADDR_ANY)) {
- ret = bacmp(&d1->bdaddr, &d2->bdaddr);
- if (ret)
- return ret;
- }
-
- if (d2->name_status != NAME_ANY) {
- ret = (d1->name_status - d2->name_status);
- if (ret)
- return ret;
- }
-
- return 0;
-}
-
int active_conn_find_by_bdaddr(const void *data, const void *user_data)
{
const struct active_conn_info *con = data;
diff --git a/src/dbus-hci.h b/src/dbus-hci.h
index 621657d0..72b22741 100644
--- a/src/dbus-hci.h
+++ b/src/dbus-hci.h
@@ -55,8 +55,6 @@ int cancel_periodic_discovery(struct adapter *adapter);
int active_conn_find_by_bdaddr(const void *data, const void *user_data);
void bonding_request_free(struct bonding_request_info *dev);
-int found_device_cmp(const struct remote_dev_info *d1,
- const struct remote_dev_info *d2);
int set_limited_discoverable(int dd, const uint8_t *cls, gboolean limited);
int set_service_classes(int dd, const uint8_t *cls, uint8_t value);