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

Commit e5ab1fd7 authored by Rafał Miłecki's avatar Rafał Miłecki
Browse files

b43: N-PHY: simplify conditions in RSSI offset scale function 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
parent 6aa38725

drivers/net/wireless/b43/phy_n.c

+65 −55
Original line number Diff line number Diff line
@@ -1214,7 +1214,7 @@ static void b43_nphy_run_samples(struct b43_wldev *dev, u16 samps, u16 loops, 
static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,

					s8 offset, u8 core,

					enum n_rail_type rail,

					enum b43_nphy_rssi_type type)

					enum b43_nphy_rssi_type rssi_type)

{

	u16 tmp;

	bool core1or5 = (core == 1) || (core == 5);
@@ -1223,60 +1223,70 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale, 
	offset = clamp_val(offset, -32, 31);

	tmp = ((scale & 0x3F) << 8) | (offset & 0x3F);



	if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_Z))

	switch (rssi_type) {

	case B43_NPHY_RSSI_Z:

		if (core1or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Z, tmp);

	if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_Z))

		if (core1or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z, tmp);

	if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_Z))

		if (core2or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Z, tmp);

	if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_Z))

		if (core2or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z, tmp);



	if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_X))

		break;

	case B43_NPHY_RSSI_X:

		if (core1or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_X, tmp);

	if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_X))

		if (core1or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_X, tmp);

	if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_X))

		if (core2or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_X, tmp);

	if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_X))

		if (core2or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_X, tmp);



	if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_Y))

		break;

	case B43_NPHY_RSSI_Y:

		if (core1or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Y, tmp);

	if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_Y))

		if (core1or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Y, tmp);

	if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_Y))

		if (core2or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Y, tmp);

	if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_Y))

		if (core2or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y, tmp);



	if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_TBD))

		break;

	case B43_NPHY_RSSI_TBD:

		if (core1or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TBD, tmp);

	if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_TBD))

		if (core1or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TBD, tmp);

	if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_TBD))

		if (core2or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TBD, tmp);

	if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_TBD))

		if (core2or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TBD, tmp);



	if (core1or5 && (rail == 0) && (type == B43_NPHY_RSSI_PWRDET))

		break;

	case B43_NPHY_RSSI_PWRDET:

		if (core1or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0I_PWRDET, tmp);

	if (core1or5 && (rail == 1) && (type == B43_NPHY_RSSI_PWRDET))

		if (core1or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_PWRDET, tmp);

	if (core2or5 && (rail == 0) && (type == B43_NPHY_RSSI_PWRDET))

		if (core2or5 && rail == N_RAIL_I)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1I_PWRDET, tmp);

	if (core2or5 && (rail == 1) && (type == B43_NPHY_RSSI_PWRDET))

		if (core2or5 && rail == N_RAIL_Q)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_PWRDET, tmp);



	if (core1or5 && (type == B43_NPHY_RSSI_TSSI_I))

		break;

	case B43_NPHY_RSSI_TSSI_I:

		if (core1or5)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TSSI, tmp);

	if (core2or5 && (type == B43_NPHY_RSSI_TSSI_I))

		if (core2or5)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TSSI, tmp);



	if (core1or5 && (type == B43_NPHY_RSSI_TSSI_Q))

		break;

	case B43_NPHY_RSSI_TSSI_Q:

		if (core1or5)

			b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TSSI, tmp);

	if (core2or5 && (type == B43_NPHY_RSSI_TSSI_Q))

		if (core2or5)

			b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TSSI, tmp);

		break;

	}

}



static void b43_nphy_rev3_rssi_select(struct b43_wldev *dev, u8 code, u8 type)