summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2006-08-22 10:44:49 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2006-08-22 10:44:49 +0000
commit19d00ec64821c58447e1bb1110cadb2b0d43092c (patch)
tree45b129c77e877c5e802fdb43bddfce187f4a3270
parent1ae4a800cdffe7349c92f11c577958642ead7de7 (diff)
Improve error reporting for failed HCI commands
-rw-r--r--hcid/dbus-adapter.c6
-rw-r--r--hcid/dbus.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index b358a419..93bf0e63 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -1770,7 +1770,9 @@ static DBusHandlerResult handle_dev_create_bonding_req(DBusConnection *conn, DBu
}
if (rp.status) {
- error("Failed with status 0x%02x", rp.status);
+ error("%s failed with status 0x%02x", rq.ocf == OCF_CREATE_CONN ?
+ "HCI_Create_Connection" : "HCI_Authentication_Requested",
+ rp.status);
hci_close_dev(dd);
return error_failed(conn, msg, bt_error(rp.status));
}
@@ -2185,7 +2187,7 @@ static DBusHandlerResult handle_dev_discover_devices_req(DBusConnection *conn, D
}
if (rp.status) {
- error("Failed with status 0x%02x", rp.status);
+ error("HCI_Inquiry command failed with status 0x%02x", rp.status);
hci_close_dev(dd);
return error_failed(conn, msg, bt_error(rp.status));
}
diff --git a/hcid/dbus.c b/hcid/dbus.c
index 089dc232..a73bd823 100644
--- a/hcid/dbus.c
+++ b/hcid/dbus.c
@@ -1346,7 +1346,8 @@ void hcid_dbus_conn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, b
}
if (rp.status) {
- error("Failed with status 0x%02x", rp.status);
+ error("HCI_Authentication_Requested failed with status 0x%02x",
+ rp.status);
error_failed(connection, pdata->bonding->rq, bt_error(rp.status));
goto bonding_failed;
}