Page MenuHomeFreeBSD
Files F146980114

D35105.id105615.diff
No OneTemporary
Actions

D35105.id105615.diff
View Options

Index: sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c
===================================================================
--- sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c
+++ sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c
@@ -6070,7 +6070,6 @@
struct bwn_softc *sc = mac->mac_sc;
struct bwn_ppr *ppr = &nphy->tx_pwr_max_ppr;
uint8_t max; /* qdBm */
- bool tx_pwr_state;
if (nphy->tx_pwr_last_recalc_freq == bwn_get_centre_freq(mac) &&
nphy->tx_pwr_last_recalc_limit == phy->txpower)
@@ -6108,7 +6107,6 @@
bwn_ppr_apply_min(mac, ppr, INT_TO_Q52(8));
/* Apply */
- tx_pwr_state = nphy->txpwrctrl;
bwn_mac_suspend(mac);
bwn_nphy_tx_power_ctl_setup(mac);
if (bhnd_get_hwrev(sc->sc_dev) == 11 || bhnd_get_hwrev(sc->sc_dev) == 12) {
@@ -6214,7 +6212,6 @@
struct bwn_nphy_txgains target;
int error;
uint16_t tmp;
- bwn_band_t tmp2;
bool do_rssi_cal;
uint16_t clip[2];
@@ -6308,7 +6305,6 @@
BWN_PHY_WRITE(mac, BWN_NPHY_DUP40_BL, 0x9A4);
}
- tmp2 = bwn_current_band(mac);
if (bwn_nphy_ipa(mac)) {
BWN_PHY_SET(mac, BWN_NPHY_PAPD_EN0, 0x1);
BWN_PHY_SETMASK(mac, BWN_NPHY_EPS_TABLE_ADJ0, 0x007F,
Index: sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c
===================================================================
--- sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c
+++ sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c
@@ -3454,10 +3454,15 @@
void bwn_ntab_write(struct bwn_mac *mac, uint32_t offset, uint32_t value)
{
- uint32_t type, orig;
+ uint32_t type;
+#ifdef INVARIANTS
+ uint32_t orig;
+#endif
type = offset & BWN_NTAB_TYPEMASK;
+#ifdef INVARIANTS
orig = offset;
+#endif
offset &= 0xFFFF;
switch (type) {
@@ -3494,12 +3499,16 @@
{
struct bwn_softc *sc = mac->mac_sc;
uint32_t type, value;
+#ifdef INVARIANTS
uint32_t orig;
+#endif
const uint8_t *data = _data;
unsigned int i;
type = offset & BWN_NTAB_TYPEMASK;
+#ifdef INVARIANTS
orig = offset;
+#endif
offset &= ~BWN_NTAB_TYPEMASK;
KASSERT(offset <= 0xFFFF, ("%s: invalid offset (%d)\n",
__func__, offset));

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 8, 7:37 AM (2 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29399215
Default Alt Text
D35105.id105615.diff (1 KB)

Event Timeline