From owner-svn-src-projects@FreeBSD.ORG Fri Nov 28 22:25:31 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC40F1065672; Fri, 28 Nov 2008 22:25:31 +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 C78538FC18; Fri, 28 Nov 2008 22:25:31 +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 mASMPViQ031545; Fri, 28 Nov 2008 22:25:31 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mASMPV66031543; Fri, 28 Nov 2008 22:25:31 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200811282225.mASMPV66031543@svn.freebsd.org> From: Sam Leffler Date: Fri, 28 Nov 2008 22:25:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185416 - projects/ath_hal X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2008 22:25:31 -0000 Author: sam Date: Fri Nov 28 22:25:31 2008 New Revision: 185416 URL: http://svn.freebsd.org/changeset/base/185416 Log: remove ath_hal_buildopts and ath_hal_version; they are not needed any more Modified: projects/ath_hal/ah.c projects/ath_hal/ah.h Modified: projects/ath_hal/ah.c ============================================================================== --- projects/ath_hal/ah.c Fri Nov 28 22:10:15 2008 (r185415) +++ projects/ath_hal/ah.c Fri Nov 28 22:25:31 2008 (r185416) @@ -22,98 +22,6 @@ #include "ah_internal.h" #include "ah_devid.h" - -#include "version.h" -char ath_hal_version[] = ATH_HAL_VERSION; -/* XXX chip+rf support no longer correct */ -const char* ath_hal_buildopts[] = { -#ifdef AH_SUPPORT_AR5210 - "AR5210", -#endif -#ifdef AH_SUPPORT_AR5211 - "AR5211", -#endif -#ifdef AH_SUPPORT_AR5212 - "AR5212", -#endif -#ifdef AH_SUPPORT_AR5312 - "AR5312", -#endif -#ifdef AH_SUPPORT_AR5416 - "AR5416", -#endif -#ifdef AH_SUPPORT_AR9180 - "AR9180", -#endif -#ifdef AH_SUPPORT_AR9280 - "AR9280", -#endif -#ifdef AH_SUPPORT_AR9285 - "AR9285", -#endif -#ifdef AH_SUPPORT_5111 - "RF5111", -#endif -#ifdef AH_SUPPORT_5112 - "RF5112", -#endif -#ifdef AH_SUPPORT_2413 - "RF2413", -#endif -#ifdef AH_SUPPORT_5413 - "RF5413", -#endif -#ifdef AH_SUPPORT_2316 - "RF2316", -#endif -#ifdef AH_SUPPORT_2317 - "RF2317", -#endif -#ifdef AH_SUPPORT_2133 - "RF2133", -#endif -#ifdef AH_SUPPORT_2425 - "RF2425", -#endif -#ifdef AH_SUPPORT_2417 - "RF2417", -#endif -#ifdef AH_DEBUG - "DEBUG", -#endif -#ifdef AH_ASSERT - "ASSERT", -#endif -#ifdef AH_DEBUG_ALQ - "DEBUG_ALQ", -#endif -#ifdef AH_REGOPS_FUNC - "REGOPS_FUNC", -#endif -#ifdef AH_PRIVATE_DIAG - "PRIVATE_DIAG", -#endif -#ifdef AH_SUPPORT_WRITE_EEPROM - "WRITE_EEPROM", -#endif -#ifdef AH_SUPPORT_WRITE_REGDOMAIN - "WRITE_REGDOMAIN", -#endif -#ifdef AH_DEBUG_COUNTRY - "DEBUG_COUNTRY", -#endif -#ifdef AH_NEED_DESC_SWAP - "TX_DESC_SWAP", -#endif -#ifdef AH_USE_INIPDGAIN - "INIPDGAIN", -#endif -#ifdef AH_SUPPORT_11D - "11D", -#endif - AH_NULL -}; - /* linker set of registered chips */ OS_SET_DECLARE(ah_chips, struct ath_hal_chip); Modified: projects/ath_hal/ah.h ============================================================================== --- projects/ath_hal/ah.h Fri Nov 28 22:10:15 2008 (r185415) +++ projects/ath_hal/ah.h Fri Nov 28 22:25:31 2008 (r185416) @@ -656,7 +656,7 @@ struct ath_rx_status; struct ath_hal { uint32_t ah_magic; /* consistency check magic number */ uint32_t ah_abi; /* HAL ABI version */ -#define HAL_ABI_VERSION 0x08111400 /* YYMMDDnn */ +#define HAL_ABI_VERSION 0x08112800 /* YYMMDDnn */ uint16_t ah_devid; /* PCI device ID */ uint16_t ah_subvendorid; /* PCI subvendor ID */ HAL_SOFTC ah_sc; /* back pointer to driver/os state */ @@ -908,13 +908,4 @@ extern HAL_BOOL ath_hal_isgsmsku(struct * using the specified channel flags; e.g. CHANNEL_2GHZ. */ extern int __ahdecl ath_hal_mhz2ieee(struct ath_hal *, u_int mhz, u_int flags); - -/* - * Return a version string for the HAL release. - */ -extern char ath_hal_version[]; -/* - * Return a NULL-terminated array of build/configuration options. - */ -extern const char* ath_hal_buildopts[]; #endif /* _ATH_AH_H_ */