Staging: w35und: reformat wbhal.c

Impact: cleanup

In preparation for merging wbhal.c with wbusb.c, use Lindet to reformat
the file.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pekka Enberg 2009-04-08 11:51:19 +03:00 committed by Greg Kroah-Hartman
parent 833d0cd39e
commit c6e523c0cb
1 changed files with 99 additions and 85 deletions

View File

@ -2,170 +2,183 @@
#include "wbhal_f.h" #include "wbhal_f.h"
#include "wblinux_f.h" #include "wblinux_f.h"
void hal_set_ethernet_address( struct hw_data * pHwData, u8 *current_address ) void hal_set_ethernet_address(struct hw_data *pHwData, u8 * current_address)
{ {
u32 ltmp[2]; u32 ltmp[2];
if( pHwData->SurpriseRemove ) return; if (pHwData->SurpriseRemove)
return;
memcpy( pHwData->CurrentMacAddress, current_address, ETH_ALEN ); memcpy(pHwData->CurrentMacAddress, current_address, ETH_ALEN);
ltmp[0]= cpu_to_le32( *(u32 *)pHwData->CurrentMacAddress ); ltmp[0] = cpu_to_le32(*(u32 *) pHwData->CurrentMacAddress);
ltmp[1]= cpu_to_le32( *(u32 *)(pHwData->CurrentMacAddress + 4) ) & 0xffff; ltmp[1] =
cpu_to_le32(*(u32 *) (pHwData->CurrentMacAddress + 4)) & 0xffff;
Wb35Reg_BurstWrite( pHwData, 0x03e8, ltmp, 2, AUTO_INCREMENT ); Wb35Reg_BurstWrite(pHwData, 0x03e8, ltmp, 2, AUTO_INCREMENT);
} }
void hal_get_permanent_address( struct hw_data * pHwData, u8 *pethernet_address ) void hal_get_permanent_address(struct hw_data *pHwData, u8 * pethernet_address)
{ {
if( pHwData->SurpriseRemove ) return; if (pHwData->SurpriseRemove)
return;
memcpy( pethernet_address, pHwData->PermanentMacAddress, 6 ); memcpy(pethernet_address, pHwData->PermanentMacAddress, 6);
} }
//--------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------
void hal_set_beacon_period( struct hw_data * pHwData, u16 beacon_period ) void hal_set_beacon_period(struct hw_data *pHwData, u16 beacon_period)
{ {
u32 tmp; u32 tmp;
if( pHwData->SurpriseRemove ) return; if (pHwData->SurpriseRemove)
return;
pHwData->BeaconPeriod = beacon_period; pHwData->BeaconPeriod = beacon_period;
tmp = pHwData->BeaconPeriod << 16; tmp = pHwData->BeaconPeriod << 16;
tmp |= pHwData->ProbeDelay; tmp |= pHwData->ProbeDelay;
Wb35Reg_Write( pHwData, 0x0848, tmp ); Wb35Reg_Write(pHwData, 0x0848, tmp);
} }
static void hal_set_current_channel_ex(struct hw_data *pHwData,
static void hal_set_current_channel_ex( struct hw_data * pHwData, ChanInfo channel ) ChanInfo channel)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
if( pHwData->SurpriseRemove ) if (pHwData->SurpriseRemove)
return; return;
printk("Going to channel: %d/%d\n", channel.band, channel.ChanNo); printk("Going to channel: %d/%d\n", channel.band, channel.ChanNo);
RFSynthesizer_SwitchingChannel( pHwData, channel );// Switch channel RFSynthesizer_SwitchingChannel(pHwData, channel); // Switch channel
pHwData->Channel = channel.ChanNo; pHwData->Channel = channel.ChanNo;
pHwData->band = channel.band; pHwData->band = channel.band;
#ifdef _PE_STATE_DUMP_ #ifdef _PE_STATE_DUMP_
printk("Set channel is %d, band =%d\n", pHwData->Channel, pHwData->band); printk("Set channel is %d, band =%d\n", pHwData->Channel,
#endif pHwData->band);
reg->M28_MacControl &= ~0xff; // Clean channel information field #endif
reg->M28_MacControl &= ~0xff; // Clean channel information field
reg->M28_MacControl |= channel.ChanNo; reg->M28_MacControl |= channel.ChanNo;
Wb35Reg_WriteWithCallbackValue( pHwData, 0x0828, reg->M28_MacControl, Wb35Reg_WriteWithCallbackValue(pHwData, 0x0828, reg->M28_MacControl,
(s8 *)&channel, sizeof(ChanInfo)); (s8 *) & channel, sizeof(ChanInfo));
} }
//--------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------
void hal_set_current_channel( struct hw_data * pHwData, ChanInfo channel ) void hal_set_current_channel(struct hw_data *pHwData, ChanInfo channel)
{ {
hal_set_current_channel_ex( pHwData, channel ); hal_set_current_channel_ex(pHwData, channel);
} }
//--------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------
void hal_set_accept_broadcast( struct hw_data * pHwData, u8 enable ) void hal_set_accept_broadcast(struct hw_data *pHwData, u8 enable)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
if( pHwData->SurpriseRemove ) return; if (pHwData->SurpriseRemove)
return;
reg->M00_MacControl &= ~0x02000000;//The HW value reg->M00_MacControl &= ~0x02000000; //The HW value
if (enable) if (enable)
reg->M00_MacControl |= 0x02000000;//The HW value reg->M00_MacControl |= 0x02000000; //The HW value
Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl ); Wb35Reg_Write(pHwData, 0x0800, reg->M00_MacControl);
} }
//for wep key error detection, we need to accept broadcast packets to be received temporary. //for wep key error detection, we need to accept broadcast packets to be received temporary.
void hal_set_accept_promiscuous( struct hw_data * pHwData, u8 enable) void hal_set_accept_promiscuous(struct hw_data *pHwData, u8 enable)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
if (pHwData->SurpriseRemove) return; if (pHwData->SurpriseRemove)
return;
if (enable) { if (enable) {
reg->M00_MacControl |= 0x00400000; reg->M00_MacControl |= 0x00400000;
Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl ); Wb35Reg_Write(pHwData, 0x0800, reg->M00_MacControl);
} else { } else {
reg->M00_MacControl&=~0x00400000; reg->M00_MacControl &= ~0x00400000;
Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl ); Wb35Reg_Write(pHwData, 0x0800, reg->M00_MacControl);
} }
} }
void hal_set_accept_multicast( struct hw_data * pHwData, u8 enable ) void hal_set_accept_multicast(struct hw_data *pHwData, u8 enable)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
if( pHwData->SurpriseRemove ) return; if (pHwData->SurpriseRemove)
reg->M00_MacControl &= ~0x01000000;//The HW value
if (enable) reg->M00_MacControl |= 0x01000000;//The HW value
Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl );
}
void hal_set_accept_beacon( struct hw_data * pHwData, u8 enable )
{
struct wb35_reg *reg = &pHwData->reg;
if( pHwData->SurpriseRemove ) return;
// 20040108 debug
if( !enable )//Due to SME and MLME are not suitable for 35
return; return;
reg->M00_MacControl &= ~0x04000000;//The HW value reg->M00_MacControl &= ~0x01000000; //The HW value
if( enable ) if (enable)
reg->M00_MacControl |= 0x04000000;//The HW value reg->M00_MacControl |= 0x01000000; //The HW value
Wb35Reg_Write(pHwData, 0x0800, reg->M00_MacControl);
Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl );
} }
void hal_set_accept_beacon(struct hw_data *pHwData, u8 enable)
{
struct wb35_reg *reg = &pHwData->reg;
if (pHwData->SurpriseRemove)
return;
// 20040108 debug
if (!enable) //Due to SME and MLME are not suitable for 35
return;
reg->M00_MacControl &= ~0x04000000; //The HW value
if (enable)
reg->M00_MacControl |= 0x04000000; //The HW value
Wb35Reg_Write(pHwData, 0x0800, reg->M00_MacControl);
}
//--------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------
void hal_stop( struct hw_data * pHwData ) void hal_stop(struct hw_data *pHwData)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
pHwData->Wb35Rx.rx_halt = 1; pHwData->Wb35Rx.rx_halt = 1;
Wb35Rx_stop( pHwData ); Wb35Rx_stop(pHwData);
pHwData->Wb35Tx.tx_halt = 1; pHwData->Wb35Tx.tx_halt = 1;
Wb35Tx_stop( pHwData ); Wb35Tx_stop(pHwData);
reg->D00_DmaControl &= ~0xc0000000;//Tx Off, Rx Off reg->D00_DmaControl &= ~0xc0000000; //Tx Off, Rx Off
Wb35Reg_Write( pHwData, 0x0400, reg->D00_DmaControl ); Wb35Reg_Write(pHwData, 0x0400, reg->D00_DmaControl);
} }
unsigned char hal_idle(struct hw_data * pHwData) unsigned char hal_idle(struct hw_data *pHwData)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
struct wb_usb *pWbUsb = &pHwData->WbUsb; struct wb_usb *pWbUsb = &pHwData->WbUsb;
if( !pHwData->SurpriseRemove && ( pWbUsb->DetectCount || reg->EP0vm_state!=VM_STOP ) ) if (!pHwData->SurpriseRemove
&& (pWbUsb->DetectCount || reg->EP0vm_state != VM_STOP))
return false; return false;
return true; return true;
} }
void hal_set_radio_mode( struct hw_data * pHwData, unsigned char radio_off) void hal_set_radio_mode(struct hw_data *pHwData, unsigned char radio_off)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
if( pHwData->SurpriseRemove ) return; if (pHwData->SurpriseRemove)
return;
if (radio_off) //disable Baseband receive off if (radio_off) //disable Baseband receive off
{ {
pHwData->CurrentRadioSw = 1; // off pHwData->CurrentRadioSw = 1; // off
reg->M24_MacControl &= 0xffffffbf; reg->M24_MacControl &= 0xffffffbf;
} } else {
else pHwData->CurrentRadioSw = 0; // on
{
pHwData->CurrentRadioSw = 0; // on
reg->M24_MacControl |= 0x00000040; reg->M24_MacControl |= 0x00000040;
} }
Wb35Reg_Write( pHwData, 0x0824, reg->M24_MacControl ); Wb35Reg_Write(pHwData, 0x0824, reg->M24_MacControl);
} }
u8 hal_get_antenna_number( struct hw_data * pHwData ) u8 hal_get_antenna_number(struct hw_data *pHwData)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
@ -177,14 +190,15 @@ u8 hal_get_antenna_number( struct hw_data * pHwData )
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
//0 : radio on; 1: radio off //0 : radio on; 1: radio off
u8 hal_get_hw_radio_off( struct hw_data * pHwData ) u8 hal_get_hw_radio_off(struct hw_data * pHwData)
{ {
struct wb35_reg *reg = &pHwData->reg; struct wb35_reg *reg = &pHwData->reg;
if( pHwData->SurpriseRemove ) return 1; if (pHwData->SurpriseRemove)
return 1;
//read the bit16 of register U1B0 //read the bit16 of register U1B0
Wb35Reg_Read( pHwData, 0x3b0, &reg->U1B0 ); Wb35Reg_Read(pHwData, 0x3b0, &reg->U1B0);
if ((reg->U1B0 & 0x00010000)) { if ((reg->U1B0 & 0x00010000)) {
pHwData->CurrentRadioHw = 1; pHwData->CurrentRadioHw = 1;
return 1; return 1;
@ -194,24 +208,24 @@ u8 hal_get_hw_radio_off( struct hw_data * pHwData )
} }
} }
unsigned char hal_get_dxx_reg( struct hw_data * pHwData, u16 number, u32 * pValue ) unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 * pValue)
{ {
if( number < 0x1000 ) if (number < 0x1000)
number += 0x1000; number += 0x1000;
return Wb35Reg_ReadSync( pHwData, number, pValue ); return Wb35Reg_ReadSync(pHwData, number, pValue);
} }
unsigned char hal_set_dxx_reg( struct hw_data * pHwData, u16 number, u32 value ) unsigned char hal_set_dxx_reg(struct hw_data *pHwData, u16 number, u32 value)
{ {
unsigned char ret; unsigned char ret;
if( number < 0x1000 ) if (number < 0x1000)
number += 0x1000; number += 0x1000;
ret = Wb35Reg_WriteSync( pHwData, number, value ); ret = Wb35Reg_WriteSync(pHwData, number, value);
return ret; return ret;
} }
void hal_set_rf_power(struct hw_data * pHwData, u8 PowerIndex) void hal_set_rf_power(struct hw_data *pHwData, u8 PowerIndex)
{ {
RFSynthesizer_SetPowerIndex( pHwData, PowerIndex ); RFSynthesizer_SetPowerIndex(pHwData, PowerIndex);
} }