From nobody Wed Oct 23 18:30:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XYczp1S6Cz5ZWX6; Wed, 23 Oct 2024 18:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczp0CTQz597g; Wed, 23 Oct 2024 18:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5eM5e6sM6H0tHnKvD0zEQpwg7/Ot/jDfM6oL7/ZWqyc=; b=x8ASglNphFznC8DoAt/MVkoP0zhD+McRFZo/a8jy7Rv30YA/KHx2LgI1le3J/4F0cu3jri +bqNzPur0V/s8Py5rgLEot3E5w43mwrQmMoweF94bv4muij5n2WPAPsJHuh3RNhbUIj+Tp mXl1D9N2DAz/Y1qON6gB1kti64H/rGi5uNjf89KQNZ3oUFzutxw8V9vtDjUTVtch6J6NQU SCGXU23wdqFo8ZFaj49ZGKvehaq66s9gIIqz5e29rDUomihZ1r/IabzwgTCZ8j7iJj+yO5 oud+WOu8PCjTE8rTUUeEtnJTT1gusOUNxFD6jpyp7i4f/5IKk2SHGATcVTtyjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5eM5e6sM6H0tHnKvD0zEQpwg7/Ot/jDfM6oL7/ZWqyc=; b=pHei2DplGpQxExYK3ZkDOzEoMAfZzpc8ojmxYk/xHKmz5NmK8+M2Ik4i+ydn/mbIdZ4CTJ Jy9L47gf8rCoj2jZaso6vQJ3xJG8NfKFSoMC+sEVV4unos23h94Mosh/nfRiWybZAJaZlC lNMkdrg4cIlkDs2CYYAEWSN24uIplRGg1/cRxV+V4s2kv+cpejFgY+i6ul5EDRyYQ8q2bO 5T8MpZKYacuG2zI8qMNDt/vc+4Br9MYlRJqG0oOEXdJR5rrXGbvwYdgTW/8yvkjfo5Cfug 1wO4yxV08Illwx0OI8xaeI2H3bn4kH3izuJmU68J15/DOFy0zxVTQ4/8f65weQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708230; a=rsa-sha256; cv=none; b=QXm+H5ebR2T0UWjECPs3NfctUvAOfzswP4aWFVDw2miLWAuZAwbk46Q7nCFHm+tryEjktS X6hTqEqyQdpZxkhSJr4mJ4mLsuzjIhP/waSJv2C3yuBQvnqb1ccfk3kmsSN1Gw99Q0paQg p0n8HOGCRdA2jUSBxy5j0iFWi6VEYso+KOkoMkIAueIrHDO1OIdzMB9tZn7MoplRC6gt7O fkKQa0+lFRPa02aA1oF5r/bea+Hk6zN3GiduioyuN4UD3DdDhFdL7gGs4GggR6jf6uxMIl qDpN2r9+EMQPkrUt+w8sPxDNaArbevWKajMm53GgYSyu2iIqbJfhbF8qpV/Ynw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XYczn6qV4z18RT; Wed, 23 Oct 2024 18:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUTWW068924; Wed, 23 Oct 2024 18:30:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUTII068921; Wed, 23 Oct 2024 18:30:29 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:29 GMT Message-Id: <202410231830.49NIUTII068921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 36d486cc2ecd - main - Fix enum warning in ath_hal's ar9002 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36d486cc2ecdb9c290dba65bd5668b7e50d0d822 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=36d486cc2ecdb9c290dba65bd5668b7e50d0d822 commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822 Author: Dimitry Andric AuthorDate: 2024-07-31 09:43:50 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:35 +0000 Fix enum warning in ath_hal's ar9002 This fixes a clang 19 warning: sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c:57:32: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_ANT_SETTING') [-Werror,-Wenum-compare] 57 | (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~ The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`, not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is set to `AH_TRUE` whenever the related field `ah_antControl` is set to `HAL_ANT_VARIABLE`. It is not entirely clear to me what the intended statement is here: the test as it is written now compares the enum value 0 to `ah_diversity`, so in effect it enables the following block whenever `ah_diversity` is `AH_TRUE`. Write it like that, to avoid the compiler warning. MFC after: 3 days --- sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c index 01a224cbbfe9..fb2700771ffa 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c @@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah) !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE)); if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || - (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { + (AH5212(ah)->ah_diversity == AH_TRUE)) { if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { /* Enable antenna diversity */