Commit 440a233d authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: Convert typedef ChanInfo to struct chan_info

parent 395af561
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -110,16 +110,16 @@
// 20061108 WPS IE buffer
#define MAX_IE_APPEND_SIZE					256 + 4 // Due to [E id][Length][OUI][Data] may 257 bytes

typedef struct _ChanInfo
struct chan_info
{
	u8		band;
	u8		ChanNo;
} ChanInfo, *pChanInfo;
};

typedef struct _CHAN_LIST
{
	u16				Count;
	ChanInfo		Channel[50]; // 100B
	struct chan_info		Channel[50]; // 100B
} CHAN_LIST, *psCHAN_LIST;

struct radio_off
@@ -189,7 +189,7 @@ struct wb_local_para
	u8			RoamStatus;
	u8			reserved7[3];

	ChanInfo	CurrentChan;			//Current channel no. and channel band. It may be changed by scanning.
	struct chan_info	CurrentChan;			//Current channel no. and channel band. It may be changed by scanning.
	u8			boHandover;				// Roaming, Hnadover to other AP.
	u8			boCCAbusy;

@@ -246,7 +246,7 @@ struct wb_local_para
    u32	   		_dot11WEPUndecryptableCount;
    u32	   		_dot11FrameDuplicateCount;

	ChanInfo	IbssChanSetting;	// 2B. Start IBSS Channel setting by registry or WWU.
	struct chan_info	IbssChanSetting;	// 2B. Start IBSS Channel setting by registry or WWU.
	u8		reserved_5[2];		//It may not be used after considering RF type,
									//region and modulation type.

+5 −5
Original line number Diff line number Diff line
@@ -1823,12 +1823,12 @@ BBProcessor_initial( struct hw_data * pHwData )
		reg->SQ3_filter[i] = 0x2f; // half of Bit 0 ~ 6
}

void set_tx_power_per_channel_max2829(  struct hw_data * pHwData,  ChanInfo Channel)
void set_tx_power_per_channel_max2829(  struct hw_data * pHwData,  struct chan_info Channel)
{
	RFSynthesizer_SetPowerIndex( pHwData, 100 ); // 20060620.1 Modify
}

void set_tx_power_per_channel_al2230(  struct hw_data * pHwData,  ChanInfo Channel )
void set_tx_power_per_channel_al2230(  struct hw_data * pHwData,  struct chan_info Channel )
{
	u8	index = 100;

@@ -1838,7 +1838,7 @@ void set_tx_power_per_channel_al2230( struct hw_data * pHwData, ChanInfo Chann
	RFSynthesizer_SetPowerIndex( pHwData, index );
}

void set_tx_power_per_channel_al7230(  struct hw_data * pHwData,  ChanInfo Channel)
void set_tx_power_per_channel_al7230(  struct hw_data * pHwData,  struct chan_info Channel)
{
	u8	i, index = 100;

@@ -1868,7 +1868,7 @@ void set_tx_power_per_channel_al7230( struct hw_data * pHwData, ChanInfo Chann
	RFSynthesizer_SetPowerIndex( pHwData, index );
}

void set_tx_power_per_channel_wb242(  struct hw_data * pHwData,  ChanInfo Channel)
void set_tx_power_per_channel_wb242(  struct hw_data * pHwData,  struct chan_info Channel)
{
	u8	index = 100;

@@ -1901,7 +1901,7 @@ void set_tx_power_per_channel_wb242( struct hw_data * pHwData, ChanInfo Channe
//   None.
//=============================================================================================================
void
RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  ChanInfo Channel )
RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  struct chan_info Channel )
{
	struct wb35_reg *reg = &pHwData->reg;
	u32	pltmp[16]; // The 16 is the maximum capability of hardware
+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ void sme_get_rx_antenna(void *pcore_data, u32 *RxAntenna);
u8 sme_set_rx_antenna(void *pcore_data, u32 RxAntenna);
void sme_get_tx_antenna(void *pcore_data, u32 *TxAntenna);
s8 sme_set_tx_antenna(void *pcore_data, u32 TxAntenna);
s8 sme_set_IBSS_chan(void *pcore_data, ChanInfo chan);
s8 sme_set_IBSS_chan(void *pcore_data, struct chan_info chan);

//20061108 WPS
s8 sme_set_IE_append(void *pcore_data, u8 *buffer, u16 buf_len);
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ void Dxx_initial( struct hw_data * pHwData );
void Mxx_initial(  struct hw_data * pHwData );
void RFSynthesizer_initial(  struct hw_data * pHwData );
//void RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  s8 Channel );
void RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  ChanInfo Channel );
void RFSynthesizer_SwitchingChannel(  struct hw_data * pHwData,  struct chan_info Channel );
void BBProcessor_initial(  struct hw_data * pHwData );
void BBProcessor_RateChanging(  struct hw_data * pHwData,  u8 rate ); // 20060613.1
//void RF_RateChanging(  struct hw_data * pHwData,  u8 rate ); // 20060626.5.c Add
+4 −4
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void hal_set_radio_mode(struct hw_data *pHwData, unsigned char radio_off)
}

static void
hal_set_current_channel_ex(struct hw_data *pHwData, ChanInfo channel)
hal_set_current_channel_ex(struct hw_data *pHwData, struct chan_info channel)
{
	struct wb35_reg *reg = &pHwData->reg;

@@ -180,10 +180,10 @@ hal_set_current_channel_ex(struct hw_data *pHwData, ChanInfo channel)
	reg->M28_MacControl &= ~0xff;	// Clean channel information field
	reg->M28_MacControl |= channel.ChanNo;
	Wb35Reg_WriteWithCallbackValue(pHwData, 0x0828, reg->M28_MacControl,
				       (s8 *) & channel, sizeof(ChanInfo));
				       (s8 *) & channel, sizeof(struct chan_info));
}

static void hal_set_current_channel(struct hw_data *pHwData, ChanInfo channel)
static void hal_set_current_channel(struct hw_data *pHwData, struct chan_info channel)
{
	hal_set_current_channel_ex(pHwData, channel);
}
@@ -253,7 +253,7 @@ static void hal_set_accept_beacon(struct hw_data *pHwData, u8 enable)
static int wbsoft_config(struct ieee80211_hw *dev, u32 changed)
{
	struct wbsoft_priv *priv = dev->priv;
	ChanInfo ch;
	struct chan_info ch;

	printk("wbsoft_config called\n");