Hi Andrei,
On Friday 27 of June 2014 14:24:56 Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
>
> Avoid using app_id when we shall use app structure itself. Otherwise we
> end up with unnecessary searches for app and problems for incoming
> connections.
> ---
> android/health.c | 43 ++++++++++++++++++++++---------------------
> 1 file changed, 22 insertions(+), 21 deletions(-)
>
> diff --git a/android/health.c b/android/health.c
> index 3cb2016..d664324 100644
> --- a/android/health.c
> +++ b/android/health.c
> @@ -1477,43 +1477,37 @@ static struct health_device *create_device(struct health_app *app,
> return dev;
> }
>
> -static struct health_device *get_device(uint16_t app_id, const uint8_t *addr)
> +static struct health_app *get_app(uint16_t app_id)
> +{
> + return queue_find(apps, match_app_by_id, INT_TO_PTR(app_id));
> +}
> +
> +static struct health_device *get_device(struct health_app *app,
> + const uint8_t *addr)
> {
> - struct health_app *app;
> struct health_device *dev;
> bdaddr_t bdaddr;
>
> - app = queue_find(apps, match_app_by_id, INT_TO_PTR(app_id));
> - if (!app)
> - return NULL;
> -
> android2bdaddr(addr, &bdaddr);
> dev = queue_find(app->devices, match_dev_by_addr, &bdaddr);
> if (dev)
> return dev;
>
> - dev = create_device(app, addr);
> - if (dev)
> - dev->app_id = app_id;
> -
> - return dev;
> + return create_device(app, addr);
> }
>
> -static struct health_channel *create_channel(uint16_t app_id,
> +static struct health_channel *create_channel(struct health_app *app,
> uint8_t mdep_index,
> struct health_device *dev)
> {
> - struct health_app *app;
> struct mdep_cfg *mdep;
> struct health_channel *channel;
> uint8_t index;
> static unsigned int channel_id = 1;
>
> - if (!dev)
> - return NULL;
> + DBG("mdep %u", mdep_index);
>
> - app = queue_find(apps, match_app_by_id, INT_TO_PTR(app_id));
> - if (!app)
> + if (!dev || !app)
> return NULL;
>
> index = mdep_index + 1;
> @@ -1539,7 +1533,7 @@ static struct health_channel *create_channel(uint16_t app_id,
> return channel;
> }
>
> -static struct health_channel *get_channel(uint16_t app_id,
> +static struct health_channel *get_channel(struct health_app *app,
> uint8_t mdep_index,
> struct health_device *dev)
> {
> @@ -1555,7 +1549,7 @@ static struct health_channel *get_channel(uint16_t app_id,
> if (channel)
> return channel;
>
> - return create_channel(app_id, mdep_index, dev);
> + return create_channel(app, index, dev);
> }
>
> static void bt_health_connect_channel(const void *buf, uint16_t len)
> @@ -1564,14 +1558,21 @@ static void bt_health_connect_channel(const void *buf, uint16_t len)
> struct hal_rsp_health_connect_channel rsp;
> struct health_device *dev = NULL;
> struct health_channel *channel = NULL;
> + struct health_app *app;
>
> DBG("");
>
> - dev = get_device(cmd->app_id, cmd->bdaddr);
> + app = get_app(cmd->app_id);
> + if (!app)
> + goto fail;
> +
> + dev = get_device(app, cmd->bdaddr);
> if (!dev)
> goto fail;
>
> - channel = get_channel(cmd->app_id, cmd->mdep_index, dev);
> + dev->app_id = cmd->app_id;
Isn't device already having this set?
> +
> + channel = get_channel(app, cmd->mdep_index, dev);
> if (!channel)
> goto fail;
>
>
--
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
