From owner-svn-src-all@FreeBSD.ORG Mon Feb 23 23:48:17 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE87C1065687; Mon, 23 Feb 2009 23:48:17 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A171D8FC13; Mon, 23 Feb 2009 23:48:17 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NNmHvv043354; Mon, 23 Feb 2009 23:48:17 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1NNmHKg043349; Mon, 23 Feb 2009 23:48:17 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902232348.n1NNmHKg043349@svn.freebsd.org> From: Sam Leffler Date: Mon, 23 Feb 2009 23:48:17 +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: r188970 - in head/sys/dev/ath/ath_hal: . ar5210 ar5211 ar5212 ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Feb 2009 23:48:18 -0000 Author: sam Date: Mon Feb 23 23:48:17 2009 New Revision: 188970 URL: http://svn.freebsd.org/changeset/base/188970 Log: remove private copies of gpio methods that were needed when the hal was an independent entity Modified: head/sys/dev/ath/ath_hal/ah_internal.h head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Modified: head/sys/dev/ath/ath_hal/ah_internal.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_internal.h Mon Feb 23 23:46:56 2009 (r188969) +++ head/sys/dev/ath/ath_hal/ah_internal.h Mon Feb 23 23:48:17 2009 (r188970) @@ -242,12 +242,6 @@ struct ath_hal_private { uint16_t *data); HAL_BOOL (*ah_eepromWrite)(struct ath_hal *, u_int off, uint16_t data); - HAL_BOOL (*ah_gpioCfgOutput)(struct ath_hal *, uint32_t gpio); - HAL_BOOL (*ah_gpioCfgInput)(struct ath_hal *, uint32_t gpio); - uint32_t (*ah_gpioGet)(struct ath_hal *, uint32_t gpio); - HAL_BOOL (*ah_gpioSet)(struct ath_hal *, - uint32_t gpio, uint32_t val); - void (*ah_gpioSetIntr)(struct ath_hal*, u_int, uint32_t); HAL_BOOL (*ah_getChipPowerLimits)(struct ath_hal *, struct ieee80211_channel *); int16_t (*ah_getNfAdjust)(struct ath_hal *, @@ -318,15 +312,15 @@ struct ath_hal_private { #define ath_hal_eepromWrite(_ah, _off, _data) \ AH_PRIVATE(_ah)->ah_eepromWrite(_ah, _off, _data) #define ath_hal_gpioCfgOutput(_ah, _gpio) \ - AH_PRIVATE(_ah)->ah_gpioCfgOutput(_ah, _gpio) + (_ah)->ah_gpioCfgOutput(_ah, _gpio) #define ath_hal_gpioCfgInput(_ah, _gpio) \ - AH_PRIVATE(_ah)->ah_gpioCfgInput(_ah, _gpio) + (_ah)->ah_gpioCfgInput(_ah, _gpio) #define ath_hal_gpioGet(_ah, _gpio) \ - AH_PRIVATE(_ah)->ah_gpioGet(_ah, _gpio) + (_ah)->ah_gpioGet(_ah, _gpio) #define ath_hal_gpioSet(_ah, _gpio, _val) \ - AH_PRIVATE(_ah)->ah_gpioGet(_ah, _gpio, _val) + (_ah)->ah_gpioSet(_ah, _gpio, _val) #define ath_hal_gpioSetIntr(_ah, _gpio, _ilevel) \ - AH_PRIVATE(_ah)->ah_gpioSetIntr(_ah, _gpio, _ilevel) + (_ah)->ah_gpioSetIntr(_ah, _gpio, _ilevel) #define ath_hal_getpowerlimits(_ah, _chan) \ AH_PRIVATE(_ah)->ah_getChipPowerLimits(_ah, _chan) #define ath_hal_getNfAdjust(_ah, _c) \ Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c Mon Feb 23 23:46:56 2009 (r188969) +++ head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c Mon Feb 23 23:48:17 2009 (r188970) @@ -155,11 +155,6 @@ static const struct ath_hal_private ar52 #ifdef AH_SUPPORT_WRITE_EEPROM .ah_eepromWrite = ar5210EepromWrite, #endif - .ah_gpioCfgInput = ar5210GpioCfgInput, - .ah_gpioCfgOutput = ar5210GpioCfgOutput, - .ah_gpioGet = ar5210GpioGet, - .ah_gpioSet = ar5210GpioSet, - .ah_gpioSetIntr = ar5210Gpio0SetIntr, .ah_getChipPowerLimits = ar5210GetChipPowerLimits, }; Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c Mon Feb 23 23:46:56 2009 (r188969) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c Mon Feb 23 23:48:17 2009 (r188970) @@ -155,11 +155,6 @@ static const struct ath_hal_private ar52 #ifdef AH_SUPPORT_WRITE_EEPROM .ah_eepromWrite = ar5211EepromWrite, #endif - .ah_gpioCfgInput = ar5211GpioCfgInput, - .ah_gpioCfgOutput = ar5211GpioCfgOutput, - .ah_gpioGet = ar5211GpioGet, - .ah_gpioSet = ar5211GpioSet, - .ah_gpioSetIntr = ar5211GpioSetIntr, .ah_getChipPowerLimits = ar5211GetChipPowerLimits, }; Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Mon Feb 23 23:46:56 2009 (r188969) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Mon Feb 23 23:48:17 2009 (r188970) @@ -151,11 +151,6 @@ static const struct ath_hal_private ar52 #ifdef AH_SUPPORT_WRITE_EEPROM .ah_eepromWrite = ar5212EepromWrite, #endif - .ah_gpioCfgOutput = ar5212GpioCfgOutput, - .ah_gpioCfgInput = ar5212GpioCfgInput, - .ah_gpioGet = ar5212GpioGet, - .ah_gpioSet = ar5212GpioSet, - .ah_gpioSetIntr = ar5212GpioSetIntr, .ah_getChipPowerLimits = ar5212GetChipPowerLimits, }; Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Mon Feb 23 23:46:56 2009 (r188969) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Mon Feb 23 23:48:17 2009 (r188970) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5416_attach.c,v 1.27 2008/11/27 22:30:07 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -147,11 +147,6 @@ ar5416InitState(struct ath_hal_5416 *ahp #ifdef AH_SUPPORT_WRITE_EEPROM ahp->ah_priv.ah_eepromWrite = ar5416EepromWrite; #endif - ahp->ah_priv.ah_gpioCfgOutput = ar5416GpioCfgOutput; - ahp->ah_priv.ah_gpioCfgInput = ar5416GpioCfgInput; - ahp->ah_priv.ah_gpioGet = ar5416GpioGet; - ahp->ah_priv.ah_gpioSet = ar5416GpioSet; - ahp->ah_priv.ah_gpioSetIntr = ar5416GpioSetIntr; ahp->ah_priv.ah_getChipPowerLimits = ar5416GetChipPowerLimits; /*