w35und: we don't need windows code in linux driver
One more patch... but this one is untested (have to get some sleep).
drivers/net/wireless/winbond/winbondport/wbhal.c +15 -18
@@ -1,10 +1,11 @@#include "os_common.h" -//----------------------------------------------------------------------------------- +void hal_start_tx0 (phw_data_t pHwData ) { -if ( !pHwData->SurpriseRemove )Wb35Tx_start ( pHwData ); +if (!pHwData->SurpriseRemove) +Wb35Tx_start ( pHwData ); }//-----------------------------------------------------------------------------------
@@ -18,15 +19,14 @@ void hal_remove_mapping_key( phw_data_tWBDEBUG (("hal_remove_mapping_key\n" ));#endif -for ( i=MAPPING_KEY_START_INDEX ; i<MAX_KEY_TABLE ; i++ ) - { +for (i=MAPPING_KEY_START_INDEX ; i<MAX_KEY_TABLE ; i++) {if (OS_MEMORY_COMPARE ( pmac_addr, pHwData->Key_slot[i],MAC_ADDR_LENGTH ) )break ; }if ( i !=MAX_KEY_TABLE )//Find the same index {// Clear the mac address -OS_MEMORY_CLEAR ( pHwData->Key_slot[i],MAC_ADDR_LENGTH ); +memset (pHwData->Key_slot[i],0 ,MAC_ADDR_LENGTH );//Writing into register to clear the valid bit Wb35Reg_Write ( pHwData,0x0820 ,0x0 );//Value
@@ -771,12 +771,13 @@ void hal_set_ssid( phw_data_t pHwData, pWb35Reg->M4C_MacStatus |= tmp;Wb35Reg_Write ( pHwData,0x084c , pWb35Reg->M4C_MacStatus ); } -//--------------------------------------------------------------------------------------------------- +void hal_set_current_channel_ex (phw_data_t pHwData,ChanInfo channel ) {PWB35REG pWb35Reg = &pHwData->Wb35Reg; -if ( pHwData->SurpriseRemove )return ; +if ( pHwData->SurpriseRemove ) +return ;RFSynthesizer_SwitchingChannel ( pHwData, channel );// Switch channel pHwData->Channel = channel.ChanNo;
@@ -786,9 +787,8 @@ void hal_set_current_channel_ex( phw_da#endif pWb35Reg->M28_MacControl &= ~0xff ;// Clean channel information field pWb35Reg->M28_MacControl |= channel.ChanNo; -//Wb35Reg_Write( pHwData, 0x0828, pWb35Reg->M28_MacControl );// Writing Channel information Wb35Reg_WriteWithCallbackValue ( pHwData,0x0828 , pWb35Reg->M28_MacControl, - (PCHAR )&channel,sizeof (ChanInfo)); + (PCHAR )&channel,sizeof (ChanInfo)); }//--------------------------------------------------------------------------------------------------- void hal_set_current_channel (phw_data_t pHwData,ChanInfo channel )
@@ -816,8 +816,8 @@ void hal_set_accept_broadcast( phw_data pWb35Reg->M00_MacControl &= ~0x02000000 ;//The HW value -if ( enable ) pWb35Reg->M00_MacControl |=0x02000000 ;//The HW value - +if (enable) + pWb35Reg->M00_MacControl |=0x02000000 ;//The HW value Wb35Reg_Write ( pHwData,0x0800 , pWb35Reg->M00_MacControl ); }
@@ -827,14 +827,11 @@ void hal_set_accept_promiscuous( phw_dat {PWB35REG pWb35Reg = &pHwData->Wb35Reg; -if ( pHwData->SurpriseRemove )return ; -if (enable) - { +if (pHwData->SurpriseRemove)return ; +if (enable) { pWb35Reg->M00_MacControl |=0x00400000 ;Wb35Reg_Write ( pHwData,0x0800 , pWb35Reg->M00_MacControl ); - } -else - { + }else { pWb35Reg->M00_MacControl&=~0x00400000 ;Wb35Reg_Write ( pHwData,0x0800 , pWb35Reg->M00_MacControl ); }
@@ -847,7 +844,7 @@ void hal_set_accept_multicast( phw_dataif ( pHwData->SurpriseRemove )return ; pWb35Reg->M00_MacControl &= ~0x01000000 ;//The HW value -if ( enable ) pWb35Reg->M00_MacControl |=0x01000000 ;//The HW value +if (enable) pWb35Reg->M00_MacControl |=0x01000000 ;//The HW value Wb35Reg_Write ( pHwData,0x0800 , pWb35Reg->M00_MacControl ); }//---------------------------------------------------------------------------------------------------
drivers/net/wireless/winbond/winbondport/wbhal_f.h +61 -62
146 lines not on this page · raw message
drivers/net/wireless/winbond/winbondport/wblinux.c +139 -158
319 lines not on this page · raw message
drivers/net/wireless/winbond/winbondport/wbndis_entry.c +1 -1337
1,338 lines not on this page · raw message
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html