Commit af038f40 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka

iwlegacy: move iwl-4965-{,hw,debugfs,calib}.h to 4965.h

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 8f29b456
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#include "iwl-dev.h" #include "iwl-dev.h"
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-4965-calib.h" #include "4965.h"
/***************************************************************************** /*****************************************************************************
* INIT calibrations framework * INIT calibrations framework
......
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
* Intel Linux Wireless <ilw@linux.intel.com> * Intel Linux Wireless <ilw@linux.intel.com>
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*****************************************************************************/ *****************************************************************************/
#include "iwl-4965.h" #include "iwl-dev.h"
#include "iwl-4965-debugfs.h" #include "iwl-core.h"
#include "4965.h"
static const char *fmt_value = " %-30s %10u\n"; static const char *fmt_value = " %-30s %10u\n";
static const char *fmt_table = " %-30s %10u %10u %10u %10u\n"; static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
......
...@@ -56,8 +56,7 @@ ...@@ -56,8 +56,7 @@
#include "iwl-io.h" #include "iwl-io.h"
#include "iwl-helpers.h" #include "iwl-helpers.h"
#include "iwl-sta.h" #include "iwl-sta.h"
#include "iwl-4965-calib.h" #include "4965.h"
#include "iwl-4965.h"
/****************************************************************************** /******************************************************************************
...@@ -820,6 +819,11 @@ static int il4965_get_channels_for_scan(struct il_priv *il, ...@@ -820,6 +819,11 @@ static int il4965_get_channels_for_scan(struct il_priv *il,
return added; return added;
} }
static inline u32 il4965_ant_idx_to_flags(u8 ant_idx)
{
return BIT(ant_idx) << RATE_MCS_ANT_POS;
}
int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
{ {
struct il_host_cmd cmd = { struct il_host_cmd cmd = {
...@@ -1434,7 +1438,7 @@ void il4965_reply_stats(struct il_priv *il, ...@@ -1434,7 +1438,7 @@ void il4965_reply_stats(struct il_priv *il,
* mapping. This is implemented here. * mapping. This is implemented here.
* *
* Due to the way hw queues are set up (by the hw specific modules like * Due to the way hw queues are set up (by the hw specific modules like
* iwl-4965.c), the AC->hw queue mapping is the identity * 4965.c), the AC->hw queue mapping is the identity
* mapping. * mapping.
*/ */
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "iwl-dev.h" #include "iwl-dev.h"
#include "iwl-sta.h" #include "iwl-sta.h"
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-4965.h" #include "4965.h"
#define IL4965_RS_NAME "iwl-4965-rs" #define IL4965_RS_NAME "iwl-4965-rs"
......
...@@ -42,10 +42,8 @@ ...@@ -42,10 +42,8 @@
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-io.h" #include "iwl-io.h"
#include "iwl-helpers.h" #include "iwl-helpers.h"
#include "iwl-4965-calib.h"
#include "iwl-sta.h" #include "iwl-sta.h"
#include "iwl-4965.h" #include "4965.h"
#include "iwl-4965-debugfs.h"
#define IL_AC_UNSET -1 #define IL_AC_UNSET -1
...@@ -1829,6 +1827,28 @@ static inline u32 il4965_get_scd_ssn(struct il4965_tx_resp *tx_resp) ...@@ -1829,6 +1827,28 @@ static inline u32 il4965_get_scd_ssn(struct il4965_tx_resp *tx_resp)
return le32_to_cpup(&tx_resp->u.status + tx_resp->frame_count) & MAX_SN; return le32_to_cpup(&tx_resp->u.status + tx_resp->frame_count) & MAX_SN;
} }
static inline u32 il4965_tx_status_to_mac80211(u32 status)
{
status &= TX_STATUS_MSK;
switch (status) {
case TX_STATUS_SUCCESS:
case TX_STATUS_DIRECT_DONE:
return IEEE80211_TX_STAT_ACK;
case TX_STATUS_FAIL_DEST_PS:
return IEEE80211_TX_STAT_TX_FILTERED;
default:
return 0;
}
}
static inline bool il4965_is_tx_success(u32 status)
{
status &= TX_STATUS_MSK;
return (status == TX_STATUS_SUCCESS ||
status == TX_STATUS_DIRECT_DONE);
}
/** /**
* il4965_tx_status_reply_tx - Handle Tx response for frames in aggregation queue * il4965_tx_status_reply_tx - Handle Tx response for frames in aggregation queue
*/ */
......
/******************************************************************************
*
* This file is provided under a dual BSD/GPLv2 license. When using or
* redistributing this file, you may do so under either license.
*
* GPL LICENSE SUMMARY
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
* USA
*
* The full GNU General Public License is included in this distribution
* in the file called LICENSE.GPL.
*
* Contact Information:
* Intel Linux Wireless <ilw@linux.intel.com>
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*
* BSD LICENSE
*
* Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*****************************************************************************/
#ifndef __il_4965_calib_h__
#define __il_4965_calib_h__
#include "iwl-dev.h"
#include "iwl-core.h"
#include "iwl-commands.h"
void il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp);
void il4965_sensitivity_calibration(struct il_priv *il, void *resp);
void il4965_init_sensitivity(struct il_priv *il);
void il4965_reset_run_time_calib(struct il_priv *il);
void il4965_calib_free_results(struct il_priv *il);
#endif /* __il_4965_calib_h__ */
/******************************************************************************
*
* GPL LICENSE SUMMARY
*
* Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
* USA
*
* The full GNU General Public License is included in this distribution
* in the file called LICENSE.GPL.
*
* Contact Information:
* Intel Linux Wireless <ilw@linux.intel.com>
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*****************************************************************************/
#include "iwl-dev.h"
#include "iwl-core.h"
#include "iwl-debug.h"
#ifdef CONFIG_IWLEGACY_DEBUGFS
ssize_t il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos);
ssize_t il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos);
ssize_t il4965_ucode_general_stats_read(struct file *file,
char __user *user_buf, size_t count, loff_t *ppos);
#else
static ssize_t
il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
return 0;
}
static ssize_t
il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
return 0;
}
static ssize_t
il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
return 0;
}
#endif
This diff is collapsed.
...@@ -347,7 +347,7 @@ struct il3945_power_per_rate { ...@@ -347,7 +347,7 @@ struct il3945_power_per_rate {
* For MIMO rates, one value may be different from the other, * For MIMO rates, one value may be different from the other,
* in order to balance the Tx output between the two transmitters. * in order to balance the Tx output between the two transmitters.
* *
* See more details in doc for TXPOWER in iwl-4965-hw.h. * See more details in doc for TXPOWER in 4965.h.
*/ */
union il4965_tx_power_dual_stream { union il4965_tx_power_dual_stream {
struct { struct {
...@@ -1756,7 +1756,7 @@ struct il_compressed_ba_resp { ...@@ -1756,7 +1756,7 @@ struct il_compressed_ba_resp {
/* /*
* REPLY_TX_PWR_TBL_CMD = 0x97 (command, has simple generic response) * REPLY_TX_PWR_TBL_CMD = 0x97 (command, has simple generic response)
* *
* See details under "TXPOWER" in iwl-4965-hw.h. * See details under "TXPOWER" in 4965.h.
*/ */
struct il3945_txpowertable_cmd { struct il3945_txpowertable_cmd {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/* /*
* Please use this file (iwl-dev.h) for driver implementation definitions. * Please use this file (iwl-dev.h) for driver implementation definitions.
* Please use iwl-commands.h for uCode API definitions. * Please use iwl-commands.h for uCode API definitions.
* Please use iwl-4965-hw.h for hardware-related definitions. * Please use 4965.h for hardware-related definitions.
*/ */
#ifndef __il_dev_h__ #ifndef __il_dev_h__
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "iwl-prph.h" #include "iwl-prph.h"
#include "iwl-fh.h" #include "iwl-fh.h"
#include "iwl-debug.h" #include "iwl-debug.h"
#include "iwl-4965-hw.h" #include "4965.h"
#include "iwl-3945-hw.h" #include "iwl-3945-hw.h"
#include "iwl-led.h" #include "iwl-led.h"
#include "iwl-power.h" #include "iwl-power.h"
......
...@@ -154,7 +154,7 @@ extern const u8 il_eeprom_band_1[14]; ...@@ -154,7 +154,7 @@ extern const u8 il_eeprom_band_1[14];
* 1) Temperature (degrees Celsius) of device when measurement was made. * 1) Temperature (degrees Celsius) of device when measurement was made.
* *
* 2) Gain table idx used to achieve the target measurement power. * 2) Gain table idx used to achieve the target measurement power.
* This refers to the "well-known" gain tables (see iwl-4965-hw.h). * This refers to the "well-known" gain tables (see 4965.h).
* *
* 3) Actual measured output power, in half-dBm ("34" = 17 dBm). * 3) Actual measured output power, in half-dBm ("34" = 17 dBm).
* *
......
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
* but one DMA channel may take input from several queues. * but one DMA channel may take input from several queues.
* *
* Tx DMA FIFOs have dedicated purposes. For 4965, they are used as follows * Tx DMA FIFOs have dedicated purposes. For 4965, they are used as follows
* (cf. default_queue_to_tx_fifo in iwl-4965.c): * (cf. default_queue_to_tx_fifo in 4965.c):
* *
* 0 -- EDCA BK (background) frames, lowest priority * 0 -- EDCA BK (background) frames, lowest priority
* 1 -- EDCA BE (best effort) frames, normal priority * 1 -- EDCA BE (best effort) frames, normal priority
......
...@@ -232,7 +232,7 @@ EXPORT_SYMBOL(il_cmd_queue_free); ...@@ -232,7 +232,7 @@ EXPORT_SYMBOL(il_cmd_queue_free);
* reclaiming packets (on 'tx done IRQ), if free space become > high mark, * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
* Tx queue resumed. * Tx queue resumed.
* *
* See more detailed info in iwl-4965-hw.h. * See more detailed info in 4965.h.
***************************************************/ ***************************************************/
int il_queue_space(const struct il_queue *q) int il_queue_space(const struct il_queue *q)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment