Hi Ravi,
On Wed, Oct 29, 2014 at 2:13 PM, Ravi kumar Veeramally
<ravikumar.veeramally@xxxxxxxxxxxxxxx> wrote:
> btav_connection_state_t and btav_audio_state_t enum values are wrongly
> stored in different enum type(bt_state_t state).
> ---
> android/tester-main.c | 20 ++++++++++++++++++--
> android/tester-main.h | 11 +++++++----
> 2 files changed, 25 insertions(+), 6 deletions(-)
>
> diff --git a/android/tester-main.c b/android/tester-main.c
> index f4d18e2..8cf62c2 100644
> --- a/android/tester-main.c
> +++ b/android/tester-main.c
> @@ -654,6 +654,22 @@ static bool match_data(struct step *step)
> return false;
> }
>
> + if (exp->callback_result.av_conn_state !=
> + step->callback_result.av_conn_state) {
> + tester_debug("Callback av conn state mismatch: 0x%x vs 0x%x",
> + step->callback_result.av_conn_state,
> + exp->callback_result.av_conn_state);
> + return false;
> + }
> +
> + if (exp->callback_result.av_audio_state !=
> + step->callback_result.av_audio_state) {
> + tester_debug("Callback av audio state mismatch: 0x%x vs 0x%x",
> + step->callback_result.av_audio_state,
> + exp->callback_result.av_audio_state);
> + return false;
> + }
> +
> if (exp->callback_result.pairing_variant !=
> step->callback_result.pairing_variant) {
> tester_debug("Callback pairing result mismatch: %d vs %d",
> @@ -1863,7 +1879,7 @@ static void a2dp_connection_state_cb(btav_connection_state_t state,
> struct step *step = g_new0(struct step, 1);
>
> step->callback = CB_A2DP_CONN_STATE;
> - step->callback_result.state = state;
> + step->callback_result.av_conn_state = state;
>
> schedule_callback_verification(step);
> }
> @@ -1873,7 +1889,7 @@ static void a2dp_audio_state_cb(btav_audio_state_t state, bt_bdaddr_t *bd_addr)
> struct step *step = g_new0(struct step, 1);
>
> step->callback = CB_A2DP_AUDIO_STATE;
> - step->callback_result.state = state;
> + step->callback_result.av_audio_state = state;
>
> schedule_callback_verification(step);
> }
> diff --git a/android/tester-main.h b/android/tester-main.h
> index c938d44..ff6e43c 100644
> --- a/android/tester-main.h
> +++ b/android/tester-main.h
> @@ -387,14 +387,14 @@ struct pdu_set {
> .callback_result.channel_state = cb_state, \
> }
>
> -#define CALLBACK_AV_CONN_STATE(cb, cb_state) { \
> +#define CALLBACK_AV_CONN_STATE(cb, cb_av_conn_state) { \
> .callback = cb, \
> - .callback_result.state = cb_state, \
> + .callback_result.av_conn_state = cb_av_conn_state, \
> }
>
> -#define CALLBACK_AV_AUDIO_STATE(cb, cb_state) { \
> +#define CALLBACK_AV_AUDIO_STATE(cb, cb_av_audio_state) { \
> .callback = cb, \
> - .callback_result.state = cb_state, \
> + .callback_result.av_audio_state = cb_av_audio_state, \
> }
>
> #define CALLBACK_DEVICE_PROPS(props, prop_cnt) \
> @@ -641,6 +641,9 @@ struct bt_callback_data {
> int mdep_cfg_index;
> bthl_app_reg_state_t app_state;
> bthl_channel_state_t channel_state;
> +
> + btav_connection_state_t av_conn_state;
> + btav_audio_state_t av_audio_state;
> };
>
> /*
> --
> 2.1.0
Applied, please notice that I fixed 4/4 myself, apparently Ive
indicated you the wrong like while check-patch actually complained
about line 165.
--
Luiz Augusto von Dentz
--
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
