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

Commit 27ef0efb authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: replaced typedef tx_power_t by struct brcms_tx_power 



Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b37755a4

drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c

+2 −2
Original line number Diff line number Diff line
@@ -2179,7 +2179,7 @@ static u32 wlc_phy_txpower_est_power_nphy(struct brcms_phy *pi) 
}



void

wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi, tx_power_t *power,

wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi, struct tx_power *power,

			    uint channel)

{

	struct brcms_phy *pi = (struct brcms_phy *) ppi;
@@ -2187,7 +2187,7 @@ wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi, tx_power_t *power, 
	u8 min_pwr, max_pwr;



#if WL_TX_POWER_RATES != TXP_NUM_RATES

#error "tx_power_t struct out of sync with this fn"

#error "struct tx_power out of sync with this fn"

#endif



	if (ISNPHY(pi)) {

drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ extern void wlc_phy_mute_upd(struct brcms_phy_pub *ppi, bool val, mbool flags); 
extern void wlc_phy_antsel_type_set(struct brcms_phy_pub *ppi, u8 antsel_type);



extern void wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi,

					tx_power_t *power, uint channel);

					struct tx_power *power, uint channel);



extern void wlc_phy_initcal_enable(struct brcms_phy_pub *pih, bool initcal);

extern bool wlc_phy_test_ison(struct brcms_phy_pub *ppi);

drivers/staging/brcm80211/brcmsmac/phy_shim.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
/* sslpnphy specifics */

#define WL_TX_POWER_MCS20_SISO_FIRST_SSN   12	/* Index for first 20MHz MCS SISO rate */



/* tx_power_t.flags bits */

/* struct tx_power::flags bits */

#define WL_TX_POWER_F_ENABLED	1

#define WL_TX_POWER_F_HW	2

#define WL_TX_POWER_F_MIMO	4

drivers/staging/brcm80211/brcmsmac/stf.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void 
brcms_c_stf_ss_algo_channel_get(struct brcms_c_info *wlc, u16 *ss_algo_channel,

			    chanspec_t chanspec)

{

	tx_power_t power;

	struct tx_power power;

	u8 siso_mcs_id, cdd_mcs_id, stbc_mcs_id;



	/* Clear previous settings */

drivers/staging/brcm80211/brcmsmac/types.h

+0 −1
Original line number Diff line number Diff line
@@ -383,7 +383,6 @@ typedef volatile struct dma32diag dma32diag_t; 
typedef volatile struct dma64regs dma64regs_t;

typedef struct brcms_rateset wlc_rateset_t;

typedef u32 ratespec_t;

typedef struct tx_power tx_power_t;

typedef struct chanvec chanvec_t;

typedef s32 fixed;

typedef struct _cs32 cs32;