From owner-svn-src-head@FreeBSD.ORG Tue Mar 24 00:09:35 2009 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 6CD971065674; Tue, 24 Mar 2009 00:09:35 +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 5AF8F8FC12; Tue, 24 Mar 2009 00:09:35 +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 n2O09ZTK025719; Tue, 24 Mar 2009 00:09:35 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2O09ZfT025718; Tue, 24 Mar 2009 00:09:35 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200903240009.n2O09ZfT025718@svn.freebsd.org> From: Sam Leffler Date: Tue, 24 Mar 2009 00:09:35 +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: r190347 - head/sys/dev/ath 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: Tue, 24 Mar 2009 00:09:36 -0000 Author: sam Date: Tue Mar 24 00:09:35 2009 New Revision: 190347 URL: http://svn.freebsd.org/changeset/base/190347 Log: fix build w/ AH_DEBUG Modified: head/sys/dev/ath/ah_osdep.c Modified: head/sys/dev/ath/ah_osdep.c ============================================================================== --- head/sys/dev/ath/ah_osdep.c Tue Mar 24 00:08:58 2009 (r190346) +++ head/sys/dev/ath/ah_osdep.c Tue Mar 24 00:09:35 2009 (r190347) @@ -71,12 +71,7 @@ extern void ath_hal_assert_failed(const int lineno, const char* msg); #endif #ifdef AH_DEBUG -#if HAL_ABI_VERSION >= 0x08090101 extern void HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...); -#else -extern void HALDEBUG(struct ath_hal *ah, const char* fmt, ...); -extern void HALDEBUGn(struct ath_hal *ah, u_int level, const char* fmt, ...); -#endif #endif /* AH_DEBUG */ /* NB: put this here instead of the driver to avoid circular references */ @@ -140,7 +135,6 @@ ath_hal_ether_sprintf(const u_int8_t *ma } #ifdef AH_DEBUG -#if HAL_ABI_VERSION >= 0x08090101 void HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...) { @@ -151,29 +145,6 @@ HALDEBUG(struct ath_hal *ah, u_int mask, va_end(ap); } } -#else -void -HALDEBUG(struct ath_hal *ah, const char* fmt, ...) -{ - if (ath_hal_debug) { - __va_list ap; - va_start(ap, fmt); - ath_hal_vprintf(ah, fmt, ap); - va_end(ap); - } -} - -void -HALDEBUGn(struct ath_hal *ah, u_int level, const char* fmt, ...) -{ - if (ath_hal_debug >= level) { - __va_list ap; - va_start(ap, fmt); - ath_hal_vprintf(ah, fmt, ap); - va_end(ap); - } -} -#endif #endif /* AH_DEBUG */ #ifdef AH_DEBUG_ALQ