Commit 6e6a2cd5 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: rename host flags defines 



There are more than 3 registers on new hardware. Host flags handling has
to be rewritten, as we can't use u128 type to handle all 5 regs.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 95a96e08

drivers/net/wireless/b43/b43.h

+5 −3
Original line number Diff line number Diff line
@@ -241,16 +241,18 @@ enum { 
#define B43_SHM_SH_PHYVER		0x0050	/* PHY version */

#define B43_SHM_SH_PHYTYPE		0x0052	/* PHY type */

#define B43_SHM_SH_ANTSWAP		0x005C	/* Antenna swap threshold */

#define B43_SHM_SH_HOSTFLO		0x005E	/* Hostflags for ucode options (low) */

#define B43_SHM_SH_HOSTFMI		0x0060	/* Hostflags for ucode options (middle) */

#define B43_SHM_SH_HOSTFHI		0x0062	/* Hostflags for ucode options (high) */

#define B43_SHM_SH_HOSTF1		0x005E	/* Hostflags 1 for ucode options */

#define B43_SHM_SH_HOSTF2		0x0060	/* Hostflags 2 for ucode options */

#define B43_SHM_SH_HOSTF3		0x0062	/* Hostflags 3 for ucode options */

#define B43_SHM_SH_RFATT		0x0064	/* Current radio attenuation value */

#define B43_SHM_SH_RADAR		0x0066	/* Radar register */

#define B43_SHM_SH_PHYTXNOI		0x006E	/* PHY noise directly after TX (lower 8bit only) */

#define B43_SHM_SH_RFRXSP1		0x0072	/* RF RX SP Register 1 */

#define B43_SHM_SH_HOSTF4		0x0078	/* Hostflags 4 for ucode options */

#define B43_SHM_SH_CHAN			0x00A0	/* Current channel (low 8bit only) */

#define  B43_SHM_SH_CHAN_5GHZ		0x0100	/* Bit set, if 5 Ghz channel */

#define  B43_SHM_SH_CHAN_40MHZ		0x0200	/* Bit set, if 40 Mhz channel width */

#define B43_SHM_SH_HOSTF5		0x00D4	/* Hostflags 5 for ucode options */

#define B43_SHM_SH_BCMCFIFOID		0x0108	/* Last posted cookie to the bcast/mcast FIFO */

/* TSSI information */

#define B43_SHM_SH_TSSI_CCK		0x0058	/* TSSI for last 4 CCK frames (32bit) */

drivers/net/wireless/b43/main.c

+6 −6
Original line number Diff line number Diff line
@@ -533,11 +533,11 @@ u64 b43_hf_read(struct b43_wldev *dev) 
{

	u64 ret;



	ret = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFHI);

	ret = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF3);

	ret <<= 16;

	ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFMI);

	ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF2);

	ret <<= 16;

	ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO);

	ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF1);



	return ret;

}
@@ -550,9 +550,9 @@ void b43_hf_write(struct b43_wldev *dev, u64 value) 
	lo = (value & 0x00000000FFFFULL);

	mi = (value & 0x0000FFFF0000ULL) >> 16;

	hi = (value & 0xFFFF00000000ULL) >> 32;

	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO, lo);

	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFMI, mi);

	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFHI, hi);

	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF1, lo);

	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF2, mi);

	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF3, hi);

}



/* Read the firmware capabilities bitmask (Opensource firmware only) */

drivers/net/wireless/b43/phy_common.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ int b43_phy_shm_tssi_read(struct b43_wldev *dev, u16 shm_offset) 
	average = (a + b + c + d + 2) / 4;

	if (is_ofdm) {

		/* Adjust for CCK-boost */

		if (b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO)

		if (b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF1)

		    & B43_HF_CCKBOOST)

			average = (average >= 13) ? (average - 13) : 0;

	}