Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp18408171rwd; Tue, 27 Jun 2023 17:01:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5F84HdCycelI19k3lQjUfuVoUwqq+ZoZsL1qYBFunxsdm3y59xPQIaCsf344qRJYkSOKJD X-Received: by 2002:a17:906:6a0f:b0:98e:3fb1:6445 with SMTP id qw15-20020a1709066a0f00b0098e3fb16445mr8050254ejc.24.1687910474045; Tue, 27 Jun 2023 17:01:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687910474; cv=none; d=google.com; s=arc-20160816; b=Cb6CLQMJe9ubbNyJqI8K6H63cPVjJFVHcNudk7qjKJAi87PinUYZua2uWcj3elSK9H vTsqCIwm+Lq1RnxdEP764rKDtb6JQM2RNwDa9xuy/63Bb0ouW/xhPGneF9pGhwx/fWbB d/e1vqf0OAprrjUIvviVU5orOXWqBVd4/hixjO4IpfTJmYL/AduM+DLqN/oT8LdYwET6 GZLKyWNmyFMv1QEb61jiiAh2l+JuWU13rg+V8vXZyu5uu/YmDoc4srrMg4K2ijFK4C+f OgWBsPK6qtvgGITmt1DsJJFhcb5XyiaBloPPJX/8GJ32+xUE8v5ekgkodZyWl2Bvs/nF BIWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=/troVIiGiMkT6tfGvaFhJ1u1RhL1JvOB2FWft19yKnw=; fh=4lGQI6056MBa4/oovMyIYaKLn+Wz/24RGvUivMmQP8E=; b=0G9CyTEhRu2h2jRQho+51/+ah/NWUg/0DDC8sPmZv1+V0HKCl4U9+Yoy4F5rmN5dTA bETYRA+aT6LyFuc6srdUsi62Ob2l02/kmhBFMuqdcbtrUIMqkFTR7aEJdwKa7RTj4Qhk sCTZAvf4oQenHURJKsMOas7LXs3ksOU9+VSkdxghvp4bg366pVmTgQc2xnQHCCugDRyu x/j7V3oduaFQJkh6XCvp1JvaXDH/BmUH5nLZLVC32tZACVbctAbK7V+lmLjicD8wh79O tdiS3edtrh7pBZ9sGMFPM/wVNbM3MM4mTFNLhEJ1Yc7b0gfq2QIaDTzB5ouRVqYLoTGd Xl+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=I9j7ZO3F; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a24-20020a170906685800b00991ece4c965si2158489ejs.524.2023.06.27.17.00.42; Tue, 27 Jun 2023 17:01:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=I9j7ZO3F; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229488AbjF0Xsq (ORCPT + 99 others); Tue, 27 Jun 2023 19:48:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229497AbjF0Xsp (ORCPT ); Tue, 27 Jun 2023 19:48:45 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BAFC199E for ; Tue, 27 Jun 2023 16:48:44 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-666eb03457cso2813973b3a.1 for ; Tue, 27 Jun 2023 16:48:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687909723; x=1690501723; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=/troVIiGiMkT6tfGvaFhJ1u1RhL1JvOB2FWft19yKnw=; b=I9j7ZO3Fg03/EtVzqOjcimOq5Nqqks3Z/xZwdNUdW9B9vudsvws+2HCXCyJL1Eampo G5/CXvVg47HAEY7ra3j+l///KuT0JJD/5IUZA96daKKJEY9m0Xoi7/gZ1hXmldfKKfoV Ndyukci5xhK+BEYz6BXlq48bk8N2Brb3SlYaAXSxLpnmtvGKkKg5oLMphd/dbjB0Purh syVYAqmisKBlOra2lysV4KVHgOXTzQXl0bnccWl+ej6bYFcHzbyIBccBoFS9fMVGWG12 DHiMzfAa2Fm30cht5idUlDpwxXyy/jjovSrFMNTS6H+5gNA8mE4qKHyBKZZVyplI/9oL PKyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687909723; x=1690501723; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/troVIiGiMkT6tfGvaFhJ1u1RhL1JvOB2FWft19yKnw=; b=BfMPiJP7DgXOw8Koib9B4nh9sPnYzkU8cllaefEvXhP24sxMwqhmdBTRVKqiZKUfwc WKPP+qS/GY/mY5UjwKnTem44XE7Hbaop7vhzhB1JvxTAmTGcMdqWjEFm7Pt+/sLTOK4T VrQZ2MRp04XGk37V3Gyx2JewJ4Blz+5zwLqQoM+qXMGUCUWKPsc3i/tx1BV9RTXJeQYZ QO2LdDApHlxftcJOWCIfPvki+BSs/6CP6xyaOqydKLvDH02EdxbGh93Ld5qfpefpzvqK iC7+5XeFTHPkVyTde/sXOC9NZhJDRgcpTZGYdQmhf8C56b7LrVI+prwJSk1qwRKmzSZy Ud7g== X-Gm-Message-State: AC+VfDwlhIojC0VHMeQs7Esl6On31GRpECIsPeoS5/7YDYCx0FSYYLEg sIiV+3S3Re298fn0a3FDP/73e3mTHU9iAw== X-Received: by 2002:a05:6a00:3994:b0:66a:3812:7eda with SMTP id fi20-20020a056a00399400b0066a38127edamr18276903pfb.9.1687909722842; Tue, 27 Jun 2023 16:48:42 -0700 (PDT) Received: from lvondent-mobl4.. (c-71-59-129-171.hsd1.or.comcast.net. [71.59.129.171]) by smtp.gmail.com with ESMTPSA id j18-20020a62e912000000b00666add7f047sm5859979pfh.207.2023.06.27.16.48.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 16:48:42 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ] shared/bap: Fix handling of codec fields Date: Tue, 27 Jun 2023 16:48:40 -0700 Message-Id: <20230627234840.2696196-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz Codec fields needs to be converted when codec.id is 0xff as the host endian may not always be little endian. --- src/shared/bap.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/shared/bap.c b/src/shared/bap.c index 55f61d91a3aa..cf5d810bbaf0 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -882,6 +882,12 @@ static void stream_notify_config(struct bt_bap_stream *stream) put_le24(lpac->qos.ppd_min, config->ppd_min); put_le24(lpac->qos.ppd_max, config->ppd_max); config->codec = lpac->codec; + + if (config->codec.id == 0x0ff) { + config->codec.vid = cpu_to_le16(config->codec.vid); + config->codec.cid = cpu_to_le16(config->codec.cid); + } + config->cc_len = stream->cc->iov_len; memcpy(config->cc, stream->cc->iov_base, stream->cc->iov_len); @@ -4347,6 +4353,11 @@ unsigned int bt_bap_stream_config(struct bt_bap_stream *stream, config.phy = qos->ucast.io_qos.phy; config.codec = stream->rpac->codec; + if (config.codec.id == 0xff) { + config.codec.cid = cpu_to_le16(config.codec.cid); + config.codec.vid = cpu_to_le16(config.codec.vid); + } + iov[0].iov_base = &config; iov[0].iov_len = sizeof(config); -- 2.40.1