Author: dim
Date: Wed Dec 21 17:36:45 2011
New Revision: 228786
URL: http://svn.freebsd.org/changeset/base/228786
Log:
Fix enum conversion problems in sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
and sys/dev/ath/ath_hal/ar5416/ar5416_misc.c:
sys/dev/ath/ath_hal/ar5212/ar5212_misc.c:577:24: warning: implicit conversion
from enumeration type 'HAL_STATUS' to different enumeration type 'HAL_BOOL'
[-Wconversion]
return HAL_EINVAL;
~~~~~~ ^~~~~~~~~~
and:
sys/dev/ath/ath_hal/ar5416/ar5416_misc.c:164:9: warning: implicit conversion
from enumeration type 'HAL_STATUS' to different enumeration type 'HAL_BOOL'
[-Wconversion]
return HAL_OK;
~~~~~~ ^~~~~~
In both cases, enums HAL_BOOL and HAL_STATUS are mixed up.
MFC after: 1 week
Modified:
head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Wed Dec 21 17:16:43
2011 (r228785)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Wed Dec 21 17:36:45
2011 (r228786)
@@ -574,7 +574,7 @@ ar5212SetDecompMask(struct ath_hal *ah,
struct ath_hal_5212 *ahp = AH5212(ah);
if (keyidx >= HAL_DECOMP_MASK_SIZE)
- return HAL_EINVAL;
+ return AH_FALSE;
OS_REG_WRITE(ah, AR_DCM_A, keyidx);
OS_REG_WRITE(ah, AR_DCM_D, en ? AR_DCM_D_EN : 0);
ahp->ah_decompMask[keyidx] = en;
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Wed Dec 21 17:16:43
2011 (r228785)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Wed Dec 21 17:36:45
2011 (r228786)
@@ -161,7 +161,7 @@ ar5416SetAntennaSwitch(struct ath_hal *a
HAL_BOOL
ar5416SetDecompMask(struct ath_hal *ah, uint16_t keyidx, int en)
{
- return HAL_OK;
+ return AH_TRUE;
}
/* Setup coverage class */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
