Skip to content

L
linux
Commit 2a2d0589 authored by Rafał Miłecki's avatar Rafał Miłecki
Browse files
Options

b43: N-PHY: rename RSSI types to be shorter and more accurate 

Thanks to Broadcom releasing some code we can use better names.
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
parent 37859a75
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
drivers/net/wireless/b43/phy_n.c
View file @ 2a2d0589
...@@ -69,14 +69,14 @@ enum b43_nphy_rf_sequence { ...@@ -69,14 +69,14 @@ enum b43_nphy_rf_sequence {
B43_RFSEQ_UPDATE_GAINU, B43_RFSEQ_UPDATE_GAINU,
}; };
enum b43_nphy_rssi_type { enum n_rssi_type {
B43_NPHY_RSSI_X = 0, N_RSSI_W1 = 0,
B43_NPHY_RSSI_Y, N_RSSI_W2,
B43_NPHY_RSSI_Z, N_RSSI_NB,
B43_NPHY_RSSI_PWRDET, N_RSSI_IQ,
B43_NPHY_RSSI_TSSI_I, N_RSSI_TSSI_2G,
B43_NPHY_RSSI_TSSI_Q, N_RSSI_TSSI_5G,
B43_NPHY_RSSI_TBD, N_RSSI_TBD,
}; };
enum n_rail_type { enum n_rail_type {
...@@ -1214,7 +1214,7 @@ static void b43_nphy_run_samples(struct b43_wldev *dev, u16 samps, u16 loops, ...@@ -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, static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
s8 offset, u8 core, s8 offset, u8 core,
enum n_rail_type rail, enum n_rail_type rail,
enum b43_nphy_rssi_type rssi_type) enum n_rssi_type rssi_type)
{ {
u16 tmp; u16 tmp;
bool core1or5 = (core == 1) || (core == 5); bool core1or5 = (core == 1) || (core == 5);
...@@ -1224,7 +1224,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale, ...@@ -1224,7 +1224,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
tmp = ((scale & 0x3F) << 8) | (offset & 0x3F); tmp = ((scale & 0x3F) << 8) | (offset & 0x3F);
switch (rssi_type) { switch (rssi_type) {
case B43_NPHY_RSSI_Z: case N_RSSI_NB:
if (core1or5 && rail == N_RAIL_I) if (core1or5 && rail == N_RAIL_I)
b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Z, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Z, tmp);
if (core1or5 && rail == N_RAIL_Q) if (core1or5 && rail == N_RAIL_Q)
...@@ -1234,7 +1234,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale, ...@@ -1234,7 +1234,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
if (core2or5 && rail == N_RAIL_Q) if (core2or5 && rail == N_RAIL_Q)
b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z, tmp);
break; break;
case B43_NPHY_RSSI_X: case N_RSSI_W1:
if (core1or5 && rail == N_RAIL_I) if (core1or5 && rail == N_RAIL_I)
b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_X, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_X, tmp);
if (core1or5 && rail == N_RAIL_Q) if (core1or5 && rail == N_RAIL_Q)
...@@ -1244,7 +1244,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale, ...@@ -1244,7 +1244,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
if (core2or5 && rail == N_RAIL_Q) if (core2or5 && rail == N_RAIL_Q)
b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_X, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_X, tmp);
break; break;
case B43_NPHY_RSSI_Y: case N_RSSI_W2:
if (core1or5 && rail == N_RAIL_I) if (core1or5 && rail == N_RAIL_I)
b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Y, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Y, tmp);
if (core1or5 && rail == N_RAIL_Q) if (core1or5 && rail == N_RAIL_Q)
...@@ -1254,7 +1254,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale, ...@@ -1254,7 +1254,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
if (core2or5 && rail == N_RAIL_Q) if (core2or5 && rail == N_RAIL_Q)
b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y, tmp);
break; break;
case B43_NPHY_RSSI_TBD: case N_RSSI_TBD:
if (core1or5 && rail == N_RAIL_I) if (core1or5 && rail == N_RAIL_I)
b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TBD, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TBD, tmp);
if (core1or5 && rail == N_RAIL_Q) if (core1or5 && rail == N_RAIL_Q)
...@@ -1264,7 +1264,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale, ...@@ -1264,7 +1264,7 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
if (core2or5 && rail == N_RAIL_Q) if (core2or5 && rail == N_RAIL_Q)
b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TBD, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TBD, tmp);
break; break;
case B43_NPHY_RSSI_PWRDET: case N_RSSI_IQ:
if (core1or5 && rail == N_RAIL_I) if (core1or5 && rail == N_RAIL_I)
b43_phy_write(dev, B43_NPHY_RSSIMC_0I_PWRDET, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_0I_PWRDET, tmp);
if (core1or5 && rail == N_RAIL_Q) if (core1or5 && rail == N_RAIL_Q)
...@@ -1274,13 +1274,13 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale, ...@@ -1274,13 +1274,13 @@ static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale,
if (core2or5 && rail == N_RAIL_Q) if (core2or5 && rail == N_RAIL_Q)
b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_PWRDET, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_PWRDET, tmp);
break; break;
case B43_NPHY_RSSI_TSSI_I: case N_RSSI_TSSI_2G:
if (core1or5) if (core1or5)
b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TSSI, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TSSI, tmp);
if (core2or5) if (core2or5)
b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TSSI, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TSSI, tmp);
break; break;
case B43_NPHY_RSSI_TSSI_Q: case N_RSSI_TSSI_5G:
if (core1or5) if (core1or5)
b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TSSI, tmp); b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TSSI, tmp);
if (core2or5) if (core2or5)
...@@ -1921,9 +1921,9 @@ static void b43_nphy_rssi_cal(struct b43_wldev *dev) ...@@ -1921,9 +1921,9 @@ static void b43_nphy_rssi_cal(struct b43_wldev *dev)
if (dev->phy.rev >= 3) { if (dev->phy.rev >= 3) {
b43_nphy_rev3_rssi_cal(dev); b43_nphy_rev3_rssi_cal(dev);
} else { } else {
b43_nphy_rev2_rssi_cal(dev, B43_NPHY_RSSI_Z); b43_nphy_rev2_rssi_cal(dev, N_RSSI_NB);
b43_nphy_rev2_rssi_cal(dev, B43_NPHY_RSSI_X); b43_nphy_rev2_rssi_cal(dev, N_RSSI_W1);
b43_nphy_rev2_rssi_cal(dev, B43_NPHY_RSSI_Y); b43_nphy_rev2_rssi_cal(dev, N_RSSI_W2);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7