mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
iwlagn: iwl-pci doesn't include iwl-dev any more
Move all the iwlXXX_abgn_cfg forward declaration to a separate file so that iwl-pci.c doesn't need to include iwl-agn.h that includes all iwl-dev.h This allows to provide real encapsulation. Dereferencing iwl_priv in the bus layer will now lead to a compilation error. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
f090fba305
commit
332a4bad97
10 changed files with 129 additions and 57 deletions
|
@ -44,6 +44,7 @@
|
||||||
#include "iwl-helpers.h"
|
#include "iwl-helpers.h"
|
||||||
#include "iwl-agn-hw.h"
|
#include "iwl-agn-hw.h"
|
||||||
#include "iwl-shared.h"
|
#include "iwl-shared.h"
|
||||||
|
#include "iwl-pci.h"
|
||||||
|
|
||||||
/* Highest firmware API version supported */
|
/* Highest firmware API version supported */
|
||||||
#define IWL1000_UCODE_API_MAX 6
|
#define IWL1000_UCODE_API_MAX 6
|
||||||
|
|
|
@ -45,6 +45,7 @@
|
||||||
#include "iwl-agn-hw.h"
|
#include "iwl-agn-hw.h"
|
||||||
#include "iwl-6000-hw.h"
|
#include "iwl-6000-hw.h"
|
||||||
#include "iwl-shared.h"
|
#include "iwl-shared.h"
|
||||||
|
#include "iwl-pci.h"
|
||||||
|
|
||||||
/* Highest firmware API version supported */
|
/* Highest firmware API version supported */
|
||||||
#define IWL2030_UCODE_API_MAX 6
|
#define IWL2030_UCODE_API_MAX 6
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
#include "iwl-5000-hw.h"
|
#include "iwl-5000-hw.h"
|
||||||
#include "iwl-trans.h"
|
#include "iwl-trans.h"
|
||||||
#include "iwl-shared.h"
|
#include "iwl-shared.h"
|
||||||
|
#include "iwl-pci.h"
|
||||||
|
|
||||||
/* Highest firmware API version supported */
|
/* Highest firmware API version supported */
|
||||||
#define IWL5000_UCODE_API_MAX 5
|
#define IWL5000_UCODE_API_MAX 5
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
#include "iwl-6000-hw.h"
|
#include "iwl-6000-hw.h"
|
||||||
#include "iwl-trans.h"
|
#include "iwl-trans.h"
|
||||||
#include "iwl-shared.h"
|
#include "iwl-shared.h"
|
||||||
|
#include "iwl-pci.h"
|
||||||
|
|
||||||
/* Highest firmware API version supported */
|
/* Highest firmware API version supported */
|
||||||
#define IWL6000_UCODE_API_MAX 4
|
#define IWL6000_UCODE_API_MAX 4
|
||||||
|
|
|
@ -65,50 +65,6 @@
|
||||||
|
|
||||||
#include "iwl-dev.h"
|
#include "iwl-dev.h"
|
||||||
|
|
||||||
/* configuration for the _agn devices */
|
|
||||||
extern struct iwl_cfg iwl5300_agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl5100_agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl5350_agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl5100_bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl5100_abg_cfg;
|
|
||||||
extern struct iwl_cfg iwl5150_agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl5150_abg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6005_2agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl6005_2abg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6005_2bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6005_2agn_sff_cfg;
|
|
||||||
extern struct iwl_cfg iwl1030_bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl1030_bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6030_2agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl6030_2abg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6030_2bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl6030_2bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6000i_2agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl6000i_2abg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6000i_2bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6000_3agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl6050_2agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl6050_2abg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6150_bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl6150_bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl1000_bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl1000_bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl100_bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl100_bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl130_bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl130_bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl2000_2bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl2000_2bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl2030_2bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl2030_2bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6035_2agn_cfg;
|
|
||||||
extern struct iwl_cfg iwl6035_2abg_cfg;
|
|
||||||
extern struct iwl_cfg iwl6035_2bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl105_bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl105_bgn_cfg;
|
|
||||||
extern struct iwl_cfg iwl135_bg_cfg;
|
|
||||||
extern struct iwl_cfg iwl135_bgn_cfg;
|
|
||||||
|
|
||||||
extern struct ieee80211_ops iwlagn_hw_ops;
|
extern struct ieee80211_ops iwlagn_hw_ops;
|
||||||
|
|
||||||
int iwl_reset_ict(struct iwl_trans *trans);
|
int iwl_reset_ict(struct iwl_trans *trans);
|
||||||
|
|
|
@ -71,11 +71,6 @@
|
||||||
struct iwl_host_cmd;
|
struct iwl_host_cmd;
|
||||||
struct iwl_cmd;
|
struct iwl_cmd;
|
||||||
|
|
||||||
|
|
||||||
#define IWLWIFI_VERSION "in-tree:"
|
|
||||||
#define DRV_COPYRIGHT "Copyright(c) 2003-2011 Intel Corporation"
|
|
||||||
#define DRV_AUTHOR "<ilw@linux.intel.com>"
|
|
||||||
|
|
||||||
#define TIME_UNIT 1024
|
#define TIME_UNIT 1024
|
||||||
|
|
||||||
#define IWL_CMD(x) case x: return #x
|
#define IWL_CMD(x) case x: return #x
|
||||||
|
|
|
@ -51,8 +51,6 @@
|
||||||
#include "iwl-trans.h"
|
#include "iwl-trans.h"
|
||||||
#include "iwl-shared.h"
|
#include "iwl-shared.h"
|
||||||
|
|
||||||
#define DRV_NAME "iwlagn"
|
|
||||||
|
|
||||||
struct iwl_tx_queue;
|
struct iwl_tx_queue;
|
||||||
|
|
||||||
/* CT-KILL constants */
|
/* CT-KILL constants */
|
||||||
|
|
|
@ -64,13 +64,11 @@
|
||||||
#include <linux/pci-aspm.h>
|
#include <linux/pci-aspm.h>
|
||||||
|
|
||||||
#include "iwl-bus.h"
|
#include "iwl-bus.h"
|
||||||
#include "iwl-shared.h"
|
|
||||||
#include "iwl-agn.h"
|
|
||||||
#include "iwl-trans.h"
|
|
||||||
|
|
||||||
/* TODO: iwl_set_bit and friends should be implemented in bus layer
|
|
||||||
* this would allow us not to include iwl-io.h here */
|
|
||||||
#include "iwl-io.h"
|
#include "iwl-io.h"
|
||||||
|
#include "iwl-shared.h"
|
||||||
|
#include "iwl-trans.h"
|
||||||
|
#include "iwl-csr.h"
|
||||||
|
#include "iwl-pci.h"
|
||||||
|
|
||||||
/* PCI registers */
|
/* PCI registers */
|
||||||
#define PCI_CFG_RETRY_TIMEOUT 0x041
|
#define PCI_CFG_RETRY_TIMEOUT 0x041
|
||||||
|
@ -95,6 +93,7 @@ static u16 iwl_pciexp_link_ctrl(struct iwl_bus *bus)
|
||||||
{
|
{
|
||||||
int pos;
|
int pos;
|
||||||
u16 pci_lnk_ctl;
|
u16 pci_lnk_ctl;
|
||||||
|
|
||||||
struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);
|
struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);
|
||||||
|
|
||||||
pos = pci_pcie_cap(pci_dev);
|
pos = pci_pcie_cap(pci_dev);
|
||||||
|
|
115
drivers/net/wireless/iwlwifi/iwl-pci.h
Normal file
115
drivers/net/wireless/iwlwifi/iwl-pci.h
Normal file
|
@ -0,0 +1,115 @@
|
||||||
|
/******************************************************************************
|
||||||
|
*
|
||||||
|
* 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) 2007 - 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 __iwl_pci_h__
|
||||||
|
#define __iwl_pci_h__
|
||||||
|
|
||||||
|
|
||||||
|
/* This file includes the declaration that are internal to the PCI
|
||||||
|
* implementation of the bus layer
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* configuration for the _agn devices */
|
||||||
|
extern struct iwl_cfg iwl5300_agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl5100_agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl5350_agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl5100_bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl5100_abg_cfg;
|
||||||
|
extern struct iwl_cfg iwl5150_agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl5150_abg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6005_2agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl6005_2abg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6005_2bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6005_2agn_sff_cfg;
|
||||||
|
extern struct iwl_cfg iwl1030_bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl1030_bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6030_2agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl6030_2abg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6030_2bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl6030_2bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6000i_2agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl6000i_2abg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6000i_2bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6000_3agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl6050_2agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl6050_2abg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6150_bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl6150_bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl1000_bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl1000_bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl100_bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl100_bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl130_bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl130_bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl2000_2bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl2000_2bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl2030_2bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl2030_2bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6035_2agn_cfg;
|
||||||
|
extern struct iwl_cfg iwl6035_2abg_cfg;
|
||||||
|
extern struct iwl_cfg iwl6035_2bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl105_bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl105_bgn_cfg;
|
||||||
|
extern struct iwl_cfg iwl135_bg_cfg;
|
||||||
|
extern struct iwl_cfg iwl135_bgn_cfg;
|
||||||
|
|
||||||
|
#endif /* __iwl_pci_h__ */
|
|
@ -77,6 +77,11 @@ struct iwl_priv;
|
||||||
struct iwl_sensitivity_ranges;
|
struct iwl_sensitivity_ranges;
|
||||||
struct iwl_trans_ops;
|
struct iwl_trans_ops;
|
||||||
|
|
||||||
|
#define DRV_NAME "iwlagn"
|
||||||
|
#define IWLWIFI_VERSION "in-tree:"
|
||||||
|
#define DRV_COPYRIGHT "Copyright(c) 2003-2011 Intel Corporation"
|
||||||
|
#define DRV_AUTHOR "<ilw@linux.intel.com>"
|
||||||
|
|
||||||
extern struct iwl_mod_params iwlagn_mod_params;
|
extern struct iwl_mod_params iwlagn_mod_params;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue