Hi Fred,
On Wed, Jun 26, 2013 at 8:32 PM, Frédéric Dalleau
<frederic.dalleau@xxxxxxxxxxxxxxx> wrote:
> ---
> btio/btio.c | 18 +++++++++++++++---
> btio/btio.h | 1 +
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/btio/btio.c b/btio/btio.c
> index cb8860a..df1630e 100644
> --- a/btio/btio.c
> +++ b/btio/btio.c
> @@ -78,6 +78,7 @@ struct set_opts {
> uint8_t mode;
> int flushable;
> uint32_t priority;
> + uint16_t sco_voice;
> };
>
> struct connect {
> @@ -723,9 +724,10 @@ static int sco_connect(int sock, const bdaddr_t *dst)
> return 0;
> }
>
> -static gboolean sco_set(int sock, uint16_t mtu, GError **err)
> +static gboolean sco_set(int sock, uint16_t mtu, uint16_t sco_voice, GError **err)
> {
> struct sco_options sco_opt;
> + struct bt_voice voice;
> socklen_t len;
>
> if (!mtu)
> @@ -745,6 +747,13 @@ static gboolean sco_set(int sock, uint16_t mtu, GError **err)
> return FALSE;
> }
>
> + voice.setting = sco_voice;
> + if (setsockopt(sock, SOL_BLUETOOTH, BT_VOICE, &voice,
> + sizeof(voice)) < 0) {
> + ERROR_FAILED(err, "setsockopt(BT_VOICE)", errno);
> + return FALSE;
> + }
> +
> return TRUE;
> }
>
> @@ -832,6 +841,9 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,
> case BT_IO_OPT_PRIORITY:
> opts->priority = va_arg(args, int);
> break;
> + case BT_IO_OPT_SCO_VOICE:
> + opts->sco_voice = va_arg(args, int);
> + break;
> default:
> g_set_error(err, BT_IO_ERROR, EINVAL,
> "Unknown option %d", opt);
> @@ -1310,7 +1322,7 @@ gboolean bt_io_set(GIOChannel *io, GError **err, BtIOOption opt1, ...)
> case BT_IO_RFCOMM:
> return rfcomm_set(sock, opts.sec_level, opts.master, err);
> case BT_IO_SCO:
> - return sco_set(sock, opts.mtu, err);
> + return sco_set(sock, opts.mtu, opts.sco_voice, err);
> default:
> g_set_error(err, BT_IO_ERROR, EINVAL,
> "Unknown BtIO type %d", type);
> @@ -1377,7 +1389,7 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts,
> }
> if (sco_bind(sock, &opts->src, err) < 0)
> goto failed;
> - if (!sco_set(sock, opts->mtu, err))
> + if (!sco_set(sock, opts->mtu, opts->sco_voice, err))
> goto failed;
> break;
> default:
> diff --git a/btio/btio.h b/btio/btio.h
> index ac1366b..9959483 100644
> --- a/btio/btio.h
> +++ b/btio/btio.h
> @@ -55,6 +55,7 @@ typedef enum {
> BT_IO_OPT_MODE,
> BT_IO_OPT_FLUSHABLE,
> BT_IO_OPT_PRIORITY,
> + BT_IO_OPT_SCO_VOICE,
I believe here is better to use BT_IO_OPT_VOICE for simplicity, the
socket option itself doesn't carry SCO name so I don't thing it is
necessary here either.
--
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
