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

Commit 9b5795a7 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: cleaned up more softmac macro's 



Substituted/removed macro's.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d7084380

drivers/staging/brcm80211/brcmsmac/main.c

+18 −0
Original line number Diff line number Diff line
@@ -267,6 +267,20 @@ 
#define APHY_SLOT_TIME		9

#define BPHY_SLOT_TIME		20



#define	WL_SPURAVOID_OFF	0

#define	WL_SPURAVOID_ON1	1

#define	WL_SPURAVOID_ON2	2



/*

 * 32 SSID chars, max of 4 chars for each SSID char "\xFF", plus NULL.

 */

#define SSID_FMT_BUF_LEN	((4 * IEEE80211_MAX_SSID_LEN) + 1)



/* defaults for the HT (MIMO) bss */

#define HT_CAP	(IEEE80211_HT_CAP_SM_PS |\

	IEEE80211_HT_CAP_SUP_WIDTH_20_40 | IEEE80211_HT_CAP_GRN_FLD |\

	IEEE80211_HT_CAP_MAX_AMSDU | IEEE80211_HT_CAP_DSSSCCK40)



/*

 * The following table lists the buffer memory allocated to xmt fifos in HW.

 * the size is in units of 256bytes(one block), total size is HW dependent
@@ -361,6 +375,10 @@ 
#define IS_MBAND_UNLOCKED(wlc) \

	((wlc->pub->_nbands > 1) && !(wlc)->bandlocked)



#define CHSPEC_WLC_BW(chanspec)	(CHSPEC_IS40(chanspec) ? BRCMS_40_MHZ : \

				 CHSPEC_IS20(chanspec) ? BRCMS_20_MHZ : \

							 BRCMS_10_MHZ)



/* dup state between BMAC(struct brcms_hardware) and HIGH(struct brcms_c_info)

   driver */

struct brcms_b_state {

drivers/staging/brcm80211/brcmsmac/main.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "types.h"

#include "d11.h"



#define MA_WINDOW_SZ		8	/* moving average window size */

#define	INVCHANNEL		255	/* invalid channel */



/* max # brcms_c_module_register() calls */

drivers/staging/brcm80211/brcmsmac/otp.c

+3 −2
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ 


#define MAXNUMRDES		9	/* Maximum OTP redundancy entries */



/* Fixed size subregions sizes in words */

#define OTPGU_CI_SZ		2



/* OTP function struct */

struct otp_fn_s {

	int (*size)(struct otpinfo *oi);
@@ -111,8 +114,6 @@ static struct otpinfo otpinfo; 
 *

 */



#define HWSW_RGN(rgn)		(((rgn) == OTP_HW_RGN) ? "h/w" : "s/w")



/* OTP layout */

/* CC revs 21, 24 and 27 OTP General Use Region word offset */

#define REVA4_OTPGU_BASE	12

drivers/staging/brcm80211/brcmsmac/otp.h

+0 −6
Original line number Diff line number Diff line
@@ -30,12 +30,6 @@ 
/* OTP Size */

#define OTP_SZ_MAX		(6144/8)	/* maximum bytes in one CIS */



/* Fixed size subregions sizes in words */

#define OTPGU_CI_SZ		2



/* OTP usage */

#define OTP4325_FM_DISABLED_OFFSET	188



struct otpinfo;



/* Exported functions */

drivers/staging/brcm80211/brcmsmac/pmu.h

+0 −13
Original line number Diff line number Diff line
@@ -19,19 +19,6 @@ 
#define _BRCM_PMU_H_



#include "types.h"

/*

 * LDO selections used in si_pmu_set_ldo_voltage

 */

#define SET_LDO_VOLTAGE_LDO1	1

#define SET_LDO_VOLTAGE_LDO2	2

#define SET_LDO_VOLTAGE_LDO3	3

#define SET_LDO_VOLTAGE_PAREF	4

#define SET_LDO_VOLTAGE_CLDO_PWM	5

#define SET_LDO_VOLTAGE_CLDO_BURST	6

#define SET_LDO_VOLTAGE_CBUCK_PWM	7

#define SET_LDO_VOLTAGE_CBUCK_BURST	8

#define SET_LDO_VOLTAGE_LNLDO1	9

#define SET_LDO_VOLTAGE_LNLDO2_SEL	10



extern u16 si_pmu_fast_pwrup_delay(struct si_pub *sih);

extern void si_pmu_sprom_enable(struct si_pub *sih, bool enable);