From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
CHLD Command notification callback has new parameter bdaddr.
---
android/hal-handsfree.c | 4 ++++
android/hal-ipc-api.txt | 1 +
android/hal-msg.h | 1 +
android/handsfree.c | 1 +
4 files changed, 7 insertions(+)
diff --git a/android/hal-handsfree.c b/android/hal-handsfree.c
index 76a2e0f..e4ade61 100644
--- a/android/hal-handsfree.c
+++ b/android/hal-handsfree.c
@@ -158,7 +158,11 @@ static void handle_chld(void *buf, uint16_t len, int fd)
struct hal_ev_handsfree_chld *ev = buf;
if (cbs->chld_cmd_cb)
+#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)
+ cbs->chld_cmd_cb(ev->chld, (bt_bdaddr_t *) (ev->bdaddr));
+#else
cbs->chld_cmd_cb(ev->chld);
+#endif
}
static void handle_cnum(void *buf, uint16_t len, int fd)
diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 10808f4..06a2beb 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1051,6 +1051,7 @@ Notifications:
Opcode 0x8a - CHLD Command notification
Notification parameters: NREC types (1 octet)
+ Remote address (6 octets)
Valid CHLD types: 0x00 = Release and hold
0x01 = Release active and accept held
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 321f193..24780f5 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1396,6 +1396,7 @@ struct hal_ev_handsfree_nrec {
#define HAL_EV_HANDSFREE_CHLD 0x8A
struct hal_ev_handsfree_chld {
uint8_t chld;
+ uint8_t bdaddr[6];
} __attribute__((packed));
#define HAL_EV_HANDSFREE_CNUM 0x8B
diff --git a/android/handsfree.c b/android/handsfree.c
index f47eaae..3bfb2ee 100644
--- a/android/handsfree.c
+++ b/android/handsfree.c
@@ -1352,6 +1352,7 @@ static void at_cmd_chld(struct hfp_context *result, enum hfp_gw_cmd_type type,
/* value match HAL type */
ev.chld = val;
+ bdaddr2android(&dev->bdaddr, ev.bdaddr);
ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
HAL_EV_HANDSFREE_CHLD, sizeof(ev), &ev);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
