Author: adrian Date: Sat May 14 15:12:02 2011 New Revision: 221896 URL: http://svn.freebsd.org/changeset/base/221896
Log: Fix the eeprom set API method to return HAL_STATUS. The code assumed it could return HAL_OK, HAL_EINVAL and other HAL_STATUS types; so it shouldn't be declared as returning HAL_BOOL. This commit was brought to you by the Clang compiler. Submitted by: Matthew Fleming <[email protected]> Modified: head/sys/dev/ath/ath_hal/ah_eeprom_9287.c head/sys/dev/ath/ath_hal/ah_eeprom_v1.c head/sys/dev/ath/ath_hal/ah_eeprom_v14.c head/sys/dev/ath/ath_hal/ah_eeprom_v3.c head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c head/sys/dev/ath/ath_hal/ah_internal.h Modified: head/sys/dev/ath/ath_hal/ah_eeprom_9287.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_9287.c Sat May 14 15:02:50 2011 (r221895) +++ head/sys/dev/ath/ath_hal/ah_eeprom_9287.c Sat May 14 15:12:02 2011 (r221896) @@ -126,7 +126,7 @@ v9287EepromGet(struct ath_hal *ah, int p #undef CHAN_B_IDX } -static HAL_BOOL +static HAL_STATUS v9287EepromSet(struct ath_hal *ah, int param, int v) { HAL_EEPROM_9287 *ee = AH_PRIVATE(ah)->ah_eeprom; Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v1.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v1.c Sat May 14 15:02:50 2011 (r221895) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v1.c Sat May 14 15:12:02 2011 (r221896) @@ -68,7 +68,7 @@ v1EepromGet(struct ath_hal *ah, int para } } -static HAL_BOOL +static HAL_STATUS v1EepromSet(struct ath_hal *ah, int param, int v) { return HAL_EINVAL; Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v14.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v14.c Sat May 14 15:02:50 2011 (r221895) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v14.c Sat May 14 15:12:02 2011 (r221896) @@ -148,7 +148,7 @@ v14EepromGet(struct ath_hal *ah, int par #undef CHAN_B_IDX } -static HAL_BOOL +static HAL_STATUS v14EepromSet(struct ath_hal *ah, int param, int v) { HAL_EEPROM_v14 *ee = AH_PRIVATE(ah)->ah_eeprom; Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v3.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v3.c Sat May 14 15:02:50 2011 (r221895) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v3.c Sat May 14 15:12:02 2011 (r221896) @@ -1665,7 +1665,7 @@ legacyEepromGet(struct ath_hal *ah, int return HAL_EINVAL; } -static HAL_BOOL +static HAL_STATUS legacyEepromSet(struct ath_hal *ah, int param, int v) { HAL_EEPROM *ee = AH_PRIVATE(ah)->ah_eeprom; Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c Sat May 14 15:02:50 2011 (r221895) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c Sat May 14 15:12:02 2011 (r221896) @@ -116,7 +116,7 @@ v4kEepromGet(struct ath_hal *ah, int par #undef CHAN_B_IDX } -static HAL_BOOL +static HAL_STATUS v4kEepromSet(struct ath_hal *ah, int param, int v) { HAL_EEPROM_v4k *ee = AH_PRIVATE(ah)->ah_eeprom; Modified: head/sys/dev/ath/ath_hal/ah_internal.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_internal.h Sat May 14 15:02:50 2011 (r221895) +++ head/sys/dev/ath/ath_hal/ah_internal.h Sat May 14 15:12:02 2011 (r221896) @@ -269,7 +269,7 @@ struct ath_hal_private { uint16_t ah_eeversion; /* EEPROM version */ void (*ah_eepromDetach)(struct ath_hal *); HAL_STATUS (*ah_eepromGet)(struct ath_hal *, int, void *); - HAL_BOOL (*ah_eepromSet)(struct ath_hal *, int, int); + HAL_STATUS (*ah_eepromSet)(struct ath_hal *, int, int); uint16_t (*ah_getSpurChan)(struct ath_hal *, int, HAL_BOOL); HAL_BOOL (*ah_eepromDiag)(struct ath_hal *, int request, const void *args, uint32_t argsize, _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "[email protected]"
