diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 10:14:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 16:51:49 -0500 |
commit | 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (patch) | |
tree | 4caedc94ac170b32d18336833c9387a10b532078 /drivers/staging/winbond/wbhal_f.h | |
parent | ac418b8faaaad7a17474c8fba5c2e5917c91cf31 (diff) |
Staging: w35und: merge struct wb35_adapter to struct wbsoft_priv
This patch merges struct wb35_adapter to struct wbsoft_priv. Now we can finally
start passing a pointer to struct ieee80211_hw around where necessary.
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/wbhal_f.h')
-rw-r--r-- | drivers/staging/winbond/wbhal_f.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h index 4cb4da05540..e7a1d611bde 100644 --- a/drivers/staging/winbond/wbhal_f.h +++ b/drivers/staging/winbond/wbhal_f.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #include "wb35tx_f.h" | 5 | #include "wb35tx_f.h" |
6 | #include "wb35rx_f.h" | 6 | #include "wb35rx_f.h" |
7 | 7 | ||
8 | #include "adapter.h" | 8 | #include "core.h" |
9 | 9 | ||
10 | //==================================================================================== | 10 | //==================================================================================== |
11 | // Function declaration | 11 | // Function declaration |
@@ -21,7 +21,7 @@ void hal_clear_all_key( phw_data_t pHwData ); | |||
21 | void hal_get_ethernet_address( phw_data_t pHwData, u8 *current_address ); | 21 | void hal_get_ethernet_address( phw_data_t pHwData, u8 *current_address ); |
22 | void hal_set_ethernet_address( phw_data_t pHwData, u8 *current_address ); | 22 | void hal_set_ethernet_address( phw_data_t pHwData, u8 *current_address ); |
23 | void hal_get_permanent_address( phw_data_t pHwData, u8 *pethernet_address ); | 23 | void hal_get_permanent_address( phw_data_t pHwData, u8 *pethernet_address ); |
24 | unsigned char hal_init_hardware( phw_data_t pHwData, struct wb35_adapter * adapter ); | 24 | unsigned char hal_init_hardware( phw_data_t pHwData, struct wbsoft_priv * adapter ); |
25 | void hal_set_power_save_mode( phw_data_t pHwData, unsigned char power_save, unsigned char wakeup, unsigned char dtim ); | 25 | void hal_set_power_save_mode( phw_data_t pHwData, unsigned char power_save, unsigned char wakeup, unsigned char dtim ); |
26 | void hal_get_power_save_mode( phw_data_t pHwData, u8 *pin_pwr_save ); | 26 | void hal_get_power_save_mode( phw_data_t pHwData, u8 *pin_pwr_save ); |
27 | void hal_set_slot_time( phw_data_t pHwData, u8 type ); | 27 | void hal_set_slot_time( phw_data_t pHwData, u8 type ); |
@@ -61,7 +61,7 @@ void hal_set_cwmax( phw_data_t pHwData, u16 cwin_max ); | |||
61 | void hal_set_rsn_wpa( phw_data_t pHwData, u32 * RSN_IE_Bitmap , u32 * RSN_OUI_type , unsigned char bDesiredAuthMode); | 61 | void hal_set_rsn_wpa( phw_data_t pHwData, u32 * RSN_IE_Bitmap , u32 * RSN_OUI_type , unsigned char bDesiredAuthMode); |
62 | //s32 hal_get_rssi( phw_data_t pHwData, u32 HalRssi ); | 62 | //s32 hal_get_rssi( phw_data_t pHwData, u32 HalRssi ); |
63 | s32 hal_get_rssi( phw_data_t pHwData, u32 *HalRssiArry, u8 Count ); | 63 | s32 hal_get_rssi( phw_data_t pHwData, u32 *HalRssiArry, u8 Count ); |
64 | s32 hal_get_rssi_bss(struct wb35_adapter *adapter, u16 idx, u8 Count); | 64 | s32 hal_get_rssi_bss(struct wbsoft_priv *adapter, u16 idx, u8 Count); |
65 | void hal_set_connect_info( phw_data_t pHwData, unsigned char boConnect ); | 65 | void hal_set_connect_info( phw_data_t pHwData, unsigned char boConnect ); |
66 | u8 hal_get_est_sq3( phw_data_t pHwData, u8 Count ); | 66 | u8 hal_get_est_sq3( phw_data_t pHwData, u8 Count ); |
67 | void hal_set_rf_power( phw_data_t pHwData, u8 PowerIndex ); // 20060621 Modify | 67 | void hal_set_rf_power( phw_data_t pHwData, u8 PowerIndex ); // 20060621 Modify |
@@ -82,13 +82,13 @@ u8 hal_get_hw_radio_off ( phw_data_t pHwData ); | |||
82 | #define hal_scan_interval( _A ) (_A->Scan_Interval) | 82 | #define hal_scan_interval( _A ) (_A->Scan_Interval) |
83 | void hal_scan_status_indicate( phw_data_t pHwData, u8 status); // 0: complete, 1: in progress | 83 | void hal_scan_status_indicate( phw_data_t pHwData, u8 status); // 0: complete, 1: in progress |
84 | void hal_system_power_change( phw_data_t pHwData, u32 PowerState ); // 20051230 -=D0 1=D1 .. | 84 | void hal_system_power_change( phw_data_t pHwData, u32 PowerState ); // 20051230 -=D0 1=D1 .. |
85 | void hal_surprise_remove(struct wb35_adapter *adapter); | 85 | void hal_surprise_remove(struct wbsoft_priv *adapter); |
86 | 86 | ||
87 | #define PHY_DEBUG( msg, args... ) | 87 | #define PHY_DEBUG( msg, args... ) |
88 | 88 | ||
89 | 89 | ||
90 | 90 | ||
91 | void hal_rate_change(struct wb35_adapter *adapter); // Notify the HAL rate is changing 20060613.1 | 91 | void hal_rate_change(struct wbsoft_priv *adapter); // Notify the HAL rate is changing 20060613.1 |
92 | unsigned char hal_get_dxx_reg( phw_data_t pHwData, u16 number, u32 * pValue ); | 92 | unsigned char hal_get_dxx_reg( phw_data_t pHwData, u16 number, u32 * pValue ); |
93 | unsigned char hal_set_dxx_reg( phw_data_t pHwData, u16 number, u32 value ); | 93 | unsigned char hal_set_dxx_reg( phw_data_t pHwData, u16 number, u32 value ); |
94 | #define hal_get_time_count( _P ) (_P->time_count/10) // return 100ms count | 94 | #define hal_get_time_count( _P ) (_P->time_count/10) // return 100ms count |