summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hermes.h
diff options
context:
space:
mode:
authorDavid Kilroy2008-08-22 00:27:50 +0200
committerJohn W. Linville2008-08-23 01:28:04 +0200
commitfc5a62d8b7052ea588e4f7750cd78b0c4c47015a (patch)
treecf25f5749da81c0a0a13986315486fdaf42e1fe7 /drivers/net/wireless/hermes.h
parentorinoco: Move EXPORT_SYMBOL declarations next to exported function (diff)
downloadkernel-qcow2-linux-fc5a62d8b7052ea588e4f7750cd78b0c4c47015a.tar.gz
kernel-qcow2-linux-fc5a62d8b7052ea588e4f7750cd78b0c4c47015a.tar.xz
kernel-qcow2-linux-fc5a62d8b7052ea588e4f7750cd78b0c4c47015a.zip
orinoco: Add function to execute Hermes initialisation commands synchronously
The current synchronous execution function doesn't work for certain Hermes commands which clear the MAGIC number from SWSUPPORT0. These commands seem to be related to initialisation or programming, for example HERMES_CMD_INIT. Replicate hermes_docmd_wait for commands which clear the MAGIC number from SWSUPPORT0. This version accepts two extra arguments which are passed straight to the firmware. Functionality copied out of hermes_init. Signed-off-by: David Kilroy <kilroyd@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/hermes.h')
-rw-r--r--drivers/net/wireless/hermes.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/hermes.h b/drivers/net/wireless/hermes.h
index 8e3f0e3edb58..287f5363fda2 100644
--- a/drivers/net/wireless/hermes.h
+++ b/drivers/net/wireless/hermes.h
@@ -353,6 +353,9 @@ void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing);
int hermes_init(hermes_t *hw);
int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
struct hermes_response *resp);
+int hermes_doicmd_wait(hermes_t *hw, u16 cmd,
+ u16 parm0, u16 parm1, u16 parm2,
+ struct hermes_response *resp);
int hermes_allocate(hermes_t *hw, u16 size, u16 *fid);
int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,