diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h')
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h new file mode 100644 index 0000000..4a89bd1 --- /dev/null +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h @@ -0,0 +1,66 @@ +//--------------------------------------------------------------------------- +// FT1000 driver for Flarion Flash OFDM NIC Device +// +// Copyright (C) 2002 Flarion Technologies, All rights reserved. +// +// This program is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the Free +// Software Foundation; either version 2 of the License, or (at your option) any +// later version. 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., 59 Temple Place - +// Suite 330, Boston, MA 02111-1307, USA. +//--------------------------------------------------------------------------- +// +// File: ft1000_dev.h +// +// Description: Register definitions and bit masks for the FT1000 NIC +// +// History: +// 2/5/02 Ivan Bohannon Written. +// 8/29/02 Whc Ported to Linux. +// +//--------------------------------------------------------------------------- +#ifndef _FT1000_DEVH_ +#define _FT1000_DEVH_ + +//--------------------------------------------------------------------------- +// +// Function: ft1000_read_reg +// Descripton: This function will read the value of a given ASIC register. +// Input: +// dev - device structure +// offset - ASIC register offset +// Output: +// data - ASIC register value +// +//--------------------------------------------------------------------------- +static inline u16 ft1000_read_reg (struct net_device *dev, u16 offset) { + u16 data = 0; + + data = inw(dev->base_addr + offset); + + return (data); +} + +//--------------------------------------------------------------------------- +// +// Function: ft1000_write_reg +// Descripton: This function will set the value for a given ASIC register. +// Input: +// dev - device structure +// offset - ASIC register offset +// value - value to write +// Output: +// None. +// +//--------------------------------------------------------------------------- +static inline void ft1000_write_reg (struct net_device *dev, u16 offset, u16 value) { + outw (value, dev->base_addr + offset); +} + +#endif // _FT1000_DEVH_ + |