From owner-svn-src-all@FreeBSD.ORG Thu Aug 30 06:55:47 2012 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 D47F9106564A; Thu, 30 Aug 2012 06:55:47 +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 B51918FC08; Thu, 30 Aug 2012 06:55:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7U6tlrb093980; Thu, 30 Aug 2012 06:55:47 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7U6tll1093976; Thu, 30 Aug 2012 06:55:47 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201208300655.q7U6tll1093976@svn.freebsd.org> From: Adrian Chadd Date: Thu, 30 Aug 2012 06:55:47 +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: r239890 - in head/sys/dev/ath/ath_hal: . ar9002 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: Thu, 30 Aug 2012 06:55:47 -0000 Author: adrian Date: Thu Aug 30 06:55:47 2012 New Revision: 239890 URL: http://svn.freebsd.org/changeset/base/239890 Log: Migrate the AR9285 diversity configuration LNA configuration to use some HAL definitions rather than local definitions. The original source (ath9k) pulled this stuff from the QCA driver and removed the HAL_* prefix. I'm just restoring the correct order of things. Obtained from: Qualcomm Atheros Modified: head/sys/dev/ath/ath_hal/ah.h head/sys/dev/ath/ath_hal/ar9002/ar9285.h head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c Modified: head/sys/dev/ath/ath_hal/ah.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah.h Thu Aug 30 00:43:14 2012 (r239889) +++ head/sys/dev/ath/ath_hal/ah.h Thu Aug 30 06:55:47 2012 (r239890) @@ -855,6 +855,29 @@ typedef enum { HAL_MFP_HW_CRYPTO /* hardware decryption enabled. Merlin can do it. */ } HAL_MFP_OPT_T; +/* LNA config supported */ +typedef enum { + HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2 = 0, + HAL_ANT_DIV_COMB_LNA2 = 1, + HAL_ANT_DIV_COMB_LNA1 = 2, + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2 = 3, +} HAL_ANT_DIV_COMB_LNA_CONF; + +typedef struct { + u_int8_t main_lna_conf; + u_int8_t alt_lna_conf; + u_int8_t fast_div_bias; + u_int8_t main_gaintb; + u_int8_t alt_gaintb; + u_int8_t antdiv_configgroup; + int8_t lna1_lna2_delta; +} HAL_ANT_COMB_CONFIG; + +#define DEFAULT_ANTDIV_CONFIG_GROUP 0x00 +#define HAL_ANTDIV_CONFIG_GROUP_1 0x01 +#define HAL_ANTDIV_CONFIG_GROUP_2 0x02 +#define HAL_ANTDIV_CONFIG_GROUP_3 0x03 + /* * Flag for setting QUIET period */ Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar9002/ar9285.h Thu Aug 30 00:43:14 2012 (r239889) +++ head/sys/dev/ath/ath_hal/ar9002/ar9285.h Thu Aug 30 06:55:47 2012 (r239890) @@ -20,13 +20,6 @@ #include "ar5416/ar5416.h" -enum ar9285_ant_div_comb_lna_conf { - ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2 = 0, - ATH_ANT_DIV_COMB_LNA2 = 1, - ATH_ANT_DIV_COMB_LNA1 = 2, - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2 = 3, -}; - struct ar9285_ant_comb { uint16_t count; uint16_t total_pkt_count; @@ -46,8 +39,8 @@ struct ar9285_ant_comb { HAL_BOOL alt_good; int quick_scan_cnt; int main_conf; - enum ar9285_ant_div_comb_lna_conf first_quick_scan_conf; - enum ar9285_ant_div_comb_lna_conf second_quick_scan_conf; + HAL_ANT_DIV_COMB_LNA_CONF first_quick_scan_conf; + HAL_ANT_DIV_COMB_LNA_CONF second_quick_scan_conf; int first_bias; int second_bias; HAL_BOOL first_ratio; Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c Thu Aug 30 00:43:14 2012 (r239889) +++ head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c Thu Aug 30 06:55:47 2012 (r239890) @@ -63,49 +63,49 @@ ath_lnaconf_alt_good_scan(struct ar9285_ { antcomb->quick_scan_cnt = 0; - if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA2) + if (ant_conf.main_lna_conf == HAL_ANT_DIV_COMB_LNA2) antcomb->rssi_lna2 = main_rssi_avg; - else if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA1) + else if (ant_conf.main_lna_conf == HAL_ANT_DIV_COMB_LNA1) antcomb->rssi_lna1 = main_rssi_avg; switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) { case (0x10): /* LNA2 A-B */ - antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; + antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; antcomb->first_quick_scan_conf = - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; - antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; + antcomb->second_quick_scan_conf = HAL_ANT_DIV_COMB_LNA1; break; case (0x20): /* LNA1 A-B */ - antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; + antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; antcomb->first_quick_scan_conf = - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; - antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; + antcomb->second_quick_scan_conf = HAL_ANT_DIV_COMB_LNA2; break; case (0x21): /* LNA1 LNA2 */ - antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2; + antcomb->main_conf = HAL_ANT_DIV_COMB_LNA2; antcomb->first_quick_scan_conf = - ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; antcomb->second_quick_scan_conf = - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; break; case (0x12): /* LNA2 LNA1 */ - antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1; + antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1; antcomb->first_quick_scan_conf = - ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; antcomb->second_quick_scan_conf = - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; break; case (0x13): /* LNA2 A+B */ - antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; antcomb->first_quick_scan_conf = - ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; - antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; + antcomb->second_quick_scan_conf = HAL_ANT_DIV_COMB_LNA1; break; case (0x23): /* LNA1 A+B */ - antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + antcomb->main_conf = HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; antcomb->first_quick_scan_conf = - ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; - antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; + antcomb->second_quick_scan_conf = HAL_ANT_DIV_COMB_LNA2; break; default: break; @@ -131,7 +131,7 @@ ath_select_ant_div_from_quick_scan(struc antcomb->rssi_first = main_rssi_avg; antcomb->rssi_second = alt_rssi_avg; - if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) { + if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA1) { /* main is LNA1 */ if (ath_is_alt_ant_ratio_better(alt_ratio, ATH_ANT_DIV_COMB_LNA1_DELTA_HI, @@ -141,7 +141,7 @@ ath_select_ant_div_from_quick_scan(struc antcomb->first_ratio = AH_TRUE; else antcomb->first_ratio = AH_FALSE; - } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) { + } else if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA2) { if (ath_is_alt_ant_ratio_better(alt_ratio, ATH_ANT_DIV_COMB_LNA1_DELTA_MID, ATH_ANT_DIV_COMB_LNA1_DELTA_LOW, @@ -168,26 +168,26 @@ ath_select_ant_div_from_quick_scan(struc antcomb->rssi_first = main_rssi_avg; antcomb->rssi_third = alt_rssi_avg; - if (antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1) + if (antcomb->second_quick_scan_conf == HAL_ANT_DIV_COMB_LNA1) antcomb->rssi_lna1 = alt_rssi_avg; else if (antcomb->second_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA2) + HAL_ANT_DIV_COMB_LNA2) antcomb->rssi_lna2 = alt_rssi_avg; else if (antcomb->second_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2) { - if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2) { + if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA2) antcomb->rssi_lna2 = main_rssi_avg; - else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) + else if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA1) antcomb->rssi_lna1 = main_rssi_avg; } if (antcomb->rssi_lna2 > antcomb->rssi_lna1 + ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA) - div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2; + div_ant_conf->main_lna_conf = HAL_ANT_DIV_COMB_LNA2; else - div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1; + div_ant_conf->main_lna_conf = HAL_ANT_DIV_COMB_LNA1; - if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) { + if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA1) { if (ath_is_alt_ant_ratio_better(alt_ratio, ATH_ANT_DIV_COMB_LNA1_DELTA_HI, ATH_ANT_DIV_COMB_LNA1_DELTA_LOW, @@ -196,7 +196,7 @@ ath_select_ant_div_from_quick_scan(struc antcomb->second_ratio = AH_TRUE; else antcomb->second_ratio = AH_FALSE; - } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) { + } else if (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA2) { if (ath_is_alt_ant_ratio_better(alt_ratio, ATH_ANT_DIV_COMB_LNA1_DELTA_MID, ATH_ANT_DIV_COMB_LNA1_DELTA_LOW, @@ -221,33 +221,33 @@ ath_select_ant_div_from_quick_scan(struc if (antcomb->rssi_second > antcomb->rssi_third) { /* first alt*/ if ((antcomb->first_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA1) || + HAL_ANT_DIV_COMB_LNA1) || (antcomb->first_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA2)) + HAL_ANT_DIV_COMB_LNA2)) /* Set alt LNA1 or LNA2*/ if (div_ant_conf->main_lna_conf == - ATH_ANT_DIV_COMB_LNA2) + HAL_ANT_DIV_COMB_LNA2) div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; else div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; else /* Set alt to A+B or A-B */ div_ant_conf->alt_lna_conf = antcomb->first_quick_scan_conf; } else if ((antcomb->second_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA1) || + HAL_ANT_DIV_COMB_LNA1) || (antcomb->second_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA2)) { + HAL_ANT_DIV_COMB_LNA2)) { /* Set alt LNA1 or LNA2 */ if (div_ant_conf->main_lna_conf == - ATH_ANT_DIV_COMB_LNA2) + HAL_ANT_DIV_COMB_LNA2) div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; else div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; } else { /* Set alt to A+B or A-B */ div_ant_conf->alt_lna_conf = @@ -256,17 +256,17 @@ ath_select_ant_div_from_quick_scan(struc } else if (antcomb->first_ratio) { /* first alt */ if ((antcomb->first_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA1) || + HAL_ANT_DIV_COMB_LNA1) || (antcomb->first_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA2)) + HAL_ANT_DIV_COMB_LNA2)) /* Set alt LNA1 or LNA2 */ if (div_ant_conf->main_lna_conf == - ATH_ANT_DIV_COMB_LNA2) + HAL_ANT_DIV_COMB_LNA2) div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; else div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; else /* Set alt to A+B or A-B */ div_ant_conf->alt_lna_conf = @@ -274,33 +274,33 @@ ath_select_ant_div_from_quick_scan(struc } else if (antcomb->second_ratio) { /* second alt */ if ((antcomb->second_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA1) || + HAL_ANT_DIV_COMB_LNA1) || (antcomb->second_quick_scan_conf == - ATH_ANT_DIV_COMB_LNA2)) + HAL_ANT_DIV_COMB_LNA2)) /* Set alt LNA1 or LNA2 */ if (div_ant_conf->main_lna_conf == - ATH_ANT_DIV_COMB_LNA2) + HAL_ANT_DIV_COMB_LNA2) div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; else div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; else /* Set alt to A+B or A-B */ div_ant_conf->alt_lna_conf = antcomb->second_quick_scan_conf; } else { /* main is largest */ - if ((antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) || - (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2)) + if ((antcomb->main_conf == HAL_ANT_DIV_COMB_LNA1) || + (antcomb->main_conf == HAL_ANT_DIV_COMB_LNA2)) /* Set alt LNA1 or LNA2 */ if (div_ant_conf->main_lna_conf == - ATH_ANT_DIV_COMB_LNA2) + HAL_ANT_DIV_COMB_LNA2) div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; else div_ant_conf->alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; else /* Set alt to A+B or A-B */ div_ant_conf->alt_lna_conf = antcomb->main_conf; @@ -454,29 +454,29 @@ ar9285_ant_comb_scan(struct ath_hal *ah, if (!antcomb->scan) { if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) { - if (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) { + if (curr_alt_set == HAL_ANT_DIV_COMB_LNA2) { /* Switch main and alt LNA */ div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; - } else if (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) { + HAL_ANT_DIV_COMB_LNA1; + } else if (curr_alt_set == HAL_ANT_DIV_COMB_LNA1) { div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; } goto div_comb_done; - } else if ((curr_alt_set != ATH_ANT_DIV_COMB_LNA1) && - (curr_alt_set != ATH_ANT_DIV_COMB_LNA2)) { + } else if ((curr_alt_set != HAL_ANT_DIV_COMB_LNA1) && + (curr_alt_set != HAL_ANT_DIV_COMB_LNA2)) { /* Set alt to another LNA */ - if (curr_main_set == ATH_ANT_DIV_COMB_LNA2) + if (curr_main_set == HAL_ANT_DIV_COMB_LNA2) div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; - else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1) + HAL_ANT_DIV_COMB_LNA1; + else if (curr_main_set == HAL_ANT_DIV_COMB_LNA1) div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; goto div_comb_done; } @@ -488,33 +488,33 @@ ar9285_ant_comb_scan(struct ath_hal *ah, if (!antcomb->scan_not_start) { switch (curr_alt_set) { - case ATH_ANT_DIV_COMB_LNA2: + case HAL_ANT_DIV_COMB_LNA2: antcomb->rssi_lna2 = alt_rssi_avg; antcomb->rssi_lna1 = main_rssi_avg; antcomb->scan = AH_TRUE; /* set to A+B */ div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; break; - case ATH_ANT_DIV_COMB_LNA1: + case HAL_ANT_DIV_COMB_LNA1: antcomb->rssi_lna1 = alt_rssi_avg; antcomb->rssi_lna2 = main_rssi_avg; antcomb->scan = AH_TRUE; /* set to A+B */ - div_ant_conf.main_lna_conf = ATH_ANT_DIV_COMB_LNA2; + div_ant_conf.main_lna_conf = HAL_ANT_DIV_COMB_LNA2; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; break; - case ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2: + case HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2: antcomb->rssi_add = alt_rssi_avg; antcomb->scan = AH_TRUE; /* set to A-B */ div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; break; - case ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2: + case HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2: antcomb->rssi_sub = alt_rssi_avg; antcomb->scan = AH_FALSE; if (antcomb->rssi_lna2 > @@ -525,22 +525,22 @@ ar9285_ant_comb_scan(struct ath_hal *ah, (antcomb->rssi_add > antcomb->rssi_sub)) { /* set to A+B */ div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; } else if (antcomb->rssi_sub > antcomb->rssi_lna1) { /* set to A-B */ div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; } else { /* set to LNA1 */ div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; } } else { /* use LNA1 as main LNA */ @@ -548,22 +548,22 @@ ar9285_ant_comb_scan(struct ath_hal *ah, (antcomb->rssi_add > antcomb->rssi_sub)) { /* set to A+B */ div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_PLUS_LNA2; } else if (antcomb->rssi_sub > antcomb->rssi_lna1) { /* set to A-B */ div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; + HAL_ANT_DIV_COMB_LNA1_MINUS_LNA2; } else { /* set to LNA2 */ div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; } } break; @@ -574,16 +574,16 @@ ar9285_ant_comb_scan(struct ath_hal *ah, if (!antcomb->alt_good) { antcomb->scan_not_start = AH_FALSE; /* Set alt to another LNA */ - if (curr_main_set == ATH_ANT_DIV_COMB_LNA2) { + if (curr_main_set == HAL_ANT_DIV_COMB_LNA2) { div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA1; - } else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1) { + HAL_ANT_DIV_COMB_LNA1; + } else if (curr_main_set == HAL_ANT_DIV_COMB_LNA1) { div_ant_conf.main_lna_conf = - ATH_ANT_DIV_COMB_LNA1; + HAL_ANT_DIV_COMB_LNA1; div_ant_conf.alt_lna_conf = - ATH_ANT_DIV_COMB_LNA2; + HAL_ANT_DIV_COMB_LNA2; } goto div_comb_done; } @@ -697,8 +697,8 @@ ar9285SetAntennaSwitch(struct ath_hal *a /* Diversity disabled, RX = LNA1 */ HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: HAL_ANT_FIXED_A\n", __func__); - regVal |= SM(ATH_ANT_DIV_COMB_LNA2, AR_PHY_9285_ANT_DIV_ALT_LNACONF); - regVal |= SM(ATH_ANT_DIV_COMB_LNA1, AR_PHY_9285_ANT_DIV_MAIN_LNACONF); + regVal |= SM(HAL_ANT_DIV_COMB_LNA2, AR_PHY_9285_ANT_DIV_ALT_LNACONF); + regVal |= SM(HAL_ANT_DIV_COMB_LNA1, AR_PHY_9285_ANT_DIV_MAIN_LNACONF); regVal |= SM(AR_PHY_9285_ANT_DIV_GAINTB_0, AR_PHY_9285_ANT_DIV_ALT_GAINTB); regVal |= SM(AR_PHY_9285_ANT_DIV_GAINTB_1, AR_PHY_9285_ANT_DIV_MAIN_GAINTB); } @@ -706,8 +706,8 @@ ar9285SetAntennaSwitch(struct ath_hal *a /* Diversity disabled, RX = LNA2 */ HALDEBUG(ah, HAL_DEBUG_DIVERSITY, "%s: HAL_ANT_FIXED_B\n", __func__); - regVal |= SM(ATH_ANT_DIV_COMB_LNA1, AR_PHY_9285_ANT_DIV_ALT_LNACONF); - regVal |= SM(ATH_ANT_DIV_COMB_LNA2, AR_PHY_9285_ANT_DIV_MAIN_LNACONF); + regVal |= SM(HAL_ANT_DIV_COMB_LNA1, AR_PHY_9285_ANT_DIV_ALT_LNACONF); + regVal |= SM(HAL_ANT_DIV_COMB_LNA2, AR_PHY_9285_ANT_DIV_MAIN_LNACONF); regVal |= SM(AR_PHY_9285_ANT_DIV_GAINTB_1, AR_PHY_9285_ANT_DIV_ALT_GAINTB); regVal |= SM(AR_PHY_9285_ANT_DIV_GAINTB_0, AR_PHY_9285_ANT_DIV_MAIN_GAINTB); } @@ -740,8 +740,8 @@ ar9285SetAntennaSwitch(struct ath_hal *a __func__); regVal = OS_REG_READ(ah, AR_PHY_MULTICHAIN_GAIN_CTL); regVal &= (~(AR_PHY_9285_ANT_DIV_MAIN_LNACONF | AR_PHY_9285_ANT_DIV_ALT_LNACONF)); - regVal |= (ATH_ANT_DIV_COMB_LNA1 << AR_PHY_9285_ANT_DIV_MAIN_LNACONF_S); - regVal |= (ATH_ANT_DIV_COMB_LNA2 << AR_PHY_9285_ANT_DIV_ALT_LNACONF_S); + regVal |= (HAL_ANT_DIV_COMB_LNA1 << AR_PHY_9285_ANT_DIV_MAIN_LNACONF_S); + regVal |= (HAL_ANT_DIV_COMB_LNA2 << AR_PHY_9285_ANT_DIV_ALT_LNACONF_S); regVal &= (~(AR_PHY_9285_FAST_DIV_BIAS)); regVal |= (0 << AR_PHY_9285_FAST_DIV_BIAS_S); OS_REG_WRITE(ah, AR_PHY_MULTICHAIN_GAIN_CTL, regVal);