From owner-svn-src-head@FreeBSD.ORG Thu Jan 20 07:42:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 033CC1065679; Thu, 20 Jan 2011 07:42:40 +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 834468FC1E; Thu, 20 Jan 2011 07:42:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0K7gd5Q004887; Thu, 20 Jan 2011 07:42:39 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0K7gdQK004883; Thu, 20 Jan 2011 07:42:39 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201101200742.p0K7gdQK004883@svn.freebsd.org> From: Adrian Chadd Date: Thu, 20 Jan 2011 07:42:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217623 - head/sys/dev/ath/ath_hal X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jan 2011 07:42:40 -0000 Author: adrian Date: Thu Jan 20 07:42:39 2011 New Revision: 217623 URL: http://svn.freebsd.org/changeset/base/217623 Log: Port over another EEPROM option from ath9k - AR_EEP_DAC_HPWR_5G This will be used by the temperature compensation calibration code which will shortly make an appearance. Modified: head/sys/dev/ath/ath_hal/ah_eeprom.h head/sys/dev/ath/ath_hal/ah_eeprom_v14.c head/sys/dev/ath/ath_hal/ah_eeprom_v14.h Modified: head/sys/dev/ath/ath_hal/ah_eeprom.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom.h Thu Jan 20 07:03:20 2011 (r217622) +++ head/sys/dev/ath/ath_hal/ah_eeprom.h Thu Jan 20 07:42:39 2011 (r217623) @@ -94,6 +94,7 @@ enum { AR_EEP_RXMASK, /* uint8_t* */ AR_EEP_RXGAIN_TYPE, /* uint8_t* */ AR_EEP_TXGAIN_TYPE, /* uint8_t* */ + AR_EEP_DAC_HPWR_5G, /* uint8_t* */ AR_EEP_OL_PWRCTRL, /* use ath_hal_eepromGetFlag */ AR_EEP_FSTCLK_5G, /* use ath_hal_eepromGetFlag */ AR_EEP_ANTGAINMAX_5, /* int8_t* */ Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v14.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v14.c Thu Jan 20 07:03:20 2011 (r217622) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v14.c Thu Jan 20 07:42:39 2011 (r217623) @@ -89,6 +89,12 @@ v14EepromGet(struct ath_hal *ah, int par case AR_EEP_OL_PWRCTRL: HALASSERT(val == AH_NULL); return pBase->openLoopPwrCntl ? HAL_OK : HAL_EIO; + case AR_EEP_DAC_HPWR_5G: + if (IS_VERS(>=, AR5416_EEP_MINOR_VER_20)) { + *(uint8_t *) val = pBase->dacHiPwrMode; + return HAL_OK; + } else + return HAL_EIO; case AR_EEP_AMODE: HALASSERT(val == AH_NULL); return pBase->opCapFlags & AR5416_OPFLAGS_11A ? Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v14.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v14.h Thu Jan 20 07:03:20 2011 (r217622) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v14.h Thu Jan 20 07:42:39 2011 (r217623) @@ -52,6 +52,9 @@ #define AR5416_EEP_MINOR_VER_16 0x10 #define AR5416_EEP_MINOR_VER_17 0x11 #define AR5416_EEP_MINOR_VER_19 0x13 +#define AR5416_EEP_MINOR_VER_20 0x14 +#define AR5416_EEP_MINOR_VER_21 0x15 +#define AR5416_EEP_MINOR_VER_22 0x16 // 16-bit offset location start of calibration struct #define AR5416_EEP_START_LOC 256