From owner-svn-src-all@FreeBSD.ORG Fri May 8 00:23:01 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 60AB91065675; Fri, 8 May 2009 00:23:01 +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 34E3E8FC22; Fri, 8 May 2009 00:23:01 +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 n480N0jL072731; Fri, 8 May 2009 00:23:00 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n480N0eV072728; Fri, 8 May 2009 00:23:00 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200905080023.n480N0eV072728@svn.freebsd.org> From: Sam Leffler Date: Fri, 8 May 2009 00:23:00 +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: r191909 - in head/sys/dev/ath: . ath_hal/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: Fri, 08 May 2009 00:23:02 -0000 Author: sam Date: Fri May 8 00:23:00 2009 New Revision: 191909 URL: http://svn.freebsd.org/changeset/base/191909 Log: kill more portability functions that are no longer useful Modified: head/sys/dev/ath/ah_osdep.c head/sys/dev/ath/ah_osdep.h head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Modified: head/sys/dev/ath/ah_osdep.c ============================================================================== --- head/sys/dev/ath/ah_osdep.c Fri May 8 00:15:27 2009 (r191908) +++ head/sys/dev/ath/ah_osdep.c Fri May 8 00:23:00 2009 (r191909) @@ -353,24 +353,3 @@ ath_hal_assert_failed(const char* filena panic("ath_hal_assert"); } #endif /* AH_ASSERT */ - -/* - * Delay n microseconds. - */ -void -ath_hal_delay(int n) -{ - DELAY(n); -} - -void -ath_hal_memzero(void *dst, size_t n) -{ - bzero(dst, n); -} - -void * -ath_hal_memcpy(void *dst, const void *src, size_t n) -{ - return memcpy(dst, src, n); -} Modified: head/sys/dev/ath/ah_osdep.h ============================================================================== --- head/sys/dev/ath/ah_osdep.h Fri May 8 00:15:27 2009 (r191908) +++ head/sys/dev/ath/ah_osdep.h Fri May 8 00:23:00 2009 (r191909) @@ -58,14 +58,11 @@ typedef bus_space_handle_t HAL_BUS_HANDL /* * Delay n microseconds. */ -extern void ath_hal_delay(int); -#define OS_DELAY(_n) ath_hal_delay(_n) +#define OS_DELAY(_n) DELAY(_n) #define OS_INLINE __inline -#define OS_MEMZERO(_a, _n) ath_hal_memzero((_a), (_n)) -extern void ath_hal_memzero(void *, size_t); -#define OS_MEMCPY(_d, _s, _n) ath_hal_memcpy(_d,_s,_n) -extern void *ath_hal_memcpy(void *, const void *, size_t); +#define OS_MEMZERO(_a, _n) bzero((_a), (_n)) +#define OS_MEMCPY(_d, _s, _n) memcpy(_d,_s,_n) #define abs(_a) __builtin_abs(_a) Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Fri May 8 00:15:27 2009 (r191908) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Fri May 8 00:23:00 2009 (r191909) @@ -818,7 +818,7 @@ ar5416SetTransmitPower(struct ath_hal *a HALASSERT(AH_PRIVATE(ah)->ah_eeversion >= AR_EEPROM_VER14_1); /* Setup info for the actual eeprom */ - ath_hal_memzero(ratesArray, sizeof(ratesArray)); + OS_MEMZERO(ratesArray, sizeof(ratesArray)); cfgCtl = ath_hal_getctl(ah, chan); powerLimit = chan->ic_maxregpower * 2; twiceAntennaReduction = chan->ic_maxantgain; @@ -1759,7 +1759,7 @@ ar5416SetPowerCalTable(struct ath_hal *a uint16_t xpdGainValues[AR5416_NUM_PD_GAINS]; uint32_t reg32, regOffset, regChainOffset; - ath_hal_memzero(xpdGainValues, sizeof(xpdGainValues)); + OS_MEMZERO(xpdGainValues, sizeof(xpdGainValues)); xpdMask = pEepData->modalHeader[IEEE80211_IS_CHAN_2GHZ(chan)].xpdGain;