diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 16:14:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:49 -0800 |
| commit | 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (patch) | |
| tree | 4caedc94ac170b32d18336833c9387a10b532078 /drivers/staging/winbond/wbhal_f.h | |
| parent | ac418b8faaaad7a17474c8fba5c2e5917c91cf31 (diff) | |
| download | op-kernel-dev-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.zip op-kernel-dev-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.tar.gz | |
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 4cb4da0..e7a1d61 100644 --- a/drivers/staging/winbond/wbhal_f.h +++ b/drivers/staging/winbond/wbhal_f.h @@ -5,7 +5,7 @@ #include "wb35tx_f.h" #include "wb35rx_f.h" -#include "adapter.h" +#include "core.h" //==================================================================================== // Function declaration @@ -21,7 +21,7 @@ void hal_clear_all_key( phw_data_t pHwData ); void hal_get_ethernet_address( phw_data_t pHwData, u8 *current_address ); void hal_set_ethernet_address( phw_data_t pHwData, u8 *current_address ); void hal_get_permanent_address( phw_data_t pHwData, u8 *pethernet_address ); -unsigned char hal_init_hardware( phw_data_t pHwData, struct wb35_adapter * adapter ); +unsigned char hal_init_hardware( phw_data_t pHwData, struct wbsoft_priv * adapter ); void hal_set_power_save_mode( phw_data_t pHwData, unsigned char power_save, unsigned char wakeup, unsigned char dtim ); void hal_get_power_save_mode( phw_data_t pHwData, u8 *pin_pwr_save ); 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 ); void hal_set_rsn_wpa( phw_data_t pHwData, u32 * RSN_IE_Bitmap , u32 * RSN_OUI_type , unsigned char bDesiredAuthMode); //s32 hal_get_rssi( phw_data_t pHwData, u32 HalRssi ); s32 hal_get_rssi( phw_data_t pHwData, u32 *HalRssiArry, u8 Count ); -s32 hal_get_rssi_bss(struct wb35_adapter *adapter, u16 idx, u8 Count); +s32 hal_get_rssi_bss(struct wbsoft_priv *adapter, u16 idx, u8 Count); void hal_set_connect_info( phw_data_t pHwData, unsigned char boConnect ); u8 hal_get_est_sq3( phw_data_t pHwData, u8 Count ); 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 ); #define hal_scan_interval( _A ) (_A->Scan_Interval) void hal_scan_status_indicate( phw_data_t pHwData, u8 status); // 0: complete, 1: in progress void hal_system_power_change( phw_data_t pHwData, u32 PowerState ); // 20051230 -=D0 1=D1 .. -void hal_surprise_remove(struct wb35_adapter *adapter); +void hal_surprise_remove(struct wbsoft_priv *adapter); #define PHY_DEBUG( msg, args... ) -void hal_rate_change(struct wb35_adapter *adapter); // Notify the HAL rate is changing 20060613.1 +void hal_rate_change(struct wbsoft_priv *adapter); // Notify the HAL rate is changing 20060613.1 unsigned char hal_get_dxx_reg( phw_data_t pHwData, u16 number, u32 * pValue ); unsigned char hal_set_dxx_reg( phw_data_t pHwData, u16 number, u32 value ); #define hal_get_time_count( _P ) (_P->time_count/10) // return 100ms count |
