diff options
| -rw-r--r-- | src/dbus-hci.c | 8 | ||||
| -rw-r--r-- | tools/csr.c | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/dbus-hci.c b/src/dbus-hci.c index 8ae43371..bc1528f8 100644 --- a/src/dbus-hci.c +++ b/src/dbus-hci.c @@ -1470,10 +1470,9 @@ void hcid_dbus_conn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, device = adapter_find_device(adapter, paddr); if (device) { + dev_path = device_get_path(device); - dev_path = device_get_path(device); - - dbus_connection_emit_property_changed(connection, + dbus_connection_emit_property_changed(connection, dev_path, DEVICE_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &connected); @@ -1831,7 +1830,8 @@ int hcid_dbus_get_io_cap(bdaddr_t *local, bdaddr_t *remote, agent = adapter->agent; if (!agent) { - if (!(*auth & 0x01)) { + if (device_get_auth(device) == 0x00 || + device_get_auth(device) == 0x01) { /* No input, no output */ *cap = 0x03; return 0; diff --git a/tools/csr.c b/tools/csr.c index b32e4162..0c5ccd3a 100644 --- a/tools/csr.c +++ b/tools/csr.c @@ -374,6 +374,7 @@ static struct { { 3326, "Marcel 4 (2006-06-16)" }, { 3612, "Marcel 5 (2006-10-24)" }, { 4509, "Marcel 6 (2007-06-11)" }, + { 5417, "Marcel 7 (2008-08-26)" }, { 195, "Sniff 1 (2001-11-27)" }, { 220, "Sniff 2 (2002-01-03)" }, { 269, "Sniff 3 (2002-02-22)" }, |