Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c8fc71d authored by Daniel Drake's avatar Daniel Drake Committed by Jeff Garzik
Browse files

[PATCH] zd1211rw: Extend RF layer 



These changes are needed for UW2453 RF support:

Add pointer which RF drivers can use to store private RF data
Add exit hook so that RF drivers can free private data
Allow RF's to disable the generic TX power integration handling code

Signed-off-by: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a9eea9ae

drivers/net/wireless/zd1211rw/zd_chip.c

+3 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,9 @@ static int update_channel_integration_and_calibration(struct zd_chip *chip, 
{

	int r;



	if (!zd_rf_should_update_pwr_int(&chip->rf))

		return 0;



	r = update_pwr_int(chip, channel);

	if (r)

		return r;

drivers/net/wireless/zd1211rw/zd_rf.c

+6 −0
Original line number Diff line number Diff line
@@ -52,10 +52,16 @@ const char *zd_rf_name(u8 type) 
void zd_rf_init(struct zd_rf *rf)

{

	memset(rf, 0, sizeof(*rf));



	/* default to update channel integration, as almost all RF's do want

	 * this */

	rf->update_channel_int = 1;

}



void zd_rf_clear(struct zd_rf *rf)

{

	if (rf->clear)

		rf->clear(rf);

	ZD_MEMCLEAR(rf, sizeof(*rf));

}

drivers/net/wireless/zd1211rw/zd_rf.h

+13 −0
Original line number Diff line number Diff line
@@ -48,12 +48,20 @@ struct zd_rf { 


	u8 channel;



	/* whether channel integration and calibration should be updated

	 * defaults to 1 (yes) */

	u8 update_channel_int:1;



	/* private RF driver data */

	void *priv;



	/* RF-specific functions */

	int (*init_hw)(struct zd_rf *rf);

	int (*set_channel)(struct zd_rf *rf, u8 channel);

	int (*switch_radio_on)(struct zd_rf *rf);

	int (*switch_radio_off)(struct zd_rf *rf);

	int (*patch_6m_band_edge)(struct zd_rf *rf, u8 channel);

	void (*clear)(struct zd_rf *rf);

};



const char *zd_rf_name(u8 type);
@@ -71,6 +79,11 @@ int zd_switch_radio_off(struct zd_rf *rf); 
int zd_rf_patch_6m_band_edge(struct zd_rf *rf, u8 channel);

int zd_rf_generic_patch_6m(struct zd_rf *rf, u8 channel);



static inline int zd_rf_should_update_pwr_int(struct zd_rf *rf)

{

	return rf->update_channel_int;

}



/* Functions for individual RF chips */



int zd_rf_init_rf2959(struct zd_rf *rf);