Deleted Added
full compact
ar5416_spectral.c (244943) ar5416_spectral.c (244950)
1/*
2 * Copyright (c) 2012 Qualcomm Atheros, All Rights Reserved.
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 *
1/*
2 * Copyright (c) 2012 Qualcomm Atheros, All Rights Reserved.
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 *
16 * $FreeBSD: head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c 244943 2013-01-02 00:38:01Z adrian $
16 * $FreeBSD: head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c 244950 2013-01-02 03:56:20Z adrian $
17 */
18#include "opt_ah.h"
19
20#include "ah.h"
21#include "ah_internal.h"
22#include "ah_devid.h"
23#include "ah_desc.h" /* NB: for HAL_PHYERR* */
24

--- 83 unchanged lines hidden (view full) ---

108 if (AR_SREV_MERLIN(ah) ) {
109 if (ss->ss_count != HAL_SPECTRAL_PARAM_NOVAL) {
110 val &= ~AR_PHY_SPECTRAL_SCAN_COUNT;
111 val |= SM(ss->ss_count, AR_PHY_SPECTRAL_SCAN_COUNT);
112 }
113
114 if (ss->ss_short_report == AH_TRUE) {
115 val |= AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT;
17 */
18#include "opt_ah.h"
19
20#include "ah.h"
21#include "ah_internal.h"
22#include "ah_devid.h"
23#include "ah_desc.h" /* NB: for HAL_PHYERR* */
24

--- 83 unchanged lines hidden (view full) ---

108 if (AR_SREV_MERLIN(ah) ) {
109 if (ss->ss_count != HAL_SPECTRAL_PARAM_NOVAL) {
110 val &= ~AR_PHY_SPECTRAL_SCAN_COUNT;
111 val |= SM(ss->ss_count, AR_PHY_SPECTRAL_SCAN_COUNT);
112 }
113
114 if (ss->ss_short_report == AH_TRUE) {
115 val |= AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT;
116 } else {
116 } else if (ss->ss_short_report != HAL_SPECTRAL_PARAM_NOVAL) {
117 val &= ~AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT;
118 }
119 } else {
120 if (ss->ss_count != HAL_SPECTRAL_PARAM_NOVAL) {
121 /*
122 * In Merlin, for continous scan, scan_count = 128.
123 * In case of Kiwi, this value should be 0
124 */
125 if (ss->ss_count == 128)
126 ss->ss_count = 0;
127 val &= ~AR_PHY_SPECTRAL_SCAN_COUNT_KIWI;
128 val |= SM(ss->ss_count, AR_PHY_SPECTRAL_SCAN_COUNT_KIWI);
129 }
130
131 if (ss->ss_short_report == AH_TRUE) {
132 val |= AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI;
117 val &= ~AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT;
118 }
119 } else {
120 if (ss->ss_count != HAL_SPECTRAL_PARAM_NOVAL) {
121 /*
122 * In Merlin, for continous scan, scan_count = 128.
123 * In case of Kiwi, this value should be 0
124 */
125 if (ss->ss_count == 128)
126 ss->ss_count = 0;
127 val &= ~AR_PHY_SPECTRAL_SCAN_COUNT_KIWI;
128 val |= SM(ss->ss_count, AR_PHY_SPECTRAL_SCAN_COUNT_KIWI);
129 }
130
131 if (ss->ss_short_report == AH_TRUE) {
132 val |= AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI;
133 } else {
133 } else if (ss->ss_short_report != HAL_SPECTRAL_PARAM_NOVAL) {
134 val &= ~AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI;
135 }
136
137 //Select the mask to be same as before
138 val |= AR_PHY_SPECTRAL_SCAN_PHYERR_MASK_SELECT_KIWI;
139 }
140 // Enable spectral scan
141 OS_REG_WRITE(ah, AR_PHY_SPECTRAL_SCAN, val | AR_PHY_SPECTRAL_SCAN_ENA);

--- 103 unchanged lines hidden ---
134 val &= ~AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI;
135 }
136
137 //Select the mask to be same as before
138 val |= AR_PHY_SPECTRAL_SCAN_PHYERR_MASK_SELECT_KIWI;
139 }
140 // Enable spectral scan
141 OS_REG_WRITE(ah, AR_PHY_SPECTRAL_SCAN, val | AR_PHY_SPECTRAL_SCAN_ENA);

--- 103 unchanged lines hidden ---