[pulseaudio-discuss] [PATCH v3 1/2] bluetooth: Fix Media Endpoint for HandsfreeGateway

[Luiz Augusto von Dentz]

Hi Frédéric,

2011/8/22 Frédéric Dalleau <frederic.dalleau at linux.intel.com>:
> This patch will add the necessary quirks so that pulseaudio can regiter
> an endpoint on the /MediaEndpoint/HFPHS path. This endpoint is to be
> used for HFP Hansfree profile.
> ---
>  src/modules/bluetooth/bluetooth-util.c            |   12 +++++++++---
>  src/modules/bluetooth/module-bluetooth-device.c   |    2 +-
>  src/modules/bluetooth/module-bluetooth-discover.c |    4 ++--
>  3 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
> index b24fe7a..9a56592 100644
> --- a/src/modules/bluetooth/bluetooth-util.c
> +++ b/src/modules/bluetooth/bluetooth-util.c
> @@ -34,6 +34,7 @@
>  #include "a2dp-codecs.h"
>
>  #define HFP_AG_ENDPOINT "/MediaEndpoint/HFPAG"
> +#define HFP_HS_ENDPOINT "/MediaEndpoint/HFPHS"
>  #define A2DP_SOURCE_ENDPOINT "/MediaEndpoint/A2DPSource"
>  #define A2DP_SINK_ENDPOINT "/MediaEndpoint/A2DPSink"
>
> @@ -631,7 +632,7 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const
>
>     pa_dbus_append_basic_variant_dict_entry(&d, "Codec", DBUS_TYPE_BYTE, &codec);
>
> -    if (pa_streq(uuid, HFP_AG_UUID)) {
> +    if (pa_streq(uuid, HFP_AG_UUID) || pa_streq(uuid, HFP_HS_UUID)) {
>         uint8_t capability = 0;
>         pa_dbus_append_basic_array_variant_dict_entry(&d, "Capabilities", DBUS_TYPE_BYTE, &capability, 1);
>     } else {
> @@ -665,6 +666,7 @@ static void found_adapter(pa_bluetooth_discovery *y, const char *path) {
>
>  #ifdef DBUS_TYPE_UNIX_FD
>     register_endpoint(y, path, HFP_AG_ENDPOINT, HFP_AG_UUID);
> +    register_endpoint(y, path, HFP_HS_ENDPOINT, HFP_HS_UUID);
>     register_endpoint(y, path, A2DP_SOURCE_ENDPOINT, A2DP_SOURCE_UUID);
>     register_endpoint(y, path, A2DP_SINK_ENDPOINT, A2DP_SINK_UUID);
>  #endif
> @@ -1169,6 +1171,8 @@ static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage
>
>     if (dbus_message_has_path(m, HFP_AG_ENDPOINT))
>         p = PROFILE_HSP;
> +    else if (dbus_message_has_path(m, HFP_HS_ENDPOINT))
> +        p = PROFILE_HFGW;
>     else if (dbus_message_has_path(m, A2DP_SOURCE_ENDPOINT))
>         p = PROFILE_A2DP;
>     else
> @@ -1299,7 +1303,7 @@ static DBusMessage *endpoint_select_configuration(DBusConnection *c, DBusMessage
>         goto fail;
>     }
>
> -    if (dbus_message_has_path(m, HFP_AG_ENDPOINT))
> +    if (dbus_message_has_path(m, HFP_AG_ENDPOINT) || dbus_message_has_path(m, HFP_HS_ENDPOINT))
>         goto done;
>
>     pa_assert(size == sizeof(config));
> @@ -1412,7 +1416,7 @@ static DBusHandlerResult endpoint_handler(DBusConnection *c, DBusMessage *m, voi
>     path = dbus_message_get_path(m);
>     dbus_error_init(&e);
>
> -    if (!pa_streq(path, A2DP_SOURCE_ENDPOINT) && !pa_streq(path, A2DP_SINK_ENDPOINT) && !pa_streq(path, HFP_AG_ENDPOINT))
> +    if (!pa_streq(path, A2DP_SOURCE_ENDPOINT) && !pa_streq(path, A2DP_SINK_ENDPOINT) && !pa_streq(path, HFP_AG_ENDPOINT) && !pa_streq(path, HFP_HS_ENDPOINT))
>         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>
>     if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) {
> @@ -1497,6 +1501,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
>
>  #ifdef DBUS_TYPE_UNIX_FD
>     pa_assert_se(dbus_connection_register_object_path(pa_dbus_connection_get(y->connection), HFP_AG_ENDPOINT, &vtable_endpoint, y));
> +    pa_assert_se(dbus_connection_register_object_path(pa_dbus_connection_get(y->connection), HFP_HS_ENDPOINT, &vtable_endpoint, y));
>     pa_assert_se(dbus_connection_register_object_path(pa_dbus_connection_get(y->connection), A2DP_SOURCE_ENDPOINT, &vtable_endpoint, y));
>     pa_assert_se(dbus_connection_register_object_path(pa_dbus_connection_get(y->connection), A2DP_SINK_ENDPOINT, &vtable_endpoint, y));
>  #endif
> @@ -1541,6 +1546,7 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
>     if (y->connection) {
>  #ifdef DBUS_TYPE_UNIX_FD
>         dbus_connection_unregister_object_path(pa_dbus_connection_get(y->connection), HFP_AG_ENDPOINT);
> +        dbus_connection_unregister_object_path(pa_dbus_connection_get(y->connection), HFP_HS_ENDPOINT);
>         dbus_connection_unregister_object_path(pa_dbus_connection_get(y->connection), A2DP_SOURCE_ENDPOINT);
>         dbus_connection_unregister_object_path(pa_dbus_connection_get(y->connection), A2DP_SINK_ENDPOINT);
>  #endif
> diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
> index 288ad2f..1638a0e 100644
> --- a/src/modules/bluetooth/module-bluetooth-device.c
> +++ b/src/modules/bluetooth/module-bluetooth-device.c
> @@ -2545,7 +2545,7 @@ static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
>         pa_log_warn("A2DP is not connected, refused to switch profile");
>         return -PA_ERR_IO;
>     }
> -    else if (device->hfgw_state <= PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_HFGW) {
> +    else if (device->hfgw_state < PA_BT_AUDIO_STATE_CONNECTED && *d == PROFILE_HFGW) {
>         pa_log_warn("HandsfreeGateway is not connected, refused to switch profile");
>         return -PA_ERR_IO;
>     }
> diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
> index 7b27f6b..e96a4f3 100644
> --- a/src/modules/bluetooth/module-bluetooth-discover.c
> +++ b/src/modules/bluetooth/module-bluetooth-discover.c
> @@ -77,7 +77,7 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
>     if (!d->dead && d->device_connected > 0 &&
>         (d->audio_state >= PA_BT_AUDIO_STATE_CONNECTED ||
>          d->audio_source_state >= PA_BT_AUDIO_STATE_CONNECTED ||
> -         d->hfgw_state > PA_BT_AUDIO_STATE_CONNECTED)) {
> +         d->hfgw_state >= PA_BT_AUDIO_STATE_CONNECTED)) {
>
>         if (!mi) {
>             pa_module *m = NULL;
> @@ -110,7 +110,7 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
>             if (d->audio_source_state >= PA_BT_AUDIO_STATE_CONNECTED)
>                 args = pa_sprintf_malloc("%s profile=\"a2dp_source\" auto_connect=no", args);
>
> -            if (d->hfgw_state > PA_BT_AUDIO_STATE_CONNECTED)
> +            if (d->hfgw_state >= PA_BT_AUDIO_STATE_CONNECTED)
>                 args = pa_sprintf_malloc("%s profile=\"hfgw\"", args);
>
>             pa_log_debug("Loading module-bluetooth-device %s", args);
> --
> 1.7.1

Looks good, ack.

-- 
Luiz Augusto von Dentz