use correct enum types for various functions. Index: sys/dev/ic/ath.c =================================================================== RCS file: /cvsroot/src/sys/dev/ic/ath.c,v retrieving revision 1.133 diff -p -u -r1.133 ath.c --- sys/dev/ic/ath.c 16 Nov 2020 00:12:13 -0000 1.133 +++ sys/dev/ic/ath.c 12 Apr 2021 21:14:51 -0000 @@ -728,7 +728,7 @@ ath_resume(struct ath_softc *sc) #if notyet ath_hal_setpower(ah, HAL_PM_AWAKE); #else - ath_hal_reset(ah, ic->ic_opmode, &sc->sc_curchan, AH_FALSE, &status); + ath_hal_reset(ah, ic->ic_opmode, &sc->sc_curchan, HAL_M_IBSS, &status); #endif /* Index: sys/external/isc/atheros_hal/dist/ah_eeprom_v1.c =================================================================== RCS file: /cvsroot/src/sys/external/isc/atheros_hal/dist/ah_eeprom_v1.c,v retrieving revision 1.4 diff -p -u -r1.4 ah_eeprom_v1.c --- sys/external/isc/atheros_hal/dist/ah_eeprom_v1.c 12 Dec 2008 21:31:49 -0000 1.4 +++ sys/external/isc/atheros_hal/dist/ah_eeprom_v1.c 12 Apr 2021 21:14:51 -0000 @@ -71,7 +71,7 @@ v1EepromGet(struct ath_hal *ah, int para static HAL_BOOL v1EepromSet(struct ath_hal *ah, int param, int v) { - return HAL_EINVAL; + return AH_FALSE; } static HAL_BOOL Index: sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c =================================================================== RCS file: /cvsroot/src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c,v retrieving revision 1.6 diff -p -u -r1.6 ah_eeprom_v14.c --- sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c 11 Dec 2012 09:22:16 -0000 1.6 +++ sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c 12 Apr 2021 21:14:51 -0000 @@ -137,12 +137,12 @@ v14EepromSet(struct ath_hal *ah, int par switch (param) { case AR_EEP_ANTGAINMAX_2: ee->ee_antennaGainMax[1] = (int8_t) v; - return HAL_OK; + return AH_TRUE; case AR_EEP_ANTGAINMAX_5: ee->ee_antennaGainMax[0] = (int8_t) v; - return HAL_OK; + return AH_TRUE; } - return HAL_EINVAL; + return AH_FALSE; } static HAL_BOOL Index: sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c =================================================================== RCS file: /cvsroot/src/sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c,v retrieving revision 1.4 diff -p -u -r1.4 ah_eeprom_v3.c --- sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c 12 Sep 2013 11:26:53 -0000 1.4 +++ sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c 12 Apr 2021 21:14:51 -0000 @@ -1671,45 +1671,45 @@ legacyEepromSet(struct ath_hal *ah, int switch (param) { case AR_EEP_AMODE: ee->ee_Amode = v; - return HAL_OK; + return AH_TRUE; case AR_EEP_BMODE: ee->ee_Bmode = v; - return HAL_OK; + return AH_TRUE; case AR_EEP_GMODE: ee->ee_Gmode = v; - return HAL_OK; + return AH_TRUE; case AR_EEP_TURBO5DISABLE: ee->ee_turbo5Disable = v; - return HAL_OK; + return AH_TRUE; case AR_EEP_TURBO2DISABLE: ee->ee_turbo2Disable = v; - return HAL_OK; + return AH_TRUE; case AR_EEP_COMPRESS: if (v) ee->ee_opCap &= ~AR_EEPROM_EEPCAP_COMPRESS_DIS; else ee->ee_opCap |= AR_EEPROM_EEPCAP_COMPRESS_DIS; - return HAL_OK; + return AH_TRUE; case AR_EEP_FASTFRAME: if (v) ee->ee_opCap &= ~AR_EEPROM_EEPCAP_FASTFRAME_DIS; else ee->ee_opCap |= AR_EEPROM_EEPCAP_FASTFRAME_DIS; - return HAL_OK; + return AH_TRUE; case AR_EEP_AES: if (v) ee->ee_opCap &= ~AR_EEPROM_EEPCAP_AES_DIS; else ee->ee_opCap |= AR_EEPROM_EEPCAP_AES_DIS; - return HAL_OK; + return AH_TRUE; case AR_EEP_BURST: if (v) ee->ee_opCap &= ~AR_EEPROM_EEPCAP_BURST_DIS; else ee->ee_opCap |= AR_EEPROM_EEPCAP_BURST_DIS; - return HAL_OK; + return AH_TRUE; } - return HAL_EINVAL; + return AH_FALSE; } static HAL_BOOL Index: sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c =================================================================== RCS file: /cvsroot/src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c,v retrieving revision 1.5 diff -p -u -r1.5 ah_eeprom_v4k.c --- sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c 12 Sep 2013 11:38:23 -0000 1.5 +++ sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c 12 Apr 2021 21:14:51 -0000 @@ -124,9 +124,9 @@ v4kEepromSet(struct ath_hal *ah, int par switch (param) { case AR_EEP_ANTGAINMAX_2: ee->ee_antennaGainMax = (int8_t) v; - return HAL_OK; + return AH_TRUE; } - return HAL_EINVAL; + return AH_FALSE; } static HAL_BOOL Index: sys/external/isc/atheros_hal/dist/ar5212/ar5212_attach.c =================================================================== RCS file: /cvsroot/src/sys/external/isc/atheros_hal/dist/ar5212/ar5212_attach.c,v retrieving revision 1.4 diff -p -u -r1.4 ar5212_attach.c --- sys/external/isc/atheros_hal/dist/ar5212/ar5212_attach.c 7 Mar 2011 11:25:43 -0000 1.4 +++ sys/external/isc/atheros_hal/dist/ar5212/ar5212_attach.c 12 Apr 2021 21:14:51 -0000 @@ -238,7 +238,7 @@ ar5212InitState(struct ath_hal_5212 *ahp ahp->ah_antControl = HAL_ANT_VARIABLE; ahp->ah_diversity = AH_TRUE; - ahp->ah_bIQCalibration = AH_FALSE; + ahp->ah_bIQCalibration = IQ_CAL_INACTIVE; /* * Enable MIC handling. */ Index: sys/external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c =================================================================== RCS file: /cvsroot/src/sys/external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c,v retrieving revision 1.3 diff -p -u -r1.3 ar5212_xmit.c --- sys/external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c 7 Mar 2011 11:25:43 -0000 1.3 +++ sys/external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c 12 Apr 2021 21:14:51 -0000 @@ -902,7 +902,9 @@ ar5212ProcTxDesc(struct ath_hal *ah, */ switch (ts->ts_finaltsi) { case 3: ts->ts_longretry += MS(ads->ds_ctl2, AR_XmitDataTries2); + /* FALLTHRU */ case 2: ts->ts_longretry += MS(ads->ds_ctl2, AR_XmitDataTries1); + /* FALLTHRU */ case 1: ts->ts_longretry += MS(ads->ds_ctl2, AR_XmitDataTries0); } ts->ts_virtcol = MS(ads->ds_txstatus0, AR_VirtCollCnt);