From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
at_response has new parameter bdaddr in new Android API.
---
android/hal-handsfree.c | 12 ++++++++++++
android/hal-ipc-api.txt | 1 +
android/hal-msg.h | 1 +
android/handsfree.c | 5 ++++-
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/android/hal-handsfree.c b/android/hal-handsfree.c
index 058df79..e9388b8 100644
--- a/android/hal-handsfree.c
+++ b/android/hal-handsfree.c
@@ -561,7 +561,12 @@ static bt_status_t formatted_at_response(const char *rsp)
len, cmd, NULL, NULL, NULL);
}
+#if ANDROID_VERSION > PLATFORM_VER(4, 4, 4)
+static bt_status_t at_response(bthf_at_response_t response, int error,
+ bt_bdaddr_t *bd_addr)
+#else
static bt_status_t at_response(bthf_at_response_t response, int error)
+#endif
{
struct hal_cmd_handsfree_at_response cmd;
@@ -570,6 +575,13 @@ static bt_status_t at_response(bthf_at_response_t response, int error)
if (!interface_ready())
return BT_STATUS_NOT_READY;
+#if ANDROID_VERSION > PLATFORM_VER(4, 4, 4)
+ if (!bd_addr)
+ return BT_STATUS_PARM_INVALID;
+
+ memcpy(cmd.bdaddr, bd_addr, sizeof(cmd.bdaddr));
+#endif
+
cmd.response = response;
cmd.error = error;
diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 806114a..b5d5557 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -917,6 +917,7 @@ Commands and responses:
Command parameters: Response code (1 octet)
Error code (1 octet)
+ Remote address (6 octets)
Response parameters: <none>
Valid response codes: 0x00 = ERROR
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 5c5ed22..4b3d8b8 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -568,6 +568,7 @@ struct hal_cmd_handsfree_formatted_at_response {
struct hal_cmd_handsfree_at_response {
uint8_t response;
uint8_t error;
+ uint8_t bdaddr[6];
} __attribute__((packed));
#define HAL_HANDSFREE_CALL_DIRECTION_OUTGOING 0x00
diff --git a/android/handsfree.c b/android/handsfree.c
index 19a46f6..92a341a 100644
--- a/android/handsfree.c
+++ b/android/handsfree.c
@@ -2160,11 +2160,14 @@ static void handle_at_resp(const void *buf, uint16_t len)
{
const struct hal_cmd_handsfree_at_response *cmd = buf;
struct hf_device *dev;
+ bdaddr_t bdaddr;
uint8_t status;
DBG("");
- dev = find_default_device();
+ android2bdaddr(cmd->bdaddr, &bdaddr);
+
+ dev = find_device(&bdaddr);
if (!dev) {
status = HAL_STATUS_FAILED;
goto done;
--
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
