diff options
| author | David S. Miller | 2009-06-12 02:11:33 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-06-12 02:11:33 +0200 |
| commit | 3ee40c376ad3252d13946141588db7e2f435f958 (patch) | |
| tree | 65bd16c024edab1ff74ad165779443edfaa26467 /drivers/net/wimax/i2400m/i2400m-sdio.h | |
| parent | mISDN: cleanup mISDNhw.h (diff) | |
| parent | wimax: fix gcc warnings in sh4 when calling BUG() (diff) | |
| download | kernel-qcow2-linux-3ee40c376ad3252d13946141588db7e2f435f958.tar.gz kernel-qcow2-linux-3ee40c376ad3252d13946141588db7e2f435f958.tar.xz kernel-qcow2-linux-3ee40c376ad3252d13946141588db7e2f435f958.zip | |
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'drivers/net/wimax/i2400m/i2400m-sdio.h')
| -rw-r--r-- | drivers/net/wimax/i2400m/i2400m-sdio.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wimax/i2400m/i2400m-sdio.h b/drivers/net/wimax/i2400m/i2400m-sdio.h index 08c2fb739234..9c4e3189f7b5 100644 --- a/drivers/net/wimax/i2400m/i2400m-sdio.h +++ b/drivers/net/wimax/i2400m/i2400m-sdio.h @@ -78,6 +78,8 @@ enum { /* The number of ticks to wait for the device to signal that * it is ready */ I2400MS_INIT_SLEEP_INTERVAL = 10, + /* How long to wait for the device to settle after reset */ + I2400MS_SETTLE_TIME = 40, }; @@ -105,6 +107,10 @@ struct i2400ms { char tx_wq_name[32]; struct dentry *debugfs_dentry; + + wait_queue_head_t bm_wfa_wq; + int bm_wait_result; + size_t bm_ack_size; }; @@ -129,4 +135,7 @@ extern ssize_t i2400ms_bus_bm_cmd_send(struct i2400m *, extern ssize_t i2400ms_bus_bm_wait_for_ack(struct i2400m *, struct i2400m_bootrom_header *, size_t); +extern void i2400ms_bus_bm_release(struct i2400m *); +extern int i2400ms_bus_bm_setup(struct i2400m *); + #endif /* #ifndef __I2400M_SDIO_H__ */ |