diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2006-09-21 12:59:55 +0000 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2006-09-21 12:59:55 +0000 |
| commit | f3658d422b593a568743b7e9ff3a84f82413c7aa (patch) | |
| tree | 86f13273cf033123ac4f5627a0050f6b3ecb1047 /hcid/dbus-adapter.c | |
| parent | fae7dc081b3e3d7fac5a5740e1b6976d3e50ba14 (diff) | |
DiscoveryCompleted:send this signal properly when inq is called inside the periodic inq idle interval
Diffstat (limited to 'hcid/dbus-adapter.c')
| -rw-r--r-- | hcid/dbus-adapter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c index fb9da371..0a0fae55 100644 --- a/hcid/dbus-adapter.c +++ b/hcid/dbus-adapter.c @@ -203,7 +203,7 @@ static int check_address(const char *addr) return 0; } -static int cancel_remote_name(struct hci_dbus_data *pdata) +int pending_remote_name_cancel(struct hci_dbus_data *pdata) { struct discovered_dev_info *dev, match; struct slist *l; @@ -1916,7 +1916,7 @@ static DBusHandlerResult handle_dev_create_bonding_req(DBusConnection *conn, DBu if (dbus_data->disc_active || !dbus_data->pinq_idle) return error_discover_in_progress(conn, msg); - cancel_remote_name(dbus_data); + pending_remote_name_cancel(dbus_data); if (dbus_data->bonding) return error_bonding_in_progress(conn, msg); @@ -2288,7 +2288,7 @@ static DBusHandlerResult handle_dev_start_periodic_req(DBusConnection *conn, DBu if (dbus_data->disc_active || dbus_data->pdisc_active) return error_discover_in_progress(conn, msg); - cancel_remote_name(dbus_data); + pending_remote_name_cancel(dbus_data); dd = hci_open_dev(dbus_data->dev_id); if (dd < 0) @@ -2389,7 +2389,7 @@ static DBusHandlerResult handle_dev_discover_devices_req(DBusConnection *conn, D if (dbus_data->disc_active || dbus_data->pdisc_active) return error_discover_in_progress(conn, msg); - cancel_remote_name(dbus_data); + pending_remote_name_cancel(dbus_data); if (dbus_data->bonding) return error_bonding_in_progress(conn, msg); |