From owner-svn-src-user@FreeBSD.ORG Tue Jul 13 16:10:16 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD4591065675; Tue, 13 Jul 2010 16:10:15 +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 88C508FC17; Tue, 13 Jul 2010 16:10:15 +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 o6DGAFAb086795; Tue, 13 Jul 2010 16:10:15 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6DGAF0H086793; Tue, 13 Jul 2010 16:10:15 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201007131610.o6DGAF0H086793@svn.freebsd.org> From: Adrian Chadd Date: Tue, 13 Jul 2010 16:10:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209998 - user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2010 16:10:16 -0000 Author: adrian Date: Tue Jul 13 16:10:15 2010 New Revision: 209998 URL: http://svn.freebsd.org/changeset/base/209998 Log: Revert my previous change and use the 9160 .ini file. It now has the updated ini changes. Modified: user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c Modified: user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c ============================================================================== --- user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c Tue Jul 13 16:03:47 2010 (r209997) +++ user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c Tue Jul 13 16:10:15 2010 (r209998) @@ -26,14 +26,7 @@ #include "ar5416/ar5416reg.h" #include "ar5416/ar5416phy.h" -#if 0 #include "ar5416/ar9160.ini" -#endif -/* XXX Temporary workaround so linux-9160.h can be a virgin copy of linux ath9k/initvals.h */ -#define u32 uint32_t -#include "ar5416/linux-9160.h" -#undef u32 -#include "ar5416/ar9160-pcie.h" static const HAL_PERCAL_DATA ar9160_iq_cal = { /* multi sample */ .calName = "IQ", .calType = IQ_MISMATCH_CAL, @@ -156,22 +149,22 @@ ar9160Attach(uint16_t devid, HAL_SOFTC s AH_PRIVATE(ah)->ah_ispcie = (val & AR_XSREV_TYPE_HOST_MODE) == 0; /* setup common ini data; rf backends handle remainder */ - HAL_INI_INIT(&ahp->ah_ini_modes, ar5416Modes_9160, 6); - HAL_INI_INIT(&ahp->ah_ini_common, ar5416Common_9160, 2); + HAL_INI_INIT(&ahp->ah_ini_modes, ar9160Modes, 6); + HAL_INI_INIT(&ahp->ah_ini_common, ar9160Common, 2); - HAL_INI_INIT(&AH5416(ah)->ah_ini_bb_rfgain, ar5416BB_RfGain_9160, 3); - HAL_INI_INIT(&AH5416(ah)->ah_ini_bank0, ar5416Bank0_9160, 2); - HAL_INI_INIT(&AH5416(ah)->ah_ini_bank1, ar5416Bank1_9160, 2); - HAL_INI_INIT(&AH5416(ah)->ah_ini_bank2, ar5416Bank2_9160, 2); - HAL_INI_INIT(&AH5416(ah)->ah_ini_bank3, ar5416Bank3_9160, 3); - HAL_INI_INIT(&AH5416(ah)->ah_ini_bank6, ar5416Bank6_9160, 3); - HAL_INI_INIT(&AH5416(ah)->ah_ini_bank6tpc, ar5416Bank6TPC_9160, 3); - HAL_INI_INIT(&AH5416(ah)->ah_ini_bank7, ar5416Bank7_9160, 2); + HAL_INI_INIT(&AH5416(ah)->ah_ini_bb_rfgain, ar9160BB_RfGain, 3); + HAL_INI_INIT(&AH5416(ah)->ah_ini_bank0, ar9160Bank0, 2); + HAL_INI_INIT(&AH5416(ah)->ah_ini_bank1, ar9160Bank1, 2); + HAL_INI_INIT(&AH5416(ah)->ah_ini_bank2, ar9160Bank2, 2); + HAL_INI_INIT(&AH5416(ah)->ah_ini_bank3, ar9160Bank3, 3); + HAL_INI_INIT(&AH5416(ah)->ah_ini_bank6, ar9160Bank6, 3); + HAL_INI_INIT(&AH5416(ah)->ah_ini_bank6tpc, ar9160Bank6TPC, 3); + HAL_INI_INIT(&AH5416(ah)->ah_ini_bank7, ar9160Bank7, 2); if (AR_SREV_SOWL_11(ah)) - HAL_INI_INIT(&AH5416(ah)->ah_ini_addac, ar5416Addac_91601_1, 2); + HAL_INI_INIT(&AH5416(ah)->ah_ini_addac, ar9160Addac_1_1, 2); else - HAL_INI_INIT(&AH5416(ah)->ah_ini_addac, ar5416Addac_9160, 2); + HAL_INI_INIT(&AH5416(ah)->ah_ini_addac, ar9160Addac, 2); ecode = ath_hal_v14EepromAttach(ah); if (ecode != HAL_OK)