Hi Andrei,
On Wednesday 08 of October 2014 11:23:42 Andrei Emeltchenko wrote:
> Hi Szymon,
>
> On Wed, Oct 08, 2014 at 09:12:22AM +0200, Szymon Janc wrote:
> > For now this is just dummy to minime use of global static device.
> > ---
> > android/handsfree.c | 321 ++++++++++++++++++++++++++++++++++++++--------------
> > 1 file changed, 238 insertions(+), 83 deletions(-)
> >
> > diff --git a/android/handsfree.c b/android/handsfree.c
> > index 60aa504..58eade4 100644
> > --- a/android/handsfree.c
> > +++ b/android/handsfree.c
> > @@ -172,6 +172,32 @@ static GIOChannel *hsp_server = NULL;
> >
> > static GIOChannel *sco_server = NULL;
> >
> > +static struct hf_device *find_default_device(void)
> > +{
> > + /* TODO should be replaced by find_device() eventually */
> > +
> > + return &device;
> > +}
> > +
> > +static struct hf_device *find_device(const bdaddr_t *bdaddr)
> > +{
> > + if (bacmp(&device.bdaddr, bdaddr))
> > + return NULL;
> > +
> > + return &device;
> > +}
> > +
> > +static struct hf_device *get_device(const bdaddr_t *bdaddr)
> > +{
> > + struct hf_device *dev;
> > +
> > + dev = find_device(bdaddr);
> > + if (dev)
> > + return dev;
> > +
> > + return &device;
> > +}
>
> I think it is better to create list with one element and write code which
> might be useful later. Name find_device as cmp_device and use some list
> function.
This is done in last patch where device finally becomes non-static.
But I'll put those function in right place from beginning so that those are not
moved around in patch 13.
>
> Best regards
> Andrei Emeltchenko
>
> > +
> > static void set_state(struct hf_device *dev, uint8_t state)
> > {
> > struct hal_ev_handsfree_conn_state ev;
> > @@ -1403,6 +1429,7 @@ static void confirm_cb(GIOChannel *chan, gpointer data)
> > char address[18];
> > bdaddr_t bdaddr;
> > GError *err = NULL;
> > + struct hf_device *dev;
> >
> > bt_io_get(chan, &err,
> > BT_IO_OPT_DEST, address,
> > @@ -1416,20 +1443,26 @@ static void confirm_cb(GIOChannel *chan, gpointer data)
> >
> > DBG("incoming connect from %s", address);
> >
> > - if (device.state != HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED) {
> > + dev = get_device(&bdaddr);
> > + if (!dev) {
> > + error("handsfree: Failed to get device object for %s", address);
> > + goto drop;
> > + }
> > +
> > + if (dev->state != HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED) {
> > info("handsfree: refusing connection from %s", address);
> > goto drop;
> > }
> >
> > - device_init(&device, &bdaddr);
> > + device_init(dev, &bdaddr);
> >
> > - if (!bt_io_accept(chan, connect_cb, &device, NULL, NULL)) {
> > + if (!bt_io_accept(chan, connect_cb, dev, NULL, NULL)) {
> > error("handsfree: failed to accept connection");
> > - device_cleanup(&device);
> > + device_cleanup(dev);
> > goto drop;
> > }
> >
> > - device.hsp = GPOINTER_TO_INT(data);
> > + dev->hsp = GPOINTER_TO_INT(data);
> > return;
> >
> > drop:
> > @@ -1612,6 +1645,7 @@ static int sdp_search_hfp(struct hf_device *dev)
> > static void handle_connect(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_connect *cmd = buf;
> > + struct hf_device *dev;
> > char addr[18];
> > uint8_t status;
> > bdaddr_t bdaddr;
> > @@ -1619,23 +1653,34 @@ static void handle_connect(const void *buf, uint16_t len)
> >
> > DBG("");
> >
> > - if (device.state != HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED) {
> > + dev = find_default_device();
> > + if (dev) {
> > status = HAL_STATUS_FAILED;
> > goto failed;
> > }
> >
> > android2bdaddr(&cmd->bdaddr, &bdaddr);
> > + dev = get_device(&bdaddr);
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto failed;
> > + }
> > +
> > + if (dev->state != HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED) {
> > + status = HAL_STATUS_FAILED;
> > + goto failed;
> > + }
> >
> > ba2str(&bdaddr, addr);
> > DBG("connecting to %s", addr);
> >
> > - device_init(&device, &bdaddr);
> > + device_init(dev, &bdaddr);
> >
> > /* prefer HFP over HSP */
> > - ret = hfp_server ? sdp_search_hfp(&device) : sdp_search_hsp(&device);
> > + ret = hfp_server ? sdp_search_hfp(dev) : sdp_search_hsp(dev);
> > if (ret < 0) {
> > error("handsfree: SDP search failed");
> > - device_cleanup(&device);
> > + device_cleanup(dev);
> > status = HAL_STATUS_FAILED;
> > goto failed;
> > }
> > @@ -1650,6 +1695,7 @@ failed:
> > static void handle_disconnect(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_disconnect *cmd = buf;
> > + struct hf_device *dev;
> > bdaddr_t bdaddr;
> > uint8_t status;
> >
> > @@ -1657,23 +1703,28 @@ static void handle_disconnect(const void *buf, uint16_t len)
> >
> > android2bdaddr(cmd->bdaddr, &bdaddr);
> >
> > - if (device.state == HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED ||
> > - bacmp(&device.bdaddr, &bdaddr)) {
> > + dev = find_device(&bdaddr);
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto failed;
> > + }
> > +
> > + if (dev->state == HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED) {
> > status = HAL_STATUS_FAILED;
> > goto failed;
> >
> > }
> >
> > - if (device.state == HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTING) {
> > + if (dev->state == HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTING) {
> > status = HAL_STATUS_SUCCESS;
> > goto failed;
> > }
> >
> > - if (device.state == HAL_EV_HANDSFREE_CONN_STATE_CONNECTING) {
> > - device_cleanup(&device);
> > + if (dev->state == HAL_EV_HANDSFREE_CONN_STATE_CONNECTING) {
> > + device_cleanup(dev);
> > } else {
> > - set_state(&device, HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTING);
> > - hfp_gw_disconnect(device.gw);
> > + set_state(dev, HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTING);
> > + hfp_gw_disconnect(dev->gw);
> > }
> >
> > status = HAL_STATUS_SUCCESS;
> > @@ -1720,6 +1771,7 @@ static bool connect_audio(struct hf_device *dev)
> > static void handle_connect_audio(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_connect_audio *cmd = buf;
> > + struct hf_device *dev;
> > bdaddr_t bdaddr;
> > uint8_t status;
> >
> > @@ -1727,13 +1779,18 @@ static void handle_connect_audio(const void *buf, uint16_t len)
> >
> > android2bdaddr(cmd->bdaddr, &bdaddr);
> >
> > - if (device.audio_state != HAL_EV_HANDSFREE_AUDIO_STATE_DISCONNECTED ||
> > - bacmp(&device.bdaddr, &bdaddr)) {
> > + dev = find_device(&bdaddr);
> > + if (!dev) {
> > status = HAL_STATUS_FAILED;
> > goto done;
> > }
> >
> > - status = connect_audio(&device) ? HAL_STATUS_SUCCESS : HAL_STATUS_FAILED;
> > + if (dev->audio_state != HAL_EV_HANDSFREE_AUDIO_STATE_DISCONNECTED) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > + status = connect_audio(dev) ? HAL_STATUS_SUCCESS : HAL_STATUS_FAILED;
> >
> > done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > @@ -1743,6 +1800,7 @@ done:
> > static void handle_disconnect_audio(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_disconnect_audio *cmd = buf;
> > + struct hf_device *dev;
> > bdaddr_t bdaddr;
> > uint8_t status;
> >
> > @@ -1750,13 +1808,18 @@ static void handle_disconnect_audio(const void *buf, uint16_t len)
> >
> > android2bdaddr(cmd->bdaddr, &bdaddr);
> >
> > - if (device.audio_state != HAL_EV_HANDSFREE_AUDIO_STATE_CONNECTED ||
> > - bacmp(&device.bdaddr, &bdaddr)) {
> > + dev = find_device(&bdaddr);
> > + if (!dev) {
> > status = HAL_STATUS_FAILED;
> > goto done;
> > }
> >
> > - status = disconnect_sco(&device) ? HAL_STATUS_SUCCESS : HAL_STATUS_FAILED;
> > + if (dev->audio_state != HAL_EV_HANDSFREE_AUDIO_STATE_CONNECTED) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > + status = disconnect_sco(dev) ? HAL_STATUS_SUCCESS : HAL_STATUS_FAILED;
> >
> > done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > @@ -1765,34 +1828,50 @@ done:
> >
> > static void handle_start_vr(const void *buf, uint16_t len)
> > {
> > + struct hf_device *dev;
> > uint8_t status;
> >
> > DBG("");
> >
> > - if (device.features & HFP_HF_FEAT_VR) {
> > - hfp_gw_send_info(device.gw, "+BVRA: 1");
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > + if (dev->features & HFP_HF_FEAT_VR) {
> > + hfp_gw_send_info(dev->gw, "+BVRA: 1");
> > status = HAL_STATUS_SUCCESS;
> > } else {
> > status = HAL_STATUS_FAILED;
> > }
> >
> > +done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > HAL_OP_HANDSFREE_START_VR, status);
> > }
> >
> > static void handle_stop_vr(const void *buf, uint16_t len)
> > {
> > + struct hf_device *dev;
> > uint8_t status;
> >
> > DBG("");
> >
> > - if (device.features & HFP_HF_FEAT_VR) {
> > - hfp_gw_send_info(device.gw, "+BVRA: 0");
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > + if (dev->features & HFP_HF_FEAT_VR) {
> > + hfp_gw_send_info(dev->gw, "+BVRA: 0");
> > status = HAL_STATUS_SUCCESS;
> > } else {
> > status = HAL_STATUS_FAILED;
> > }
> >
> > +done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > HAL_OP_HANDSFREE_STOP_VR, status);
> > }
> > @@ -1800,20 +1879,27 @@ static void handle_stop_vr(const void *buf, uint16_t len)
> > static void handle_volume_control(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_volume_control *cmd = buf;
> > + struct hf_device *dev;
> > uint8_t status, volume;
> >
> > DBG("type=%u volume=%u", cmd->type, cmd->volume);
> >
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > volume = cmd->volume > 15 ? 15 : cmd->volume;
> >
> > switch (cmd->type) {
> > case HAL_HANDSFREE_VOLUME_TYPE_MIC:
> > - hfp_gw_send_info(device.gw, "+VGM: %u", volume);
> > + hfp_gw_send_info(dev->gw, "+VGM: %u", volume);
> >
> > status = HAL_STATUS_SUCCESS;
> > break;
> > case HAL_HANDSFREE_VOLUME_TYPE_SPEAKER:
> > - hfp_gw_send_info(device.gw, "+VGS: %u", volume);
> > + hfp_gw_send_info(dev->gw, "+VGS: %u", volume);
> >
> > status = HAL_STATUS_SUCCESS;
> > break;
> > @@ -1822,6 +1908,7 @@ static void handle_volume_control(const void *buf, uint16_t len)
> > break;
> > }
> >
> > +done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > HAL_OP_HANDSFREE_VOLUME_CONTROL, status);
> > }
> > @@ -1848,22 +1935,34 @@ static void update_indicator(struct hf_device *dev, int ind, uint8_t val)
> > static void handle_device_status_notif(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_device_status_notif *cmd = buf;
> > + struct hf_device *dev;
> > + uint8_t status;
> >
> > DBG("");
> >
> > - update_indicator(&device, IND_SERVICE, cmd->state);
> > - update_indicator(&device, IND_ROAM, cmd->type);
> > - update_indicator(&device, IND_SIGNAL, cmd->signal);
> > - update_indicator(&device, IND_BATTCHG, cmd->battery);
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > + update_indicator(dev, IND_SERVICE, cmd->state);
> > + update_indicator(dev, IND_ROAM, cmd->type);
> > + update_indicator(dev, IND_SIGNAL, cmd->signal);
> > + update_indicator(dev, IND_BATTCHG, cmd->battery);
> >
> > + status = HAL_STATUS_SUCCESS;
> > +
> > +done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > - HAL_OP_HANDSFREE_DEVICE_STATUS_NOTIF,
> > - HAL_STATUS_SUCCESS);
> > + HAL_OP_HANDSFREE_DEVICE_STATUS_NOTIF, status);
> > }
> >
> > static void handle_cops(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_cops_response *cmd = buf;
> > + struct hf_device *dev;
> > + uint8_t status;
> >
> > if (len != sizeof(*cmd) + cmd->len ||
> > (cmd->len != 0 && cmd->buf[cmd->len - 1] != '\0')) {
> > @@ -1874,13 +1973,22 @@ static void handle_cops(const void *buf, uint16_t len)
> >
> > DBG("");
> >
> > - hfp_gw_send_info(device.gw, "+COPS: 0,0,\"%.16s\"",
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > + hfp_gw_send_info(dev->gw, "+COPS: 0,0,\"%.16s\"",
> > cmd->len ? (char *) cmd->buf : "");
> >
> > - hfp_gw_send_result(device.gw, HFP_RESULT_OK);
> > + hfp_gw_send_result(dev->gw, HFP_RESULT_OK);
> > +
> > + status = HAL_STATUS_SUCCESS;
> >
> > +done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > - HAL_OP_HANDSFREE_COPS_RESPONSE, HAL_STATUS_SUCCESS);
> > + HAL_OP_HANDSFREE_COPS_RESPONSE, status);
> > }
> >
> > static unsigned int get_callsetup(uint8_t state)
> > @@ -1900,38 +2008,51 @@ static unsigned int get_callsetup(uint8_t state)
> > static void handle_cind(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_cind_response *cmd = buf;
> > + struct hf_device *dev;
> > + uint8_t status;
> >
> > DBG("");
> >
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > /* HAL doesn't provide indicators values so need to convert here */
> > - device.inds[IND_SERVICE].val = cmd->svc;
> > - device.inds[IND_CALL].val = !!(cmd->num_active + cmd->num_held);
> > - device.inds[IND_CALLSETUP].val = get_callsetup(cmd->state);
> > - device.inds[IND_CALLHELD].val = cmd->num_held ?
> > + dev->inds[IND_SERVICE].val = cmd->svc;
> > + dev->inds[IND_CALL].val = !!(cmd->num_active + cmd->num_held);
> > + dev->inds[IND_CALLSETUP].val = get_callsetup(cmd->state);
> > + dev->inds[IND_CALLHELD].val = cmd->num_held ?
> > (cmd->num_active ? 1 : 2) : 0;
> > - device.inds[IND_SIGNAL].val = cmd->signal;
> > - device.inds[IND_ROAM].val = cmd->roam;
> > - device.inds[IND_BATTCHG].val = cmd->batt_chg;
> > + dev->inds[IND_SIGNAL].val = cmd->signal;
> > + dev->inds[IND_ROAM].val = cmd->roam;
> > + dev->inds[IND_BATTCHG].val = cmd->batt_chg;
> >
> > /* Order must match indicators_defaults table */
> > - hfp_gw_send_info(device.gw, "+CIND: %u,%u,%u,%u,%u,%u,%u",
> > - device.inds[IND_SERVICE].val,
> > - device.inds[IND_CALL].val,
> > - device.inds[IND_CALLSETUP].val,
> > - device.inds[IND_CALLHELD].val,
> > - device.inds[IND_SIGNAL].val,
> > - device.inds[IND_ROAM].val,
> > - device.inds[IND_BATTCHG].val);
> > + hfp_gw_send_info(dev->gw, "+CIND: %u,%u,%u,%u,%u,%u,%u",
> > + dev->inds[IND_SERVICE].val,
> > + dev->inds[IND_CALL].val,
> > + dev->inds[IND_CALLSETUP].val,
> > + dev->inds[IND_CALLHELD].val,
> > + dev->inds[IND_SIGNAL].val,
> > + dev->inds[IND_ROAM].val,
> > + dev->inds[IND_BATTCHG].val);
> >
> > - hfp_gw_send_result(device.gw, HFP_RESULT_OK);
> > + hfp_gw_send_result(dev->gw, HFP_RESULT_OK);
> >
> > + status = HAL_STATUS_SUCCESS;
> > +
> > +done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > - HAL_OP_HANDSFREE_CIND_RESPONSE, HAL_STATUS_SUCCESS);
> > + HAL_OP_HANDSFREE_CIND_RESPONSE, status);
> > }
> >
> > static void handle_formatted_at_resp(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_formatted_at_response *cmd = buf;
> > + struct hf_device *dev;
> > + uint8_t status;
> >
> > DBG("");
> >
> > @@ -1942,33 +2063,53 @@ static void handle_formatted_at_resp(const void *buf, uint16_t len)
> > return;
> > }
> >
> > - hfp_gw_send_info(device.gw, "%s", cmd->len ? (char *) cmd->buf : "");
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> >
> > + hfp_gw_send_info(dev->gw, "%s", cmd->len ? (char *) cmd->buf : "");
> > +
> > + status = HAL_STATUS_SUCCESS;
> > +
> > +done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > - HAL_OP_HANDSFREE_FORMATTED_AT_RESPONSE,
> > - HAL_STATUS_SUCCESS);
> > + HAL_OP_HANDSFREE_FORMATTED_AT_RESPONSE, status);
> > }
> >
> > static void handle_at_resp(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_at_response *cmd = buf;
> > + struct hf_device *dev;
> > + uint8_t status;
> >
> > DBG("");
> >
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > if (cmd->response == HAL_HANDSFREE_AT_RESPONSE_OK)
> > - hfp_gw_send_result(device.gw, HFP_RESULT_OK);
> > - else if (device.cmee_enabled)
> > - hfp_gw_send_error(device.gw, cmd->error);
> > + hfp_gw_send_result(dev->gw, HFP_RESULT_OK);
> > + else if (dev->cmee_enabled)
> > + hfp_gw_send_error(dev->gw, cmd->error);
> > else
> > - hfp_gw_send_result(device.gw, HFP_RESULT_ERROR);
> > + hfp_gw_send_result(dev->gw, HFP_RESULT_ERROR);
> > +
> > + status = HAL_STATUS_SUCCESS;
> >
> > +done:
> > ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HANDSFREE,
> > - HAL_OP_HANDSFREE_AT_RESPONSE, HAL_STATUS_SUCCESS);
> > + HAL_OP_HANDSFREE_AT_RESPONSE, status);
> > }
> >
> > static void handle_clcc_resp(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_clcc_response *cmd = buf;
> > + struct hf_device *dev;
> > uint8_t status;
> > char *number;
> >
> > @@ -1981,8 +2122,14 @@ static void handle_clcc_resp(const void *buf, uint16_t len)
> >
> > DBG("");
> >
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto done;
> > + }
> > +
> > if (!cmd->index) {
> > - hfp_gw_send_result(device.gw, HFP_RESULT_OK);
> > + hfp_gw_send_result(dev->gw, HFP_RESULT_OK);
> >
> > status = HAL_STATUS_SUCCESS;
> > goto done;
> > @@ -1999,13 +2146,13 @@ static void handle_clcc_resp(const void *buf, uint16_t len)
> > case HAL_HANDSFREE_CALL_STATE_ALERTING:
> > if (cmd->type == HAL_HANDSFREE_CALL_ADDRTYPE_INTERNATIONAL &&
> > number[0] != '+')
> > - hfp_gw_send_info(device.gw,
> > + hfp_gw_send_info(dev->gw,
> > "+CLCC: %u,%u,%u,%u,%u,\"+%s\",%u",
> > cmd->index, cmd->dir, cmd->state,
> > cmd->mode, cmd->mpty, number,
> > cmd->type);
> > else
> > - hfp_gw_send_info(device.gw,
> > + hfp_gw_send_info(dev->gw,
> > "+CLCC: %u,%u,%u,%u,%u,\"%s\",%u",
> > cmd->index, cmd->dir, cmd->state,
> > cmd->mode, cmd->mpty, number,
> > @@ -2213,6 +2360,7 @@ static void phone_state_idle(struct hf_device *dev, int num_active,
> > static void handle_phone_state_change(const void *buf, uint16_t len)
> > {
> > const struct hal_cmd_handsfree_phone_state_change *cmd = buf;
> > + struct hf_device *dev;
> > uint8_t status;
> >
> > if (len != sizeof(*cmd) + cmd->number_len || (cmd->number_len != 0 &&
> > @@ -2225,32 +2373,38 @@ static void handle_phone_state_change(const void *buf, uint16_t len)
> > DBG("active=%u hold=%u state=%u", cmd->num_active, cmd->num_held,
> > cmd->state);
> >
> > + dev = find_default_device();
> > + if (!dev) {
> > + status = HAL_STATUS_FAILED;
> > + goto failed;
> > + }
> > +
> > switch (cmd->state) {
> > case HAL_HANDSFREE_CALL_STATE_DIALING:
> > - phone_state_dialing(&device, cmd->num_active, cmd->num_held);
> > + phone_state_dialing(dev, cmd->num_active, cmd->num_held);
> > break;
> > case HAL_HANDSFREE_CALL_STATE_ALERTING:
> > - phone_state_alerting(&device, cmd->num_active, cmd->num_held);
> > + phone_state_alerting(dev, cmd->num_active, cmd->num_held);
> > break;
> > case HAL_HANDSFREE_CALL_STATE_INCOMING:
> > - phone_state_incoming(&device, cmd->num_active, cmd->num_held,
> > + phone_state_incoming(dev, cmd->num_active, cmd->num_held,
> > cmd->type, cmd->number,
> > cmd->number_len);
> > break;
> > case HAL_HANDSFREE_CALL_STATE_IDLE:
> > - phone_state_idle(&device, cmd->num_active, cmd->num_held);
> > + phone_state_idle(dev, cmd->num_active, cmd->num_held);
> > break;
> > default:
> > DBG("unhandled new state %u (current state %u)", cmd->state,
> > - device.setup_state);
> > + dev->setup_state);
> >
> > status = HAL_STATUS_FAILED;
> > goto failed;
> > }
> >
> > - device.num_active = cmd->num_active;
> > - device.num_held = cmd->num_held;
> > - device.setup_state = cmd->state;
> > + dev->num_active = cmd->num_active;
> > + dev->num_held = cmd->num_held;
> > + dev->setup_state = cmd->state;
> >
> > status = HAL_STATUS_SUCCESS;
> >
> > @@ -2374,9 +2528,7 @@ static void confirm_sco_cb(GIOChannel *chan, gpointer user_data)
> > char address[18];
> > bdaddr_t bdaddr;
> > GError *err = NULL;
> > -
> > - if (device.sco)
> > - goto drop;
> > + struct hf_device *dev;
> >
> > bt_io_get(chan, &err,
> > BT_IO_OPT_DEST, address,
> > @@ -2390,18 +2542,19 @@ static void confirm_sco_cb(GIOChannel *chan, gpointer user_data)
> >
> > DBG("incoming SCO connection from %s", address);
> >
> > - if (device.state != HAL_EV_HANDSFREE_CONN_STATE_SLC_CONNECTED ||
> > - bacmp(&device.bdaddr, &bdaddr)) {
> > + dev = find_device(&bdaddr);
> > + if (!dev || dev->state != HAL_EV_HANDSFREE_CONN_STATE_SLC_CONNECTED ||
> > + dev->sco) {
> > error("handsfree: audio connection from %s rejected", address);
> > goto drop;
> > }
> >
> > - if (!bt_io_accept(chan, connect_sco_cb, &device, NULL, NULL)) {
> > + if (!bt_io_accept(chan, connect_sco_cb, dev, NULL, NULL)) {
> > error("handsfree: failed to accept audio connection");
> > goto drop;
> > }
> >
> > - set_audio_state(&device, HAL_EV_HANDSFREE_AUDIO_STATE_CONNECTING);
> > + set_audio_state(dev, HAL_EV_HANDSFREE_AUDIO_STATE_CONNECTING);
> > return;
> >
> > drop:
> > @@ -2633,21 +2786,23 @@ static void bt_sco_get_fd(const void *buf, uint16_t len)
> > int fd;
> > GError *err;
> > struct sco_rsp_get_fd rsp;
> > + struct hf_device *dev;
> >
> > DBG("");
> >
> > - if (!device.sco)
> > + dev = find_default_device();
> > + if (!dev || !dev->sco)
> > goto failed;
> >
> > err = NULL;
> > - if (!bt_io_get(device.sco, &err, BT_IO_OPT_MTU, &rsp.mtu,
> > + if (!bt_io_get(dev->sco, &err, BT_IO_OPT_MTU, &rsp.mtu,
> > BT_IO_OPT_INVALID)) {
> > error("Unable to get MTU: %s\n", err->message);
> > g_clear_error(&err);
> > goto failed;
> > }
> >
> > - fd = g_io_channel_unix_get_fd(device.sco);
> > + fd = g_io_channel_unix_get_fd(dev->sco);
> >
> > DBG("fd %d mtu %u", fd, rsp.mtu);
> >
>
--
Best regards,
Szymon Janc
--
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
