diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2014-11-06 10:32:09 +0200 |
|---|---|---|
| committer | Szymon Janc <szymon.janc@tieto.com> | 2014-11-06 12:31:32 +0100 |
| commit | bcfbdd059edd4ffc6c54fd6d045766ab9b9974f0 (patch) | |
| tree | b975350a36715fa53d9a5462fe870247d7244cf1 /android | |
| parent | 1fec414bf04822d01a7a4ae92af8f8bdd4b37f81 (diff) | |
| download | bluez-bcfbdd059edd4ffc6c54fd6d045766ab9b9974f0.tar.gz | |
android/handsfree: Add support for new API for key_pressed_cmd_cb
Key Pressed Command notification callback has new parameter bdaddr.
Diffstat (limited to 'android')
| -rw-r--r-- | android/hal-handsfree.c | 9 | ||||
| -rw-r--r-- | android/hal-ipc-api.txt | 2 | ||||
| -rw-r--r-- | android/hal-msg.h | 3 | ||||
| -rw-r--r-- | android/handsfree.c | 6 |
4 files changed, 17 insertions, 3 deletions
diff --git a/android/hal-handsfree.c b/android/hal-handsfree.c index 76e036ab0..2834c8051 100644 --- a/android/hal-handsfree.c +++ b/android/hal-handsfree.c @@ -238,8 +238,15 @@ static void handle_unknown_at(void *buf, uint16_t len, int fd) static void handle_hsp_key_press(void *buf, uint16_t len, int fd) { - if (cbs->key_pressed_cmd_cb) + if (cbs->key_pressed_cmd_cb) { +#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0) + struct hal_ev_handsfree_hsp_key_press *ev = buf; + + cbs->key_pressed_cmd_cb((bt_bdaddr_t *) (ev->bdaddr)); +#else cbs->key_pressed_cmd_cb(); +#endif + } } /* diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt index 9581d54c3..666e27fa5 100644 --- a/android/hal-ipc-api.txt +++ b/android/hal-ipc-api.txt @@ -1081,7 +1081,7 @@ Notifications: Opcode 0x90 - Key Pressed Command notification - Notification parameters: <none> + Notification parameters: Remote address (6 octets) Bluetooth Advanced Audio HAL (ID 6) diff --git a/android/hal-msg.h b/android/hal-msg.h index f86e6b771..eef226eb7 100644 --- a/android/hal-msg.h +++ b/android/hal-msg.h @@ -1427,6 +1427,9 @@ struct hal_ev_handsfree_unknown_at { } __attribute__((packed)); #define HAL_EV_HANDSFREE_HSP_KEY_PRESS 0x90 +struct hal_ev_handsfree_hsp_key_press { + uint8_t bdaddr[6]; +} __attribute__((packed)); #define HAL_AVRCP_FEATURE_NONE 0x00 #define HAL_AVRCP_FEATURE_METADATA 0x01 diff --git a/android/handsfree.c b/android/handsfree.c index 1a9a70ace..b410f5dad 100644 --- a/android/handsfree.c +++ b/android/handsfree.c @@ -1143,6 +1143,7 @@ static void at_cmd_ckpd(struct hfp_context *result, enum hfp_gw_cmd_type type, void *user_data) { struct hf_device *dev = user_data; + struct hal_ev_handsfree_hsp_key_press ev; unsigned int val; DBG(""); @@ -1155,8 +1156,11 @@ static void at_cmd_ckpd(struct hfp_context *result, enum hfp_gw_cmd_type type, if (hfp_context_has_next(result)) break; + bdaddr2android(&dev->bdaddr, ev.bdaddr); + ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HANDSFREE, - HAL_EV_HANDSFREE_HSP_KEY_PRESS, 0, NULL); + HAL_EV_HANDSFREE_HSP_KEY_PRESS, + sizeof(ev), &ev); hfp_gw_send_result(dev->gw, HFP_RESULT_OK); return; |