d593411084
Call iwl_probe with a ready iwl_bus struct. This means that the bus layer assigns the irq, dev and iwl_bus_ops pointers to iwl_bus before giving it to iwl_probe. The device specific struct is allocated together with the common iwl_bus struct by the bus specific layer. The pointer to the aggregate struct is passed to the upper layer that holds a pointer to iwl_bus instead of an embedded iw_bus. The private data given to the PCI subsystem is now iwl_bus and not iwl_priv. Provide bus_* inliners on the way in order to simplify the syntax. Rename iwl-pci.h -> iwl-bus.h since it is bus agnostic and represent the external of the bus layer. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
94 lines
3.1 KiB
C
94 lines
3.1 KiB
C
/******************************************************************************
|
|
*
|
|
* Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
|
|
*
|
|
* Portions of this file are derived from the ipw3945 project.
|
|
*
|
|
* 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.
|
|
*
|
|
* Contact Information:
|
|
* Intel Linux Wireless <ilw@linux.intel.com>
|
|
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
|
*
|
|
*****************************************************************************/
|
|
|
|
#ifndef __iwl_io_h__
|
|
#define __iwl_io_h__
|
|
|
|
#include <linux/io.h>
|
|
|
|
#include "iwl-dev.h"
|
|
#include "iwl-debug.h"
|
|
#include "iwl-devtrace.h"
|
|
#include "iwl-bus.h"
|
|
|
|
static inline void iwl_write8(struct iwl_priv *priv, u32 ofs, u8 val)
|
|
{
|
|
trace_iwlwifi_dev_iowrite8(priv, ofs, val);
|
|
bus_write8(priv->bus, ofs, val);
|
|
}
|
|
|
|
static inline void iwl_write32(struct iwl_priv *priv, u32 ofs, u32 val)
|
|
{
|
|
trace_iwlwifi_dev_iowrite32(priv, ofs, val);
|
|
bus_write32(priv->bus, ofs, val);
|
|
}
|
|
|
|
static inline u32 iwl_read32(struct iwl_priv *priv, u32 ofs)
|
|
{
|
|
u32 val = bus_read32(priv->bus, ofs);
|
|
trace_iwlwifi_dev_ioread32(priv, ofs, val);
|
|
return val;
|
|
}
|
|
|
|
void iwl_set_bit(struct iwl_priv *priv, u32 reg, u32 mask);
|
|
void iwl_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask);
|
|
|
|
int iwl_poll_bit(struct iwl_priv *priv, u32 addr,
|
|
u32 bits, u32 mask, int timeout);
|
|
int iwl_poll_direct_bit(struct iwl_priv *priv, u32 addr, u32 mask,
|
|
int timeout);
|
|
|
|
int iwl_grab_nic_access_silent(struct iwl_priv *priv);
|
|
int iwl_grab_nic_access(struct iwl_priv *priv);
|
|
void iwl_release_nic_access(struct iwl_priv *priv);
|
|
|
|
u32 iwl_read_direct32(struct iwl_priv *priv, u32 reg);
|
|
void iwl_write_direct32(struct iwl_priv *priv, u32 reg, u32 value);
|
|
|
|
|
|
u32 iwl_read_prph(struct iwl_priv *priv, u32 reg);
|
|
void iwl_write_prph(struct iwl_priv *priv, u32 addr, u32 val);
|
|
void iwl_set_bits_prph(struct iwl_priv *priv, u32 reg, u32 mask);
|
|
void iwl_set_bits_mask_prph(struct iwl_priv *priv, u32 reg,
|
|
u32 bits, u32 mask);
|
|
void iwl_clear_bits_prph(struct iwl_priv *priv, u32 reg, u32 mask);
|
|
|
|
void _iwl_read_targ_mem_words(struct iwl_priv *priv, u32 addr,
|
|
void *buf, int words);
|
|
|
|
#define iwl_read_targ_mem_words(priv, addr, buf, bufsize) \
|
|
do { \
|
|
BUILD_BUG_ON((bufsize) % sizeof(u32)); \
|
|
_iwl_read_targ_mem_words(priv, addr, buf, \
|
|
(bufsize) / sizeof(u32));\
|
|
} while (0)
|
|
|
|
u32 iwl_read_targ_mem(struct iwl_priv *priv, u32 addr);
|
|
void iwl_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val);
|
|
#endif
|