From c6e523c0cbb610cc59f6afebfdeff751dd4601bd Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Wed, 8 Apr 2009 11:51:19 +0300 Subject: [PATCH] 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 Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/wbhal.c | 166 +++++++++++++++++--------------- 1 file changed, 90 insertions(+), 76 deletions(-) diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c index 14253f05aee..e40fdca4b9f 100644 --- a/drivers/staging/winbond/wbhal.c +++ b/drivers/staging/winbond/wbhal.c @@ -2,170 +2,183 @@ #include "wbhal_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]; - 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[1]= cpu_to_le32( *(u32 *)(pHwData->CurrentMacAddress + 4) ) & 0xffff; + ltmp[0] = cpu_to_le32(*(u32 *) pHwData->CurrentMacAddress); + 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; tmp = pHwData->BeaconPeriod << 16; tmp |= pHwData->ProbeDelay; - Wb35Reg_Write( pHwData, 0x0848, tmp ); + Wb35Reg_Write(pHwData, 0x0848, tmp); } - -static void hal_set_current_channel_ex( struct hw_data * pHwData, ChanInfo channel ) +static void hal_set_current_channel_ex(struct hw_data *pHwData, + ChanInfo channel) { struct wb35_reg *reg = &pHwData->reg; - if( pHwData->SurpriseRemove ) + if (pHwData->SurpriseRemove) return; 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->band = channel.band; - #ifdef _PE_STATE_DUMP_ - printk("Set channel is %d, band =%d\n", pHwData->Channel, pHwData->band); - #endif - reg->M28_MacControl &= ~0xff; // Clean channel information field +#ifdef _PE_STATE_DUMP_ + printk("Set channel is %d, band =%d\n", pHwData->Channel, + pHwData->band); +#endif + reg->M28_MacControl &= ~0xff; // Clean channel information field reg->M28_MacControl |= channel.ChanNo; - Wb35Reg_WriteWithCallbackValue( pHwData, 0x0828, reg->M28_MacControl, - (s8 *)&channel, sizeof(ChanInfo)); + Wb35Reg_WriteWithCallbackValue(pHwData, 0x0828, reg->M28_MacControl, + (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; - if( pHwData->SurpriseRemove ) return; + if (pHwData->SurpriseRemove) + return; - reg->M00_MacControl &= ~0x02000000;//The HW value + reg->M00_MacControl &= ~0x02000000; //The HW value 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. -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; - if (pHwData->SurpriseRemove) return; + if (pHwData->SurpriseRemove) + return; if (enable) { reg->M00_MacControl |= 0x00400000; - Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl ); + Wb35Reg_Write(pHwData, 0x0800, reg->M00_MacControl); } else { - reg->M00_MacControl&=~0x00400000; - Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl ); + reg->M00_MacControl &= ~0x00400000; + 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; - if( pHwData->SurpriseRemove ) return; + if (pHwData->SurpriseRemove) + return; - reg->M00_MacControl &= ~0x01000000;//The HW value - if (enable) reg->M00_MacControl |= 0x01000000;//The HW value - Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl ); + 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 ) +void hal_set_accept_beacon(struct hw_data *pHwData, u8 enable) { struct wb35_reg *reg = &pHwData->reg; - if( pHwData->SurpriseRemove ) return; + if (pHwData->SurpriseRemove) + return; // 20040108 debug - if( !enable )//Due to SME and MLME are not suitable for 35 + 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 + reg->M00_MacControl &= ~0x04000000; //The HW value + if (enable) + reg->M00_MacControl |= 0x04000000; //The HW value - Wb35Reg_Write( pHwData, 0x0800, reg->M00_MacControl ); + 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; pHwData->Wb35Rx.rx_halt = 1; - Wb35Rx_stop( pHwData ); + Wb35Rx_stop(pHwData); pHwData->Wb35Tx.tx_halt = 1; - Wb35Tx_stop( pHwData ); + Wb35Tx_stop(pHwData); - reg->D00_DmaControl &= ~0xc0000000;//Tx Off, Rx Off - Wb35Reg_Write( pHwData, 0x0400, reg->D00_DmaControl ); + reg->D00_DmaControl &= ~0xc0000000; //Tx Off, Rx Off + 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 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 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; - 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; - } - else - { - pHwData->CurrentRadioSw = 0; // on + } else { + pHwData->CurrentRadioSw = 0; // on 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; @@ -177,14 +190,15 @@ u8 hal_get_antenna_number( struct hw_data * pHwData ) //---------------------------------------------------------------------------------------------------- //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; - if( pHwData->SurpriseRemove ) return 1; + if (pHwData->SurpriseRemove) + return 1; //read the bit16 of register U1B0 - Wb35Reg_Read( pHwData, 0x3b0, ®->U1B0 ); + Wb35Reg_Read(pHwData, 0x3b0, ®->U1B0); if ((reg->U1B0 & 0x00010000)) { pHwData->CurrentRadioHw = 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; - 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; - ret = Wb35Reg_WriteSync( pHwData, number, value ); + ret = Wb35Reg_WriteSync(pHwData, number, value); 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); } -- 2.32.0.93.g670b81a890