diff options
author | Bob Copeland <me@bobcopeland.com> | 2009-08-07 06:33:26 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:13:37 -0400 |
commit | 8e639c0673a9b676bb7c6bd4e50f9003bdda423e (patch) | |
tree | fb4e87e44347baa1e0b46c9b84c219501a14b11c /drivers/net/wireless/wl12xx/wl1251.h | |
parent | 0d77e141331b25adf190ce30d69fe5744a69c5bd (diff) |
wl1251: move module probe methods into spi.c
This change moves all of the spi specific code from main.c into
spi.c. The module initialization code also moves, but common
code for initializing mac80211 etc. stays in main.c, as this will
eventually form a common library module also used by wl1251_sdio.
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251.h b/drivers/net/wireless/wl12xx/wl1251.h index 284bb508c87b..df4c06d41678 100644 --- a/drivers/net/wireless/wl12xx/wl1251.h +++ b/drivers/net/wireless/wl12xx/wl1251.h | |||
@@ -292,7 +292,7 @@ struct wl1251 { | |||
292 | bool mac80211_registered; | 292 | bool mac80211_registered; |
293 | 293 | ||
294 | struct spi_device *spi; | 294 | struct spi_device *spi; |
295 | struct wl1251_if_operations *if_ops; | 295 | const struct wl1251_if_operations *if_ops; |
296 | 296 | ||
297 | void (*set_power)(bool enable); | 297 | void (*set_power)(bool enable); |
298 | int irq; | 298 | int irq; |
@@ -404,6 +404,11 @@ struct wl1251 { | |||
404 | int wl1251_plt_start(struct wl1251 *wl); | 404 | int wl1251_plt_start(struct wl1251 *wl); |
405 | int wl1251_plt_stop(struct wl1251 *wl); | 405 | int wl1251_plt_stop(struct wl1251 *wl); |
406 | 406 | ||
407 | irqreturn_t wl1251_irq(int irq, void *cookie); | ||
408 | struct ieee80211_hw *wl1251_alloc_hw(void); | ||
409 | int wl1251_free_hw(struct wl1251 *wl); | ||
410 | int wl1251_init_ieee80211(struct wl1251 *wl); | ||
411 | |||
407 | #define DEFAULT_HW_GEN_MODULATION_TYPE CCK_LONG /* Long Preamble */ | 412 | #define DEFAULT_HW_GEN_MODULATION_TYPE CCK_LONG /* Long Preamble */ |
408 | #define DEFAULT_HW_GEN_TX_RATE RATE_2MBPS | 413 | #define DEFAULT_HW_GEN_TX_RATE RATE_2MBPS |
409 | #define JOIN_TIMEOUT 5000 /* 5000 milliseconds to join */ | 414 | #define JOIN_TIMEOUT 5000 /* 5000 milliseconds to join */ |