diff --git a/android/hal-sco.c b/android/hal-sco.c
index 55e58b5..c0a1fa6 100644
--- a/android/hal-sco.c
+++ b/android/hal-sco.c
return SCO_STATUS_FAILED;
}
-static int ipc_connect_sco(void)
+static int ipc_get_sco_fd(void)
{
int ret = SCO_STATUS_SUCCESS;
pthread_mutex_lock(&sco_mutex);
if (sco_fd < 0) {
- struct sco_rsp_connect rsp;
+ struct sco_rsp_get_fd rsp;
size_t rsp_len = sizeof(rsp);
- DBG("Connecting SCO");
+ DBG("Getting SCO fd");
- ret = sco_ipc_cmd(SCO_SERVICE_ID, SCO_OP_CONNECT, 0, NULL,
+ ret = sco_ipc_cmd(SCO_SERVICE_ID, SCO_OP_GET_FD, 0, NULL,
&rsp_len, &rsp, &sco_fd);
/* Sometimes mtu returned is wrong */
DBG("write to fd %d bytes %zu", sco_fd, bytes);
- if (ipc_connect_sco() != SCO_STATUS_SUCCESS)
+ if (ipc_get_sco_fd() != SCO_STATUS_SUCCESS)
return -1;
if (!out->downmix_buf) {
return -EIO;
}
- if (ipc_connect_sco() != SCO_STATUS_SUCCESS)
+ if (ipc_get_sco_fd() != SCO_STATUS_SUCCESS)
DBG("SCO is not connected yet; get fd on write()");
out = calloc(1, sizeof(struct sco_stream_out));
DBG("Read from fd %d bytes %zu", sco_fd, bytes);
- if (ipc_connect_sco() != SCO_STATUS_SUCCESS)
+ if (ipc_get_sco_fd() != SCO_STATUS_SUCCESS)
return -1;
if (!in->resampler && in->cfg.rate != AUDIO_STREAM_SCO_RATE) {
diff --git a/android/handsfree.c b/android/handsfree.c
index 599f16f..22d1861 100644
--- a/android/handsfree.c
+++ b/android/handsfree.c
}
}
-static void bt_sco_connect(const void *buf, uint16_t len)
+static void bt_sco_get_fd(const void *buf, uint16_t len)
{
int fd;
GError *err;
- struct sco_rsp_connect rsp;
+ struct sco_rsp_get_fd rsp;
DBG("");
DBG("fd %d mtu %u", fd, rsp.mtu);
- ipc_send_rsp_full(sco_ipc, SCO_SERVICE_ID, SCO_OP_CONNECT,
+ ipc_send_rsp_full(sco_ipc, SCO_SERVICE_ID, SCO_OP_GET_FD,
sizeof(rsp), &rsp, fd);
return;
}
static const struct ipc_handler sco_handlers[] = {
- /* SCO_OP_CONNECT */
- { bt_sco_connect, false, 0 }
+ /* SCO_OP_GET_FD */
+ { bt_sco_get_fd, false, 0 }
};
static void bt_sco_unregister(void)
diff --git a/android/sco-ipc-api.txt b/android/sco-ipc-api.txt
index 05848d2..17372fe 100644
--- a/android/sco-ipc-api.txt
+++ b/android/sco-ipc-api.txt
SCO HAL Daemon
----------------------------------------------------
- call connect_sco() --> create SCO socket
- return connect_sco() <-- return socket fd and mtu
+ call get_fd() --> Get SCO socket fd
+ return get_fd() <-- Return SCO socket fd and mtu
SCO Audio Service (ID 0)
========================
Response parameters: Status (1 octet)
- Opcode 0x01 - Connect SCO command
+ Opcode 0x01 - Get SCO fd command
Command parameters: <none>
Response parameters: MTU (2 octets)
diff --git a/android/sco-msg.h b/android/sco-msg.h
index df0d858..74f25b8 100644
--- a/android/sco-msg.h
+++ b/android/sco-msg.h
#define SCO_OP_STATUS IPC_OP_STATUS
-#define SCO_OP_CONNECT 0x01
-struct sco_rsp_connect {
+#define SCO_OP_GET_FD 0x01
+struct sco_rsp_get_fd {
uint16_t mtu;
} __attribute__((packed));