From owner-svn-src-user@FreeBSD.ORG Wed Nov 2 17:40:21 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B68D6106564A; Wed, 2 Nov 2011 17:40:21 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9C4EB8FC0A; Wed, 2 Nov 2011 17:40:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA2HeLhT031408; Wed, 2 Nov 2011 17:40:21 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA2HeLpe031406; Wed, 2 Nov 2011 17:40:21 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201111021740.pA2HeLpe031406@svn.freebsd.org> From: Adrian Chadd Date: Wed, 2 Nov 2011 17:40:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227022 - user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Nov 2011 17:40:21 -0000 Author: adrian Date: Wed Nov 2 17:40:21 2011 New Revision: 227022 URL: http://svn.freebsd.org/changeset/base/227022 Log: Update the AR9280 TX/RX gain type assignment to be correct for earlier EEPROM versions. Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Wed Nov 2 16:39:10 2011 (r227021) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Wed Nov 2 17:40:21 2011 (r227022) @@ -309,43 +309,55 @@ ar9280Attach(uint16_t devid, HAL_SOFTC s ath_hal_printf(ah, "[ath]: default pwr offset: %d dBm != EEPROM pwr offset: %d dBm; curves will be adjusted.\n", AR5416_PWR_TABLE_OFFSET_DB, (int) pwr_table_offset); - /* XXX check for >= minor ver 17 */ if (AR_SREV_MERLIN_20(ah)) { - /* setup rxgain table */ - switch (ath_hal_eepromGet(ah, AR_EEP_RXGAIN_TYPE, AH_NULL)) { - case AR5416_EEP_RXGAIN_13dB_BACKOFF: - HAL_INI_INIT(&ahp9280->ah_ini_rxgain, - ar9280Modes_backoff_13db_rxgain_v2, 6); - break; - case AR5416_EEP_RXGAIN_23dB_BACKOFF: - HAL_INI_INIT(&ahp9280->ah_ini_rxgain, - ar9280Modes_backoff_23db_rxgain_v2, 6); - break; - case AR5416_EEP_RXGAIN_ORIG: + if (EEP_MINOR(ah) >= AR5416_EEP_MINOR_VER_17) { + /* setup rxgain table */ + switch (ath_hal_eepromGet(ah, AR_EEP_RXGAIN_TYPE, + AH_NULL)) { + case AR5416_EEP_RXGAIN_13dB_BACKOFF: + HAL_INI_INIT(&ahp9280->ah_ini_rxgain, + ar9280Modes_backoff_13db_rxgain_v2, 6); + break; + case AR5416_EEP_RXGAIN_23dB_BACKOFF: + HAL_INI_INIT(&ahp9280->ah_ini_rxgain, + ar9280Modes_backoff_23db_rxgain_v2, 6); + break; + case AR5416_EEP_RXGAIN_ORIG: + HAL_INI_INIT(&ahp9280->ah_ini_rxgain, + ar9280Modes_original_rxgain_v2, 6); + break; + default: + HALASSERT(AH_FALSE); + goto bad; + } + } else { + /* Default to original RX gain */ HAL_INI_INIT(&ahp9280->ah_ini_rxgain, ar9280Modes_original_rxgain_v2, 6); - break; - default: - HALASSERT(AH_FALSE); - goto bad; /* XXX ? try to continue */ } } - /* XXX check for >= minor ver 19 */ if (AR_SREV_MERLIN_20(ah)) { - /* setp txgain table */ - switch (ath_hal_eepromGet(ah, AR_EEP_TXGAIN_TYPE, AH_NULL)) { - case AR5416_EEP_TXGAIN_HIGH_POWER: - HAL_INI_INIT(&ahp9280->ah_ini_txgain, - ar9280Modes_high_power_tx_gain_v2, 6); - break; - case AR5416_EEP_TXGAIN_ORIG: + if (EEP_MINOR(ah) >= AR5416_EEP_MINOR_VER_19) { + /* setp txgain table */ + switch (ath_hal_eepromGet(ah, AR_EEP_TXGAIN_TYPE, + AH_NULL)) { + case AR5416_EEP_TXGAIN_HIGH_POWER: + HAL_INI_INIT(&ahp9280->ah_ini_txgain, + ar9280Modes_high_power_tx_gain_v2, 6); + break; + case AR5416_EEP_TXGAIN_ORIG: + HAL_INI_INIT(&ahp9280->ah_ini_txgain, + ar9280Modes_original_tx_gain_v2, 6); + break; + default: + HALASSERT(AH_FALSE); + goto bad; + } + } else { + /* Default to original TX gain */ HAL_INI_INIT(&ahp9280->ah_ini_txgain, ar9280Modes_original_tx_gain_v2, 6); - break; - default: - HALASSERT(AH_FALSE); - goto bad; /* XXX ? try to continue */ } }